Merge pull request tgstation#41957 from Garen7/master

Fixes runtimes in manifolds on non station z-levels
praisenarsie · Dec 16, 2018 · 93ec235 · 93ec235
2 parents 8ffc797 + a949a8a
commit 93ec235
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm
@@ -17,7 +17,7 @@
 
 	var/mutable_appearance/center
 
-/obj/machinery/atmospherics/pipe/manifold/Initialize()
+/obj/machinery/atmospherics/pipe/manifold/New()
 	icon_state = ""
 	center = mutable_appearance(icon, "manifold_center")
 	return ..()

diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm
@@ -16,7 +16,7 @@
 
 	var/mutable_appearance/center
 
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/Initialize()
+/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/New()
 	icon_state = ""
 	center = mutable_appearance(icon, "manifold4w_center")
 	return ..()

diff --git a/code/modules/atmospherics/machinery/pipes/manifold.dm b/code/modules/atmospherics/machinery/pipes/manifold.dm
@@ -17,7 +17,11 @@
 
 	var/mutable_appearance/center
 
-/obj/machinery/atmospherics/pipe/manifold/Initialize()
+/* We use New() instead of Initialize() because these values are used in update_icon()
+ * in the mapping subsystem init before Initialize() is called in the atoms subsystem init.
+ * This is true for the other manifolds (the 4 ways and the heat exchanges) too.
+ */
+/obj/machinery/atmospherics/pipe/manifold/New()
 	icon_state = ""
 	center = mutable_appearance(icon, "manifold_center")
 	return ..()

diff --git a/code/modules/atmospherics/machinery/pipes/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/manifold4w.dm
@@ -16,7 +16,7 @@
 
 	var/mutable_appearance/center
 
-/obj/machinery/atmospherics/pipe/manifold4w/Initialize()
+/obj/machinery/atmospherics/pipe/manifold4w/New()
 	icon_state = ""
 	center = mutable_appearance(icon, "manifold4w_center")
 	return ..()