shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update game_options.txt

Browse Source
This commit is contained in:
deathride58
2018-05-10 23:48:28 -04:00
committed by GitHub
parent e0412f6325
commit 0c1f12dc5c
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/game_options.txt
-4
View File
@@ -512,7 +512,6 @@ MICE_ROUNDSTART 10
## Determines if players are allowed to print integrated circuits, uncomment to allow.
#IC_PRINTING
<<<<<<< HEAD
## CITADEL Races
ROUNDSTART_RACES mammal
ROUNDSTART_RACES avian
@@ -537,11 +536,8 @@ ALLOW_MISCREANTS
## Determines if players are allowed to print integrated circuits, uncomment to allow.
#IC_PRINTING
## Uncomment to allow roundstart trait selection in the character setup menu.
=======
## Uncomment to allow roundstart quirk selection in the character setup menu.
## This used to be named traits, hence the config name, but it handles quirks, not the other kind of trait!
>>>>>>> 821a9ad... Merge pull request #37646 from Xhuis/conflicts_imminent
ROUNDSTART_TRAITS
## Uncomment to disable human moods.