From fca1df9a2bd67815eca77496ae93e1ddb6b03d54 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 11 Aug 2017 14:54:00 -0500 Subject: [PATCH 1/4] Fixes bad dirs --- code/game/machinery/shieldgen.dm.rej | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 code/game/machinery/shieldgen.dm.rej diff --git a/code/game/machinery/shieldgen.dm.rej b/code/game/machinery/shieldgen.dm.rej new file mode 100644 index 0000000000..12ce2d21dc --- /dev/null +++ b/code/game/machinery/shieldgen.dm.rej @@ -0,0 +1,10 @@ +diff a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm (rejected hunks) +@@ -12,7 +12,7 @@ + + /obj/structure/emergency_shield/Initialize() + . = ..() +- setDir(pick(1,2,3,4)) ++ setDir(pick(GLOB.cardinals)) + air_update_turf(1) + + /obj/structure/emergency_shield/Destroy() From 98ff124b68213796fc98b00054dab365da6a9202 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 14 Aug 2017 18:50:44 -0500 Subject: [PATCH 2/4] Update shieldgen.dm --- code/game/machinery/shieldgen.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index a7d857844a..fbfbe61c0f 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -10,10 +10,11 @@ max_integrity = 200 //The shield can only take so much beating (prevents perma-prisons) CanAtmosPass = ATMOS_PASS_DENSITY -/obj/structure/emergency_shield/New() - src.setDir(pick(1,2,3,4)) - ..() - air_update_turf(1) +/obj/structure/emergency_shield/Initialize() + . = ..() + setDir(pick(1,2,3,4)) + setDir(pick(GLOB.cardinals)) + air_update_turf(1) /obj/structure/emergency_shield/Destroy() density = FALSE From 2719f23e52a352e09323625f92210eee1b8350cb Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 14 Aug 2017 18:53:01 -0500 Subject: [PATCH 3/4] Update shieldgen.dm --- code/game/machinery/shieldgen.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index fbfbe61c0f..0629eea303 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -10,9 +10,8 @@ max_integrity = 200 //The shield can only take so much beating (prevents perma-prisons) CanAtmosPass = ATMOS_PASS_DENSITY -/obj/structure/emergency_shield/Initialize() - . = ..() - setDir(pick(1,2,3,4)) + /obj/structure/emergency_shield/Initialize() + . = ..() setDir(pick(GLOB.cardinals)) air_update_turf(1) From 64b3fe43d9a8412d534619c3781b62eeb26943dd Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 14 Aug 2017 19:38:43 -0500 Subject: [PATCH 4/4] Update shieldgen.dm --- code/game/machinery/shieldgen.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 0629eea303..c857ddaf16 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -10,10 +10,10 @@ max_integrity = 200 //The shield can only take so much beating (prevents perma-prisons) CanAtmosPass = ATMOS_PASS_DENSITY - /obj/structure/emergency_shield/Initialize() - . = ..() +/obj/structure/emergency_shield/Initialize() + . = ..() setDir(pick(GLOB.cardinals)) - air_update_turf(1) + air_update_turf(1) /obj/structure/emergency_shield/Destroy() density = FALSE