From ca044dcc2bbe16c000e103ec5a0f2b439bf5512f Mon Sep 17 00:00:00 2001 From: Neerti Date: Fri, 1 Feb 2019 21:39:46 -0500 Subject: [PATCH] Stairs go up --- code/modules/multiz/structures.dm | 4 ++++ html/changelogs/ater_stairs.yml | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 html/changelogs/ater_stairs.yml diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm index 118cb999de..0fd93d1132 100644 --- a/code/modules/multiz/structures.dm +++ b/code/modules/multiz/structures.dm @@ -130,7 +130,11 @@ density = 0 opacity = 0 anchored = 1 +<<<<<<< HEAD layer = 2.4 // Above turf, but they're sort of the floor, so below objects. +======= + flags = ON_BORDER +>>>>>>> ca2dab5... Merge pull request #5924 from Atermonera/stairway_to_heaven /obj/structure/stairs/initialize() . = ..() diff --git a/html/changelogs/ater_stairs.yml b/html/changelogs/ater_stairs.yml new file mode 100644 index 0000000000..fd313ac717 --- /dev/null +++ b/html/changelogs/ater_stairs.yml @@ -0,0 +1,4 @@ +author: Atermonera +delete-after: True +changes + - bugfix: "Stairs have been straightened and now connect to both the heavens and hells, formerly just the hells." \ No newline at end of file