Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fc-pregmod
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

7d86946f

Commit 7d86946f authored 6 years ago by Pregmodder

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-master

parents c8a6ac2d 39c9b0da

Branches

Tags

2 merge requests!3002Pregmod v1032 initial merge,!2944main branch stuff and progress

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/gui/Encyclopedia/encyclopedia.tw 3 additions, 3 deletions

src/gui/Encyclopedia/encyclopedia.tw
src/js/eventSelectionJS.tw 1 addition, 1 deletion

src/js/eventSelectionJS.tw
src/pregmod/FSuckle.tw 1 addition, 1 deletion

src/pregmod/FSuckle.tw
src/pregmod/fSlaveFeed.tw 18 additions, 18 deletions

src/pregmod/fSlaveFeed.tw
src/pregmod/killSlave.tw 9 additions, 26 deletions

src/pregmod/killSlave.tw
src/pregmod/killedSlave.tw 9 additions, 11 deletions

src/pregmod/killedSlave.tw
src/uncategorized/reRecruit.tw 2 additions, 0 deletions

src/uncategorized/reRecruit.tw
src/uncategorized/saDrugs.tw 2 additions, 2 deletions

src/uncategorized/saDrugs.tw
src/uncategorized/saLongTermEffects.tw 1 addition, 1 deletion

src/uncategorized/saLongTermEffects.tw
src/uncategorized/saWhore.tw 8 additions, 2 deletions

src/uncategorized/saWhore.tw
src/uncategorized/seIndependenceDay.tw 3 additions, 3 deletions

src/uncategorized/seIndependenceDay.tw
src/utility/descriptionWidgetsFlesh.tw 2 additions, 2 deletions

src/utility/descriptionWidgetsFlesh.tw

with 59 additions and 70 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment