Merge pull request #30925

This commit is contained in:
Jordan Brown
2017-09-22 14:03:31 -04:00
2 changed files with 6 additions and 0 deletions
+5
View File
@@ -291,6 +291,10 @@
/mob/living/carbon/proc/cuff_resist(obj/item/I, breakouttime = 600, cuff_break = 0)
if(I.being_removed)
to_chat(src, "<span class='warning'>You're already attempting to remove [I]!</span>")
return
I.being_removed = TRUE
breakouttime = I.breakouttime
var/displaytime = breakouttime / 600
if(!cuff_break)
@@ -312,6 +316,7 @@
else if(cuff_break == INSTANT_CUFFBREAK)
clear_cuffs(I, cuff_break)
I.being_removed = FALSE
/mob/living/carbon/proc/uncuff()
if (handcuffed)