Merge branch 'master' into giant_armored_seprentids

ss220club · Dec 19, 2024 · af38637 · af38637
2 parents 89a1cba + 4daee8e
commit af38637
Show file tree

Hide file tree

Showing 109 changed files with 13,289 additions and 12,859 deletions.
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
@@ -72758,6 +72758,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan,
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
+"osD" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/junction,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/starboard/south)
 "osJ" = (
 /obj/machinery/light,
 /turf/simulated/floor/beach/away/water/deep,
@@ -114440,6 +114449,7 @@
 	name = "north bump";
 	pixel_y = 28
 	},
+/obj/item/stamp/clown,
 /turf/simulated/floor/wood,
 /area/station/service/clown)
 "wDu" = (
@@ -164469,7 +164479,7 @@ wyU
 wyU
 aSM
 tMv
-oCW
+osD
 tMv
 vhx
 cwf