diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm
index 9ae50b11af8..89cc53b0d42 100644
--- a/code/ATMOSPHERICS/atmospherics.dm
+++ b/code/ATMOSPHERICS/atmospherics.dm
@@ -10,6 +10,9 @@ Pipelines + Other Objects -> Pipe network
 
 */
 /obj/machinery/atmospherics
+
+	auto_init = 0
+
 	anchored = 1
 	idle_power_usage = 0
 	active_power_usage = 0
@@ -87,7 +90,7 @@ obj/machinery/atmospherics/proc/check_connect_types(obj/machinery/atmospherics/a
 /obj/machinery/atmospherics/process()
 	last_flow_rate = 0
 	last_power_draw = 0
-	
+
 	build_network()
 
 /obj/machinery/atmospherics/proc/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 38431627ebe..c4d2abbea55 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -14,9 +14,11 @@
 	var/moved_recently = 0
 	var/mob/pulledby = null
 
+	var/auto_init = 1
+
 /atom/movable/New()
 	..()
-	if(ticker && ticker.current_state == GAME_STATE_PLAYING)
+	if(auto_init && ticker && ticker.current_state == GAME_STATE_PLAYING)
 		initialize()
 
 /atom/movable/Del()