From b725206f3a5ac686be9b692adf1eb48016b784c8 Mon Sep 17 00:00:00 2001 From: phil235 Date: Mon, 24 Nov 2014 13:12:00 +0100 Subject: [PATCH 1/2] Fix windoor construction exploit. --- code/game/objects/structures/windoor_assembly.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index ac9e59686ea..8e5d20cd8c4 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -267,6 +267,7 @@ obj/structure/windoor_assembly/Destroy() src.electronics.loc = windoor if(created_name) windoor.name = created_name + qdel(src) windoor.close() @@ -286,12 +287,10 @@ obj/structure/windoor_assembly/Destroy() src.electronics.loc = windoor if(created_name) windoor.name = created_name + qdel(src) windoor.close() - qdel(src) - - else ..() From 1f4a07194002422448ea7db48c682f2a64b66019 Mon Sep 17 00:00:00 2001 From: phil235 Date: Mon, 24 Nov 2014 13:21:25 +0100 Subject: [PATCH 2/2] Fixing a similar bug with door assembly. --- code/game/objects/structures/door_assembly.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 08010e7d521..462027d123c 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -599,7 +599,7 @@ obj/structure/door_assembly/New() "You start finishing the airlock.") if(do_after(user, 40)) - if(state == 2) + if(src.loc && state == 2) user << " You've finished the airlock." var/obj/machinery/door/airlock/door if(mineral == "glass")