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

a486f7c5

Commit a486f7c5 authored 6 years ago by Pregmodder

Downloads
- Plain Diff

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

Subjugationist bad end and other tweaks/fixes

See merge request !2165

parents 11bec50a 81b4029e

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

devNotes/twine JS 2 additions, 2 deletions

devNotes/twine JS
src/events/gameover.tw 2 additions, 2 deletions

src/events/gameover.tw
src/js/eventSelectionJS.tw 2 additions, 2 deletions

src/js/eventSelectionJS.tw
src/npc/fRelation.tw 3 additions, 4 deletions

src/npc/fRelation.tw
src/pregmod/widgets/slaveSummaryWidgets.tw 4 additions, 4 deletions

src/pregmod/widgets/slaveSummaryWidgets.tw
src/uncategorized/policies.tw 7 additions, 1 deletion

src/uncategorized/policies.tw

with 20 additions and 15 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