Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Rhials committed Jul 15, 2024
2 parents 7d3572e + 4302c8d commit 1016335
Show file tree
Hide file tree
Showing 998 changed files with 37,972 additions and 29,941 deletions.
3 changes: 3 additions & 0 deletions .github/guides/VISUALS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions _maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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)
Expand Down
5 changes: 2 additions & 3 deletions _maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading

0 comments on commit 1016335

Please sign in to comment.