[READY]Randomized Station Time + Night Shifts

2018-02-21 12:02:28 -06:00
parent c1d66af3a1
commit bc2f2a9728
32 changed files with 241 additions and 42 deletions
@@ -488,6 +488,7 @@ 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
@@ -518,3 +519,13 @@ 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
+
+## Enable randomized shift start times##
+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