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

24e68d4d

Commit 24e68d4d authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'fixes' into 'pregmod-master'

Fixes

Closes #2307

See merge request pregmodfan/fc-pregmod!7843

parents bdbf7f39 ba90ff38

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/endWeek/saGuardYou.js 1 addition, 1 deletion

src/endWeek/saGuardYou.js
src/npc/descriptions/describeTattoos.js 1 addition, 1 deletion

src/npc/descriptions/describeTattoos.js
src/npc/generate/newSlaveIntro.js 2 additions, 2 deletions

src/npc/generate/newSlaveIntro.js
src/personalAssistant/assistantAppearance.js 9 additions, 9 deletions

src/personalAssistant/assistantAppearance.js
src/pregmod/eliteTakeOver.tw 1 addition, 1 deletion

src/pregmod/eliteTakeOver.tw

with 14 additions and 14 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