Merge conflicts, procs instead of macros, mood signals.

2020-05-08 02:12:41 +02:00
parent 91d6faaf21 5e0235bd76
commit 60bdbfaf61
227 changed files with 278636 additions and 999 deletions
@@ -28,6 +28,8 @@

 /obj/machinery/atmospherics/pipe/manifold/update_icon()
 	cut_overlays()
+	if(!center)
+		center = mutable_appearance(icon, "manifold_center")
 	PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer)
 	add_overlay(center)

@@ -26,6 +26,8 @@

 /obj/machinery/atmospherics/pipe/manifold4w/update_icon()
 	cut_overlays()
+	if(!center)
+		center = mutable_appearance(icon, "manifold_center")
 	PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer)
 	add_overlay(center)