Update game_options.txt

This commit is contained in:
LetterJay
2017-11-14 13:08:07 -06:00
committed by GitHub
parent e0d291eb19
commit 851c862ddf
+1 -3
View File
@@ -504,7 +504,6 @@ MICE_ROUNDSTART 10
## If the percentage of players alive (doesn't count conversions) drops below this threshold the emergency shuttle will be forcefully called (provided it can be)
#EMERGENCY_SHUTTLE_AUTOCALL_THRESHOLD 0.2
<<<<<<< HEAD
## CREW OBJECTIVES ##
## Comment to disable objectives for innocent crew members.
ALLOW_CREW_OBJECTIVES
@@ -515,7 +514,6 @@ ALLOW_MISCREANTS
## Uncomment to let miscreants spawn during Extended. I hold no responsibility for fun that may occur while this is enabled.
#ALLOW_EXTENDED_MISCREANTS
=======
## Determines if players are allowed to print integrated circuits, uncomment to allow.
#IC_PRINTING
>>>>>>> bdfbafd... [READY]integrated circuitry port+upgrade. (#32481)