From ca044dcc2bbe16c000e103ec5a0f2b439bf5512f Mon Sep 17 00:00:00 2001 From: Neerti Date: Fri, 1 Feb 2019 21:39:46 -0500 Subject: [PATCH 1/2] 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 118cb999de1..0fd93d1132d 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 00000000000..fd313ac717d --- /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 From 352fe555f29eaec1fbe33dede7058f6465b2d55e Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Thu, 28 Mar 2019 16:33:29 -0400 Subject: [PATCH 2/2] Update structures.dm --- code/modules/multiz/structures.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm index 0fd93d1132d..6abc33d56c8 100644 --- a/code/modules/multiz/structures.dm +++ b/code/modules/multiz/structures.dm @@ -130,11 +130,7 @@ 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() . = ..() @@ -186,4 +182,4 @@ /obj/structure/stairs/west dir = WEST - bound_width = 64 \ No newline at end of file + bound_width = 64