Merge pull request #4535 from Citadel-Station-13/upstream-merge-33821
[MIRROR] Fixes deleting handcuffs
This commit is contained in:
@@ -1,6 +1,19 @@
|
||||
/obj/item/restraints
|
||||
breakouttime = 600
|
||||
|
||||
/obj/item/restraints/Destroy()
|
||||
if(iscarbon(loc))
|
||||
var/mob/living/carbon/M = loc
|
||||
if(M.handcuffed == src)
|
||||
M.handcuffed = null
|
||||
M.update_handcuffed()
|
||||
if(M.buckled && M.buckled.buckle_requires_restraints)
|
||||
M.buckled.unbuckle_mob(M)
|
||||
if(M.legcuffed == src)
|
||||
M.legcuffed = null
|
||||
M.update_inv_legcuffed()
|
||||
return ..()
|
||||
|
||||
//Handcuffs
|
||||
|
||||
/obj/item/restraints/handcuffs
|
||||
|
||||
@@ -33,10 +33,6 @@
|
||||
if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/restraints/handcuffs/cable))
|
||||
user.visible_message("<span class='notice'>[user] cuts [C]'s restraints with [src]!</span>")
|
||||
qdel(C.handcuffed)
|
||||
C.handcuffed = null
|
||||
if(C.buckled && C.buckled.buckle_requires_restraints)
|
||||
C.buckled.unbuckle_mob(C)
|
||||
C.update_handcuffed()
|
||||
return
|
||||
else
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user