Merge pull request #667 from Profakos/orb-merge-2023-07-23

Orb merge 2023 07 23

_maps/RandomRuins/AnywhereRuins/golem_ship.dmm

@@ -80,12 +80,6 @@
 /obj/item/resonator,
 /turf/open/floor/mineral/titanium/purple,
 /area/ruin/powered/golem_ship)
-"p" = (
-/obj/structure/frame/machine,
-/obj/item/stack/cable_coil/five,
-/obj/item/circuitboard/machine/ore_redemption/offstation,
-/turf/open/floor/mineral/titanium/purple,
-/area/ruin/powered/golem_ship)
 "q" = (
 /obj/structure/statue/gold/rd,
 /obj/structure/window/reinforced/spawner/directional/east{
@@ -140,30 +134,6 @@
 /obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/mineral/titanium/purple,
 /area/ruin/powered/golem_ship)
-"A" = (
-/obj/structure/table/wood,
-/obj/item/surgical_drapes{
-	pixel_x = 15
-	},
-/obj/item/storage/medkit/fire,
-/obj/item/storage/medkit/fire,
-/obj/item/stock_parts/matter_bin,
-/obj/item/assembly/igniter,
-/obj/item/stock_parts/micro_laser,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/turf/open/floor/mineral/titanium/purple,
-/area/ruin/powered/golem_ship)
-"B" = (
-/obj/item/storage/medkit/fire,
-/obj/structure/table/wood,
-/obj/item/storage/medkit/fire,
-/obj/machinery/light/directional/south,
-/turf/open/floor/mineral/titanium/purple,
-/area/ruin/powered/golem_ship)
 "C" = (
 /obj/item/storage/medkit/brute,
 /obj/structure/table/wood,
@@ -222,14 +192,34 @@
 /obj/machinery/light/directional/north,
 /turf/open/floor/mineral/titanium/purple,
 /area/ruin/powered/golem_ship)
-"O" = (
-/obj/machinery/light/directional/west,
+"P" = (
+/obj/structure/table/wood,
+/obj/item/surgical_drapes{
+	pixel_x = 15
+	},
+/obj/item/storage/medkit/fire,
+/obj/item/storage/medkit/fire,
+/obj/item/stock_parts/matter_bin,
+/obj/item/assembly/igniter,
+/obj/item/stock_parts/micro_laser,
+/obj/item/stack/sheet/glass,
+/obj/item/stack/sheet/glass,
+/obj/item/stack/sheet/glass,
+/obj/item/stack/sheet/glass,
+/obj/item/stack/sheet/glass,
+/obj/machinery/light/directional/south,
 /turf/open/floor/mineral/titanium/purple,
 /area/ruin/powered/golem_ship)
 "Q" = (
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/mineral/titanium/purple,
 /area/ruin/powered/golem_ship)
+"S" = (
+/obj/item/storage/medkit/fire,
+/obj/structure/table/wood,
+/obj/item/storage/medkit/fire,
+/turf/open/floor/mineral/titanium/purple,
+/area/ruin/powered/golem_ship)
 "T" = (
 /obj/structure/fans/tiny,
 /obj/machinery/door/airlock/titanium,
@@ -244,13 +234,40 @@
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/plating,
 /area/ruin/powered/golem_ship)
+"W" = (
+/obj/structure/closet/crate,
+/obj/item/shovel,
+/obj/item/shovel,
+/obj/item/shovel,
+/obj/item/pickaxe,
+/obj/item/pickaxe,
+/obj/item/pickaxe,
+/obj/item/storage/bag/ore,
+/obj/item/storage/bag/ore,
+/obj/item/mining_scanner,
+/obj/item/flashlight/lantern,
+/obj/item/card/id/advanced/mining,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/plating,
+/area/ruin/powered/golem_ship)
+"X" = (
+/obj/structure/frame/machine,
+/obj/item/stack/cable_coil/five,
+/obj/item/circuitboard/machine/ore_redemption/offstation,
+/turf/open/floor/mineral/titanium/purple,
+/area/ruin/powered/golem_ship)
 "Y" = (
 /obj/machinery/door/airlock/titanium,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
 /turf/open/floor/mineral/titanium/purple,
 /area/ruin/powered/golem_ship)
+"Z" = (
+/obj/structure/ore_box,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/plating,
+/area/ruin/powered/golem_ship)
 
 (1,1,1) = {"
 a
@@ -329,7 +346,7 @@ a
 a
 a
 b
-L
+l
 l
 j
 l
@@ -347,11 +364,11 @@ b
 b
 b
 b
-l
+L
 l
 b
 l
-Q
+l
 G
 l
 Q
@@ -362,20 +379,20 @@ b
 "}
 (7,1,1) = {"
 b
-c
+W
 f
 j
 l
 l
 b
 l
-l
+Q
 G
 l
 l
 j
 f
-F
+Z
 b
 "}
 (8,1,1) = {"
@@ -386,7 +403,7 @@ j
 l
 l
 b
-L
+l
 l
 G
 l
@@ -399,18 +416,18 @@ b
 (9,1,1) = {"
 b
 c
-I
+f
 b
 M
 o
 b
-l
+L
 l
 G
 o
 U
 b
-V
+f
 F
 b
 "}
@@ -435,7 +452,7 @@ b
 (11,1,1) = {"
 b
 c
-f
+I
 b
 b
 j
@@ -446,25 +463,25 @@ G
 j
 b
 b
-f
+V
 F
 b
 "}
 (12,1,1) = {"
 b
 c
-I
+f
 b
 l
 l
-O
 l
 l
-O
+l
+l
 l
 z
 b
-V
+f
 F
 b
 "}
@@ -509,14 +526,14 @@ b
 d
 f
 b
+N
 l
 l
 l
 l
 l
 l
-l
-A
+P
 b
 f
 f
@@ -527,14 +544,14 @@ T
 e
 I
 b
-N
+l
 l
 l
 l
 l
 v
 l
-B
+S
 b
 V
 f
@@ -547,7 +564,7 @@ f
 b
 l
 l
-p
+X
 l
 l
 w