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

5e11d992

Commit 5e11d992 authored 3 years ago by Pregmodder

Downloads
- Plain Diff

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

parents 2faed467 531de787

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

js/003-data/policiesData.js 1 addition, 1 deletion

js/003-data/policiesData.js
src/events/RE/reNickname.js 1 addition, 1 deletion

src/events/RE/reNickname.js
src/events/nonRandomEvent.js 3 additions, 3 deletions

src/events/nonRandomEvent.js
src/events/scheduled/seWedding.js 13 additions, 25 deletions

src/events/scheduled/seWedding.js
src/facilities/incubator/incubatorInteract.js 1 addition, 0 deletions

src/facilities/incubator/incubatorInteract.js
src/facilities/surgery/surgeryPassageStructural.js 1 addition, 1 deletion

src/facilities/surgery/surgeryPassageStructural.js
src/gui/Encyclopedia/encyclopediaBeingInCharge.js 1 addition, 1 deletion

src/gui/Encyclopedia/encyclopediaBeingInCharge.js
src/js/rulesAssistantOptions.js 2 additions, 2 deletions

src/js/rulesAssistantOptions.js

with 23 additions and 34 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