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

e2c0a9c9

Commit e2c0a9c9 authored 7 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'pregmod-master' into 'pregmod-master'

Pregmod v1017-47

See merge request !490

parents e06a365a e89e489c

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

src/npc/acquisition.tw 1 addition, 1 deletion

src/npc/acquisition.tw
src/npc/exportSlave.tw 1 addition, 1 deletion

src/npc/exportSlave.tw
src/pregmod/managePersonalAffairs.tw 1 addition, 1 deletion

src/pregmod/managePersonalAffairs.tw
src/pregmod/widgets/pregmodWidgets.tw 3 additions, 0 deletions

src/pregmod/widgets/pregmodWidgets.tw
src/uncategorized/pRivalryActions.tw 3 additions, 0 deletions

src/uncategorized/pRivalryActions.tw
src/uncategorized/pRivalryVictory.tw 2 additions, 2 deletions

src/uncategorized/pRivalryVictory.tw
src/uncategorized/reMalefactor.tw 1 addition, 1 deletion

src/uncategorized/reMalefactor.tw
src/uncategorized/reRelativeRecruiter.tw 3 additions, 3 deletions

src/uncategorized/reRelativeRecruiter.tw
src/uncategorized/remoteSurgery.tw 19 additions, 11 deletions

src/uncategorized/remoteSurgery.tw
src/uncategorized/saLongTermEffects.tw 73 additions, 19 deletions

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

src/uncategorized/slaveShelter.tw
src/uncategorized/surgeryDegradation.tw 8 additions, 0 deletions

src/uncategorized/surgeryDegradation.tw
src/utility/descriptionWidgets.tw 62 additions, 19 deletions

src/utility/descriptionWidgets.tw

with 178 additions and 59 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