mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-16 13:12:22 +00:00
Makes Straight Jackets and Ling Revive resist compatible.
This commit is contained in:
@@ -21,7 +21,7 @@
|
||||
if(world.time < changeling.next_escape)
|
||||
to_chat(src, "<span class='warning'>We are still recovering from our last escape...</span>")
|
||||
return 0
|
||||
if(!(C.handcuffed || C.legcuffed)) // No need to waste chems if there's nothing to break out of
|
||||
if(!(C.handcuffed || C.legcuffed || istype(C.wear_suit,/obj/item/clothing/suit/straight_jacket))) // No need to waste chems if there's nothing to break out of
|
||||
to_chat(C, "<span class='warning'>We are are not restrained in a way we can escape...</span>")
|
||||
return 0
|
||||
|
||||
@@ -53,6 +53,12 @@
|
||||
W.dropped(C)
|
||||
if(W)
|
||||
W.layer = initial(W.layer)
|
||||
if(C.wear_suit && istype(C.wear_suit, /obj/item/clothing/suit/straight_jacket))
|
||||
var/obj/item/clothing/suit/straight_jacket/SJ = C.wear_suit
|
||||
SJ.loc = C.loc
|
||||
SJ.dropped(C)
|
||||
C.wear_suit = null
|
||||
escape_cooldown *= 1.5 // Straight jackets are tedious compared to cuffs.
|
||||
|
||||
if(src.mind.changeling.recursive_enhancement)
|
||||
escape_cooldown *= 0.5
|
||||
|
||||
@@ -45,6 +45,36 @@
|
||||
BITSET(H.hud_updateflag, STATUS_HUD)
|
||||
BITSET(H.hud_updateflag, LIFE_HUD)
|
||||
|
||||
if(H.handcuffed)
|
||||
var/obj/item/weapon/W = H.handcuffed
|
||||
H.handcuffed = null
|
||||
if(H.buckled && H.buckled.buckle_require_restraints)
|
||||
H.buckled.unbuckle_mob()
|
||||
H.update_inv_handcuffed()
|
||||
if (H.client)
|
||||
H.client.screen -= W
|
||||
if(W)
|
||||
W.loc = H.loc
|
||||
W.dropped(H)
|
||||
if(W)
|
||||
W.layer = initial(W.layer)
|
||||
if(H.legcuffed)
|
||||
var/obj/item/weapon/W = H.legcuffed
|
||||
H.legcuffed = null
|
||||
H.update_inv_legcuffed()
|
||||
if(H.client)
|
||||
H.client.screen -= W
|
||||
if(W)
|
||||
W.loc = H.loc
|
||||
W.dropped(H)
|
||||
if(W)
|
||||
W.layer = initial(W.layer)
|
||||
if(H.wear_suit && istype(H.wear_suit, /obj/item/clothing/suit/straight_jacket))
|
||||
var/obj/item/clothing/suit/straight_jacket/SJ = H.wear_suit
|
||||
SJ.loc = H.loc
|
||||
SJ.dropped(H)
|
||||
H.wear_suit = null
|
||||
|
||||
C.halloss = 0
|
||||
C.shock_stage = 0 //Pain
|
||||
C << "<span class='notice'>We have regenerated.</span>"
|
||||
|
||||
Reference in New Issue
Block a user