Update game_options.txt

This commit is contained in:
deathride58
2018-02-21 13:07:18 -05:00
committed by GitHub
parent 4608244c87
commit 036e7536fc
-10
View File
@@ -488,7 +488,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
@@ -512,14 +511,6 @@ ALLOW_MISCREANTS
## Determines if players are allowed to print integrated circuits, uncomment to allow.
#IC_PRINTING
## NIGHT SHIFT ##
## Comment to disable nightshift
NIGHTSHIFT_ENABLED
## These values determine the start and end of night shift. By default, night shift starts at 8 PM, and ends at 6 AM.
NIGHTSHIFT_START 20
NIGHTSHIFT_FINISH 6
=======
## Enable night shifts ##
ENABLE_NIGHT_SHIFTS
@@ -528,4 +519,3 @@ RANDOMIZE_SHIFT_TIME
## Sets shift time to server time at roundstart. Overridden by RANDOMIZE_SHIFT_TIME ##
#SHIFT_TIME_REALTIME
>>>>>>> 3622768... Merge pull request #35775 from kevinz000/night_shift