Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

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

Snippets Groups Projects

39c9b0da

Commit 39c9b0da authored 6 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'ITT-Fixes' into 'pregmod-master'

ITT-Fixes

See merge request pregmodfan/fc-pregmod!2930

parents 986b62b8 9f1c50b1

No related branches found

No related tags found

No related merge requests found

Changes 8

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/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/utility/descriptionWidgetsFlesh.tw 2 additions, 2 deletions

src/utility/descriptionWidgetsFlesh.tw

with 29 additions and 46 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