Merge pull request #7169 from uraniummeltdown/unfun

Lets you resist out of straightjackets, straightjacketed people can be handcuffed

code/modules/mob/living/carbon/alien/humanoid/update_icons.dm

@@ -103,8 +103,7 @@
 				t_suit = "armor"
 			standing.overlays	+= image("icon" = 'icons/effects/blood.dmi', "icon_state" = "[t_suit]blood")
 
-		if(istype(wear_suit, /obj/item/clothing/suit/straight_jacket))
-			unEquip(handcuffed)
+		if(wear_suit.breakouttime)
 			drop_r_hand()
 			drop_l_hand()
 

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

@@ -806,6 +806,10 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 				legcuffed = null
 				update_inv_legcuffed()
 				return
+			else
+				unEquip(I)
+				I.dropped()
+				return
 			return 1
 		else
 			to_chat(src, "<span class='warning'>You fail to remove [I]!</span>")

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

@@ -1406,6 +1406,14 @@
 		if(..())
 			unEquip(I)
 
+/mob/living/carbon/human/resist_restraints()
+	if(wear_suit && wear_suit.breakouttime)
+		changeNext_move(CLICK_CD_BREAKOUT)
+		last_special = world.time + CLICK_CD_BREAKOUT
+		cuff_resist(wear_suit)
+	else
+		..()
+
 /mob/living/carbon/human/get_visible_implants(var/class = 0)
 
 	var/list/visible_implants = list()

code/modules/mob/living/carbon/human/update_icons.dm

@@ -964,8 +964,7 @@ var/global/list/damage_icon_parts = list()
 			standing = image("icon" = 'icons/mob/suit.dmi', "icon_state" = "[wear_suit.icon_state]")
 
 
-		if( istype(wear_suit, /obj/item/clothing/suit/straight_jacket) )
-			unEquip(handcuffed)
+		if(wear_suit.breakouttime)
 			drop_l_hand()
 			drop_r_hand()