Merge pull request #9869 from PsiOmegaDelta/dev-freeze

Dev freeze
2025-12-11 10:43:20 +00:00 · 2015-06-20 20:35:13 +02:00
parent 33dc2e5811 4a5da7221c
commit af59dbab55
1 changed files with 2 additions and 2 deletions
--- a/code/modules/mob/living/carbon/resist.dm
+++ b/code/modules/mob/living/carbon/resist.dm
@@ -19,13 +19,13 @@
 			ExtinguishMob()
 		return

+	..()
+	
 	if(handcuffed)
 		spawn() escape_handcuffs()
 	else if(legcuffed)
 		spawn() escape_legcuffs()

-	..()
-
 /mob/living/carbon/proc/escape_handcuffs()
 	if(!(last_special <= world.time)) return