shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into throwing-updat

Browse Source
This commit is contained in:
SandPoot
2023-10-04 15:15:15 -03:00
committed by GitHub
parent 5a90dabd3c bae4216c20
commit c3735c05ac
10 changed files with 35 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/carbon/carbon.dm
View File

@@ -266,7 +266,7 @@
MarkResistTime()
visible_message("<span class='warning'>[src] attempts to unbuckle [p_them()]self!</span>", \
"<span class='notice'>You attempt to unbuckle yourself... (This will take around [round(buckle_cd/600,1)] minute\s, and you need to stay still.)</span>")
if(do_after(src, buckle_cd, src, timed_action_flags = IGNORE_HELD_ITEM))
if(do_after(src, buckle_cd, src, timed_action_flags = IGNORE_HELD_ITEM | IGNORE_INCAPACITATED, extra_checks = CALLBACK(src, .proc/cuff_resist_check)))
if(!buckled)
return
buckled.user_unbuckle_mob(src, src)