Pipes manifold layer fix (CeladonSS13#1207)

Пофикшено визуальное дублирование перекрестка труб.
Burbonchik · Nov 22, 2024 · 14654fb · 14654fb
1 parent 0599d38
commit 14654fb
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 17 deletions.
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm
@@ -26,16 +26,18 @@
 	initialize_directions = ALL_CARDINALS
 	initialize_directions &= ~dir
 
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/update_overlays()
-	. = ..()
+/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/update_icon()
+	cut_overlays()
 
 	PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer)
-	. += center
+	add_overlay(center)
 
 	//Add non-broken pieces
 	for(var/i in 1 to device_type)
 		if(nodes[i])
-			. += getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i]))
+			add_overlay( getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) )
+
+	update_layer()
 
 /obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2
 	piping_layer = 2

diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold4w.dm
@@ -24,16 +24,18 @@
 /obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/SetInitDirections()
 	initialize_directions = initial(initialize_directions)
 
-/obj/machinery/atmospherics/pipe/manifold4w/update_overlays()
-	. = ..()
+/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/update_icon()
+	cut_overlays()
 
 	PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer)
-	. += center
+	add_overlay(center)
 
 	//Add non-broken pieces
 	for(var/i in 1 to device_type)
 		if(nodes[i])
-			. += getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i]))
+			add_overlay( getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) )
+
+	update_layer()
 
 /obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer2
 	piping_layer = 2

diff --git a/code/modules/atmospherics/machinery/pipes/manifold.dm b/code/modules/atmospherics/machinery/pipes/manifold.dm
@@ -35,15 +35,16 @@
 	initialize_directions = ALL_CARDINALS
 	initialize_directions &= ~dir
 
-/obj/machinery/atmospherics/pipe/manifold/update_overlays()
-	. = ..()
-
+/obj/machinery/atmospherics/pipe/manifold/update_icon()
+	cut_overlays()
 	if(!center)
 		center = mutable_appearance(icon, "manifold_center")
 	PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer)
-	. += center
+	add_overlay(center)
 
 	//Add non-broken pieces
 	for(var/i in 1 to device_type)
 		if(nodes[i])
-			. += getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i]))
+			add_overlay( getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) )
+
+	update_layer()
diff --git a/code/modules/atmospherics/machinery/pipes/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/manifold4w.dm
@@ -29,16 +29,16 @@
 /obj/machinery/atmospherics/pipe/manifold4w/SetInitDirections()
 	initialize_directions = initial(initialize_directions)
 
-/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/update_overlays()
-	. = ..()
+/obj/machinery/atmospherics/pipe/manifold4w/update_icon()
+	cut_overlays()
 	if(!center)
 		center = mutable_appearance(icon, "manifold_center")
 	PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer)
-	. += center
+	add_overlay(center)
 
 	//Add non-broken pieces
 	for(var/i in 1 to device_type)
 		if(nodes[i])
-			. += getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i]))
+			add_overlay( getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) )
 
 	update_layer()