Merge pull request #6044 from phil235/WindoorExploitFix

Fix windoor construction exploit.
This commit is contained in:
hornygranny
2014-11-25 12:41:44 -08:00
2 changed files with 3 additions and 4 deletions
@@ -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 << "<span class='notice'> You've finished the airlock.</span>"
var/obj/machinery/door/airlock/door
if(mineral == "glass")
@@ -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
..()