Merge remote-tracking branch 'origin/master' into pr/424

Monkestation · Oct 9, 2023 · 0f20eff · 0f20eff
2 parents 349b3d0 + 191592c
commit 0f20eff
Show file tree

Hide file tree

Showing 53 changed files with 2,702 additions and 1,969 deletions.
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -52951,14 +52951,6 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/fore)
-"mQm" = (
-/obj/effect/spawner/structure/window/reinforced/plasma,
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
-	dir = 8
-	},
-/obj/structure/window/reinforced/plasma/spawner/directional/west,
-/turf/open/floor/plating,
-/area/station/engineering/supermatter/room)
 "mQt" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment,
@@ -118632,7 +118624,7 @@ vVc
 gAw
 gAw
 cCY
-mQm
+qmJ
 cCY
 gAw
 gAw

diff --git a/_maps/map_files/Mining/Oshan.dmm b/_maps/map_files/Mining/Oshan.dmm
@@ -120,6 +120,26 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/security/prison/visit)
+"hs" = (
+/obj/structure/rack,
+/obj/item/gps/mining{
+	pixel_x = 8;
+	pixel_y = -2
+	},
+/obj/item/gps/mining{
+	pixel_x = -6;
+	pixel_y = 4
+	},
+/obj/item/gps/mining{
+	pixel_x = -6;
+	pixel_y = -2
+	},
+/obj/item/gps/mining{
+	pixel_x = 8;
+	pixel_y = 4
+	},
+/turf/open/floor/iron,
+/area/mine/production)
 "hC" = (
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable,
@@ -24900,7 +24920,7 @@ mt
 nW
 nW
 nW
-bE
+hs
 Jq
 Ev
 Hv