Merge pull request #542 from Sea-of-Lost-Souls/upstreammaint

[MDB IGNORE] [IDB IGNORE] Maintrawrence
Sea-of-Lost-Souls · Jul 26, 2024 · a6adb80 · a6adb80
2 parents 5cab238 + 30fea58
commit a6adb80
Show file tree

Hide file tree

Showing 3,399 changed files with 326,812 additions and 76,599 deletions.
diff --git a/_maps/RandomRuins/AnywhereRuins/golem_ship.dmm b/_maps/RandomRuins/AnywhereRuins/golem_ship.dmm
@@ -686,7 +686,6 @@
 "Ro" = (
 /obj/structure/table/wood,
 /obj/item/bedsheet/rd/royal_cape{
-	layer = 3;
 	pixel_x = 5;
 	pixel_y = 9
 	},

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm
@@ -188,7 +188,7 @@
 /turf/open/floor/iron,
 /area/ruin/bughabitat)
 "sr" = (
-/obj/machinery/plumbing/growing_vat,
+/obj/machinery/vatgrower,
 /turf/open/floor/iron,
 /area/ruin/bughabitat)
 "st" = (
@@ -322,14 +322,10 @@
 /area/ruin/bughabitat)
 "Ku" = (
 /obj/structure/table,
-/obj/item/construction/plumbing/research,
 /turf/open/floor/plastic,
 /area/ruin/bughabitat)
 "Ly" = (
 /obj/structure/table,
-/obj/item/stack/ducts/fifty{
-	amount = 23
-	},
 /mob/living/basic/butterfly,
 /turf/open/floor/plastic,
 /area/ruin/bughabitat)

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm
@@ -25,9 +25,8 @@
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/tank/air{
-	dir = 8;
-	piping_layer = 4
+/obj/machinery/atmospherics/components/tank/air/layer4{
+	dir = 8
 	},
 /obj/structure/window/reinforced/spawner/directional/west,
 /turf/open/floor/plating/icemoon,

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm
@@ -2,11 +2,11 @@
 "a" = (
 /turf/closed/mineral/random/snow,
 /area/icemoon/surface/outdoors/nospawn)
-"b" = (
+"c" = (
 /obj/item/circuitboard/machine/space_heater,
 /obj/item/stack/cable_coil/five,
 /obj/structure/frame/machine,
-/obj/item/stock_parts/cell/super,
+/obj/item/stock_parts/power_store/cell/super,
 /turf/open/floor/wood,
 /area/ruin/smoking_room/house)
 "d" = (
@@ -173,20 +173,6 @@
 /obj/effect/decal/cleanable/ash,
 /turf/open/floor/carpet/blue,
 /area/ruin/smoking_room/room)
-"E" = (
-/obj/item/trash/shrimp_chips,
-/obj/item/clothing/mask/cigarette/rollie/trippy{
-	pixel_x = 3;
-	pixel_y = -1
-	},
-/obj/item/clothing/mask/cigarette/rollie/trippy{
-	pixel_x = 3;
-	pixel_y = 5
-	},
-/obj/effect/spawner/random/trash/bin,
-/obj/effect/spawner/random/special_lighter,
-/turf/open/floor/wood,
-/area/ruin/smoking_room/house)
 "F" = (
 /obj/structure/table/wood/fancy/black,
 /obj/item/storage/fancy/cigarettes/cigars/cohiba,
@@ -272,6 +258,20 @@
 	},
 /turf/open/floor/wood,
 /area/ruin/smoking_room/house)
+"U" = (
+/obj/item/trash/shrimp_chips,
+/obj/item/cigarette/rollie/trippy{
+	pixel_x = 3;
+	pixel_y = -1
+	},
+/obj/item/cigarette/rollie/trippy{
+	pixel_x = 3;
+	pixel_y = 5
+	},
+/obj/effect/spawner/random/trash/bin,
+/obj/effect/spawner/random/special_lighter,
+/turf/open/floor/wood,
+/area/ruin/smoking_room/house)
 "V" = (
 /obj/structure/fireplace,
 /obj/effect/turf_decal/siding/wood,
@@ -373,7 +373,7 @@ x
 B
 r
 S
-b
+c
 I
 Q
 Q
@@ -471,7 +471,7 @@ a
 a
 a
 I
-E
+U
 u
 y
 L

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
@@ -89,7 +89,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/cell_charger,
-/obj/item/stock_parts/cell,
+/obj/item/stock_parts/power_store/cell,
 /turf/open/floor/plating,
 /area/ruin/plasma_facility/operations)
 "bv" = (
@@ -166,7 +166,7 @@
 	pixel_x = -7;
 	pixel_y = 8
 	},
-/obj/item/stock_parts/cell/high{
+/obj/item/stock_parts/power_store/cell/high{
 	pixel_x = -18;
 	pixel_y = -3
 	},