Merge pull request #1260 from Datraen/BuckleResistFix

Fixes buckling preventing NanoUI interactions, resist unbuckling and uncuffing at the same time.

code/modules/mob/living/carbon/resist.dm

@@ -19,12 +19,12 @@
 			ExtinguishMob()
 		return
 
-	..()
-
-	if(handcuffed)
+	else if(handcuffed)
 		spawn() escape_handcuffs()
 	else if(legcuffed)
 		spawn() escape_legcuffs()
+	else
+		..()
 
 /mob/living/carbon/proc/escape_handcuffs()
 	//if(!(last_special <= world.time)) return

code/modules/mob/mob.dm

@@ -154,7 +154,9 @@
 /mob/proc/buckled()
 	// Preliminary work for a future buckle rewrite,
 	// where one might be fully restrained (like an elecrical chair), or merely secured (shuttle chair, keeping you safe but not otherwise restrained from acting)
-	return buckled ? FULLY_BUCKLED : UNBUCKLED
+	if(!buckled)
+		return UNBUCKLED
+	return restrained() ? FULLY_BUCKLED : PARTIALLY_BUCKLED
 
 /mob/proc/incapacitated(var/incapacitation_flags = INCAPACITATION_DEFAULT)
 	if (stat || paralysis || stunned || weakened || resting || sleeping || (status_flags & FAKEDEATH))