From 2fd4774d012a4c6cce0b79439329c5ec36778adf Mon Sep 17 00:00:00 2001
From: Loganbacca <wookieemanlogan@hotmail.com>
Date: Wed, 14 May 2014 21:54:49 +1200
Subject: [PATCH] Fix resisting out of closets

- Removed do_after proc since it was hanging somewhere
---
 code/modules/mob/living/living.dm | 77 +++++++++++++++----------------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 9ab5ff9f9a7..aa15b670c33 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -574,47 +574,46 @@
 			O.show_message("\red <B>The [L.loc] begins to shake violently!</B>", 1)
 
 
-		spawn(0)
-			if(do_after(usr,(breakout_time*60*10))) //minutes * 60seconds * 10deciseconds
-				if(!C || !L || L.stat != CONSCIOUS || L.loc != C || C.opened) //closet/user destroyed OR user dead/unconcious OR user no longer in closet OR closet opened
+		spawn(breakout_time*60*10) //minutes * 60seconds * 10deciseconds
+			if(!C || !L || L.stat != CONSCIOUS || L.loc != C || C.opened) //closet/user destroyed OR user dead/unconcious OR user no longer in closet OR closet opened
+				return
+
+			//Perform the same set of checks as above for weld and lock status to determine if there is even still a point in 'resisting'...
+			if(istype(L.loc, /obj/structure/closet/secure_closet))
+				var/obj/structure/closet/secure_closet/SC = L.loc
+				if(!SC.locked && !SC.welded)
+					return
+			else
+				if(!C.welded)
 					return
 
-				//Perform the same set of checks as above for weld and lock status to determine if there is even still a point in 'resisting'...
-				if(istype(L.loc, /obj/structure/closet/secure_closet))
-					var/obj/structure/closet/secure_closet/SC = L.loc
-					if(!SC.locked && !SC.welded)
-						return
-				else
-					if(!C.welded)
-						return
-
-				//Well then break it!
-				if(istype(usr.loc, /obj/structure/closet/secure_closet))
-					var/obj/structure/closet/secure_closet/SC = L.loc
-					SC.desc = "It appears to be broken."
-					SC.icon_state = SC.icon_off
-					flick(SC.icon_broken, SC)
-					sleep(10)
-					flick(SC.icon_broken, SC)
-					sleep(10)
-					SC.broken = 1
-					SC.locked = 0
-					usr << "\red You successfully break out!"
-					for(var/mob/O in viewers(L.loc))
-						O.show_message("\red <B>\the [usr] successfully broke out of \the [SC]!</B>", 1)
-					if(istype(SC.loc, /obj/structure/bigDelivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace)
-						var/obj/structure/bigDelivery/BD = SC.loc
-						BD.attack_hand(usr)
-					SC.open()
-				else
-					C.welded = 0
-					usr << "\red You successfully break out!"
-					for(var/mob/O in viewers(L.loc))
-						O.show_message("\red <B>\the [usr] successfully broke out of \the [C]!</B>", 1)
-					if(istype(C.loc, /obj/structure/bigDelivery)) //nullspace ect.. read the comment above
-						var/obj/structure/bigDelivery/BD = C.loc
-						BD.attack_hand(usr)
-					C.open()
+			//Well then break it!
+			if(istype(usr.loc, /obj/structure/closet/secure_closet))
+				var/obj/structure/closet/secure_closet/SC = L.loc
+				SC.desc = "It appears to be broken."
+				SC.icon_state = SC.icon_off
+				flick(SC.icon_broken, SC)
+				sleep(10)
+				flick(SC.icon_broken, SC)
+				sleep(10)
+				SC.broken = 1
+				SC.locked = 0
+				usr << "\red You successfully break out!"
+				for(var/mob/O in viewers(L.loc))
+					O.show_message("\red <B>\the [usr] successfully broke out of \the [SC]!</B>", 1)
+				if(istype(SC.loc, /obj/structure/bigDelivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace)
+					var/obj/structure/bigDelivery/BD = SC.loc
+					BD.attack_hand(usr)
+				SC.open()
+			else
+				C.welded = 0
+				usr << "\red You successfully break out!"
+				for(var/mob/O in viewers(L.loc))
+					O.show_message("\red <B>\the [usr] successfully broke out of \the [C]!</B>", 1)
+				if(istype(C.loc, /obj/structure/bigDelivery)) //nullspace ect.. read the comment above
+					var/obj/structure/bigDelivery/BD = C.loc
+					BD.attack_hand(usr)
+				C.open()
 
 	//breaking out of handcuffs
 	else if(iscarbon(L))