From 036e7536fc2e47a1238a7ec81d1aea46918149d8 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 21 Feb 2018 13:07:18 -0500 Subject: [PATCH] Update game_options.txt --- config/game_options.txt | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/config/game_options.txt b/config/game_options.txt index 562e986efa..6cdc0990ad 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -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