From f60e7c6488fbf7e8c472fa4bf5c0b5af34302b91 Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Thu, 30 Jan 2014 21:35:38 +1300 Subject: [PATCH] Fix handcuff resist - layer bug Fixes #4324 Resisting out of handcuffs was leaving the handcuffs layer set to 20 (over top of the UI). Changed it to use the drop_from_inventory() proc so it handles the drop event correctly. --- code/modules/mob/living/living.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index be03e96784e..c346dc9db7d 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -623,9 +623,10 @@ for(var/mob/O in viewers(CM))// lags so hard that 40s isn't lenient enough - Quarxink O.show_message("\red [CM] manages to remove the handcuffs!", 1) CM << "\blue You successfully remove \the [CM.handcuffed]." - CM.handcuffed.loc = usr.loc + CM.drop_from_inventory(CM.handcuffed) CM.handcuffed = null CM.update_inv_handcuffed() + else if(CM.legcuffed && CM.canmove && (CM.last_special <= world.time)) CM.next_move = world.time + 100 CM.last_special = world.time + 100 @@ -661,7 +662,7 @@ for(var/mob/O in viewers(CM))// lags so hard that 40s isn't lenient enough - Quarxink O.show_message("\red [CM] manages to remove the legcuffs!", 1) CM << "\blue You successfully remove \the [CM.legcuffed]." - CM.legcuffed.loc = usr.loc + CM.drop_from_inventory(CM.legcuffed) CM.legcuffed = null CM.update_inv_legcuffed()