Linter diagnostics + bans non-var relative pathing

code/controllers/autotransfer.dm

@@ -1,20 +1,24 @@
 var/datum/controller/transfer_controller/transfer_controller
 
-datum/controller/transfer_controller
+/datum/controller/transfer_controller
 	var/timerbuffer = 0 //buffer for time check
 	var/currenttick = 0
+<<<<<<< HEAD
 	var/shift_hard_end = 0 //VOREStation Edit
 	var/shift_last_vote = 0 //VOREStation Edit
 datum/controller/transfer_controller/New()
+=======
+/datum/controller/transfer_controller/New()
+>>>>>>> 593246b... Linter diagnostics + bans non-var relative pathing (#8150)
 	timerbuffer = config.vote_autotransfer_initial
 	shift_hard_end = config.vote_autotransfer_initial + (config.vote_autotransfer_interval * 0) //VOREStation Edit //Change this "1" to how many extend votes you want there to be.
 	shift_last_vote = shift_hard_end - config.vote_autotransfer_interval //VOREStation Edit
 	START_PROCESSING(SSprocessing, src)
 
-datum/controller/transfer_controller/Destroy()
+/datum/controller/transfer_controller/Destroy()
 	STOP_PROCESSING(SSprocessing, src)
 
-datum/controller/transfer_controller/process()
+/datum/controller/transfer_controller/process()
 	currenttick = currenttick + 1
 	//VOREStation Edit START
 	if (round_duration_in_ds >= shift_last_vote - 2 MINUTES) 

code/controllers/communications.dm

@@ -192,11 +192,14 @@ var/list/ANTAG_FREQS = list(SYND_FREQ, RAID_FREQ)
 //Department channels, arranged lexically
 var/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, ENT_FREQ, MED_FREQ, SEC_FREQ, SCI_FREQ, SRV_FREQ, SUP_FREQ)
 
+<<<<<<< HEAD
 var/list/OFFMAP_FREQS = list(TALON_FREQ) //VOREStation Add
 
 #define TRANSMISSION_WIRE	0
 #define TRANSMISSION_RADIO	1
 
+=======
+>>>>>>> 593246b... Linter diagnostics + bans non-var relative pathing (#8150)
 /proc/frequency_span_class(var/frequency)
 	// Antags!
 	if (frequency in ANTAG_FREQS)

code/controllers/master_controller.dm

@@ -13,10 +13,10 @@ var/global/last_tick_duration = 0
 
 var/global/pipe_processing_killed = 0
 
-datum/controller/game_controller
+/datum/controller/game_controller
 	var/list/shuttle_list	                    // For debugging and VV
 
-datum/controller/game_controller/New()
+/datum/controller/game_controller/New()
 	//There can be only one master_controller. Out with the old and in with the new.
 	if(master_controller != src)
 		log_debug("Rebuilding Master Controller")
@@ -33,7 +33,7 @@ datum/controller/game_controller/New()
 	if(!syndicate_code_phrase)		syndicate_code_phrase	= generate_code_phrase()
 	if(!syndicate_code_response)	syndicate_code_response	= generate_code_phrase()
 
-datum/controller/game_controller/proc/setup()
+/datum/controller/game_controller/proc/setup()
 
 	setup_objects()
 	// setupgenetics() Moved to SSatoms
@@ -48,7 +48,7 @@ datum/controller/game_controller/proc/setup()
 // #define CHECK_SLEEP_MASTER if(++initialized_objects > 500) { initialized_objects=0;sleep(world.tick_lag); }
 // #endif
 
-datum/controller/game_controller/proc/setup_objects()
+/datum/controller/game_controller/proc/setup_objects()
 	// Set up antagonists.
 	populate_antag_type_list()
 

code/controllers/subsystems/lighting.dm

@@ -86,6 +86,29 @@ SUBSYSTEM_DEF(lighting)
 		queue.Cut(1, i+1)
 
 
+<<<<<<< HEAD
 /datum/controller/subsystem/lighting/Recover()
 	subsystem_initialized = SSlighting.subsystem_initialized
 	..()
+=======
+		DUAL_TICK_CHECK
+
+/datum/controller/subsystem/lighting/stat_entry(msg_prefix)
+	var/list/msg = list(msg_prefix)
+	msg += "T:{"
+	msg += "S [total_lighting_sources] | "
+	msg += "C [total_lighting_corners] | "
+	msg += "O [total_lighting_overlays]"
+	msg += "}"
+	msg += "C:{"
+	msg += "S [round(cost_lights, 1)] | "
+	msg += "C [round(cost_corners, 1)] | "
+	msg += "O [round(cost_overlays, 1)]"
+	msg += "}"
+	..(msg.Join())
+
+#undef DUAL_TICK_CHECK
+#undef SSLIGHTING_STAGE_LIGHTS
+#undef SSLIGHTING_STAGE_CORNERS
+#undef SSLIGHTING_STAGE_OVERLAYS
+>>>>>>> 593246b... Linter diagnostics + bans non-var relative pathing (#8150)

code/controllers/subsystems/machines.dm

@@ -175,5 +175,4 @@ SUBSYSTEM_DEF(machines)
 
 #undef SSMACHINES_PIPENETS
 #undef SSMACHINES_MACHINERY
-#undef SSMACHINES_POWER
 #undef SSMACHINES_POWER_OBJECTS