diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
index 0a50d6adf4c..4a3a0241877 100644
--- a/code/__HELPERS/time.dm
+++ b/code/__HELPERS/time.dm
@@ -39,13 +39,13 @@ GLOBAL_VAR_INIT(date_override_offset, 0)
 	var/oldtod = GLOB.tod
 	if(time >= SSnightshift.nightshift_start_time || time <= SSnightshift.nightshift_dawn_start)
 		GLOB.tod = "night"
-	if(time > SSnightshift.nightshift_dawn_start && time <= SSnightshift.nightshift_day_start)
+	else if(time > SSnightshift.nightshift_dawn_start && time <= SSnightshift.nightshift_day_start)
 		GLOB.tod = "dawn"
-	if(time > SSnightshift.nightshift_day_start && time <= SSnightshift.nightshift_dusk_start)
+	else if(time > SSnightshift.nightshift_day_start && time <= SSnightshift.nightshift_dusk_start)
 		GLOB.tod = "day"
-	if(time > SSnightshift.nightshift_dusk_start && time <= SSnightshift.nightshift_start_time)
+	else if(time > SSnightshift.nightshift_dusk_start && time <= SSnightshift.nightshift_start_time)
 		GLOB.tod = "dusk"
-	if(GLOB.todoverride)
+	else if(GLOB.todoverride)
 		GLOB.tod = GLOB.todoverride
 	if((GLOB.tod != oldtod) && !GLOB.todoverride && (GLOB.dayspassed>1)) //weather check on tod changes
 		if(!GLOB.forecast)
diff --git a/code/game/objects/lighting/rogue_fires.dm b/code/game/objects/lighting/rogue_fires.dm
index 8cfce53f72f..85de524eafb 100644
--- a/code/game/objects/lighting/rogue_fires.dm
+++ b/code/game/objects/lighting/rogue_fires.dm
@@ -269,6 +269,11 @@
 	. = ..()
 	START_PROCESSING(SSobj,AM)
 
+//This thing does NOT light! I am NOT wanting to process this!
+/obj/machinery/light/rogue/torchholder/process()
+	STOP_PROCESSING(SSmachines, src)
+	
+
 //CC Edit end
 
 /obj/machinery/light/rogue/torchholder/c