Merge remote-tracking branch 'official/master' into merge-upstream

ss220club · Mar 18, 2024 · 5e9be1b · 5e9be1b
2 parents 156c2e9 + 7779516
commit 5e9be1b
Show file tree

Hide file tree

Showing 91 changed files with 10,340 additions and 10,117 deletions.
diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
@@ -98695,6 +98695,14 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/apmaint)
+"xkI" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 6
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "red"
+	},
+/area/station/security/permabrig)
 "xkJ" = (
 /obj/machinery/atmospherics/binary/pump{
 	name = "burn chamber to port";
@@ -152596,7 +152604,7 @@ ygH
 uUu
 kju
 aKU
-aOX
+xkI
 nFh
 aSj
 aTH