Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fc-pregmod
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

0572aa54

Commit 0572aa54 authored 6 years ago by Pregmodder

Downloads
- Plain Diff

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

Fixes and a couple genetic traits

Closes #528

See merge request !3728

parents a5034a72 149ebf22

No related branches found

No related tags found

1 merge request!3728Fixes and a couple genetic traits

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

devNotes/VersionChangeLog-Premod+LoliMod.txt 1 addition, 0 deletions

devNotes/VersionChangeLog-Premod+LoliMod.txt
devNotes/twine CSS 11 additions, 0 deletions

devNotes/twine CSS
src/cheats/mod_EditFSCheat.tw 3 additions, 3 deletions

src/cheats/mod_EditFSCheat.tw
src/events/intro/initNationalities.tw 0 additions, 1 deletion

src/events/intro/initNationalities.tw
src/js/generateGenetics.js 33 additions, 5 deletions

src/js/generateGenetics.js
src/js/generateNewSlaveJS.js 10 additions, 0 deletions

src/js/generateNewSlaveJS.js
src/uncategorized/arcmgmt.tw 1 addition, 1 deletion

src/uncategorized/arcmgmt.tw
src/uncategorized/arcologyDescription.tw 1 addition, 1 deletion

src/uncategorized/arcologyDescription.tw
src/uncategorized/remoteSurgery.tw 8 additions, 0 deletions

src/uncategorized/remoteSurgery.tw
src/utility/descriptionWidgets.tw 8 additions, 0 deletions

src/utility/descriptionWidgets.tw

with 76 additions and 11 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