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

422097cd

Commit 422097cd authored 4 years ago by Pregmodder

Downloads
- Plain Diff

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

parents e150cbcc 437e698d

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/Mods/SecExp/buildings/weaponsManufacturing.tw 7 additions, 5 deletions

src/Mods/SecExp/buildings/weaponsManufacturing.tw
src/Mods/SecExp/rebellionOptions.tw 1 addition, 1 deletion

src/Mods/SecExp/rebellionOptions.tw
src/endWeek/saChoosesOwnJob.js 1 addition, 1 deletion

src/endWeek/saChoosesOwnJob.js
src/events/randomEvent.js 1 addition, 0 deletions

src/events/randomEvent.js
src/events/reStaffedMorning.js 226 additions, 0 deletions

src/events/reStaffedMorning.js
src/npc/descriptions/butt/anus.js 1 addition, 1 deletion

src/npc/descriptions/butt/anus.js
src/uncategorized/randomNonindividualEvent.tw 0 additions, 3 deletions

src/uncategorized/randomNonindividualEvent.tw
src/uncategorized/reStaffedMorning.tw 0 additions, 153 deletions

src/uncategorized/reStaffedMorning.tw

with 237 additions and 164 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