Merge remote-tracking branch 'upstream/master' into translate

ss220club · Jul 9, 2024 · 137420c · 137420c
2 parents ecc0517 + e7346a3
commit 137420c
Show file tree

Hide file tree

Showing 1,285 changed files with 36,067 additions and 16,453 deletions.
diff --git a/.github/guides/VISUALS.md b/.github/guides/VISUALS.md
@@ -406,6 +406,9 @@ There are a few snowflake layers that can be used to accomplish niche goals, alo
 
 Floating layers will float "up" the chain of things they're being drawn onto, until they find a real layer. They'll then offset off of that.
 
+Adding `TOPDOWN_LAYER` (actual value `10000`) to another layer forces the appearance into topdown rendering, locally disabling [side map](#side_map-check-the-main-page-too).
+We can think of this as applying to planes, since we don't want it interlaying with other non topdown objects.
+
 This allows us to keep relative layer differences while not needing to make all sources static. Often very useful.
 
 ## Planes

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,