diff --git a/code/__DEFINES/MC.dm b/code/__DEFINES/MC.dm
index 0b9a85d9194..e2452ff032b 100644
--- a/code/__DEFINES/MC.dm
+++ b/code/__DEFINES/MC.dm
@@ -80,6 +80,17 @@
 }\
 /datum/controller/subsystem/timer/##X
 
+<<<<<<< HEAD
+=======
+#define MOVEMENT_SUBSYSTEM_DEF(X) GLOBAL_REAL(SS##X, /datum/controller/subsystem/movement/##X);\
+/datum/controller/subsystem/movement/##X/New(){\
+	NEW_SS_GLOBAL(SS##X);\
+	PreInit();\
+	ss_id="movement_[#X]";\
+}\
+/datum/controller/subsystem/movement/##X
+
+>>>>>>> bdeb199b49... Revert "Brings our MC up to date with TG (#7285)" (#7597)
 #define PROCESSING_SUBSYSTEM_DEF(X) GLOBAL_REAL(SS##X, /datum/controller/subsystem/processing/##X);\
 /datum/controller/subsystem/processing/##X/New(){\
     NEW_SS_GLOBAL(SS##X);\
diff --git a/code/controllers/globals.dm b/code/controllers/globals.dm
index fea1fd209ef..cd051e24c47 100644
--- a/code/controllers/globals.dm
+++ b/code/controllers/globals.dm
@@ -20,8 +20,14 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars)
 
 	Initialize()
 
+<<<<<<< HEAD
 /datum/controller/global_vars/Destroy()
 	//fuck off kevinz
+=======
+/datum/controller/global_vars/Destroy(force)
+	// This is done to prevent an exploit where admins can get around protected vars
+	SHOULD_CALL_PARENT(0)
+>>>>>>> bdeb199b49... Revert "Brings our MC up to date with TG (#7285)" (#7597)
 	return QDEL_HINT_IWILLGC
 
 /datum/controller/global_vars/stat_entry()
diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm
index bc59198a08f..5333ebc013f 100644
--- a/code/game/objects/structures/traps.dm
+++ b/code/game/objects/structures/traps.dm
@@ -54,7 +54,11 @@
 	// Makes the trap visible, and starts the cooldown until it's
 	// able to be triggered again.
 	visible_message(flare_message)
+<<<<<<< HEAD
 	if(sparks)
+=======
+	if(sparks && Master.current_runlevel)
+>>>>>>> bdeb199b49... Revert "Brings our MC up to date with TG (#7285)" (#7597)
 		spark_system.start()
 	alpha = 200
 	last_trigger = world.time
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 5ee3aba0b14..042af4377be 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -422,7 +422,11 @@
 	update()
 
 /obj/machinery/light/proc/broken_sparks(start_only=FALSE)
+<<<<<<< HEAD
 	if(!QDELETED(src) && status == LIGHT_BROKEN && has_power())
+=======
+	if(!QDELETED(src) && status == LIGHT_BROKEN && has_power() && Master.current_runlevel)
+>>>>>>> bdeb199b49... Revert "Brings our MC up to date with TG (#7285)" (#7597)
 		if(!start_only)
 			do_sparks(3, TRUE, src)
 		var/delay = rand(BROKEN_SPARKS_MIN, BROKEN_SPARKS_MAX)
@@ -755,7 +759,11 @@
 	if(status == LIGHT_EMPTY || status == LIGHT_BROKEN)
 		return
 
+<<<<<<< HEAD
 	if(!skip_sound_and_sparks)
+=======
+	if(!skip_sound_and_sparks && Master.current_runlevel) //not completly sure disabling this during initialize is needed but then again there are broken lights after initialize
+>>>>>>> bdeb199b49... Revert "Brings our MC up to date with TG (#7285)" (#7597)
 		if(status == LIGHT_OK || status == LIGHT_BURNED)
 			playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
 		if(on)