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

part 2

Browse Source
This commit is contained in:
SandPoot
2023-10-02 13:54:40 -03:00
parent 8db27b8ff4
commit a034a96fc2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/structures/beds_chairs/alien_nest.dm
View File

@@ -34,7 +34,7 @@
"<span class='warning'>[M.name] struggles to break free from the gelatinous resin!</span>",\
"<span class='notice'>You struggle to break free from the gelatinous resin... (Stay still for two minutes.)</span>",\
"<span class='italics'>You hear squelching...</span>")
if(!do_after(M, 1200, target = src))
if(!do_after(M, 2 MINUTES, target = src, timed_action_flags = (IGNORE_HELD_ITEM | IGNORE_INCAPACITATED), extra_checks = CALLBACK(M, TYPE_PROC_REF(/mob/living/carbon, cuff_resist_check))))
if(M && M.buckled)
to_chat(M, "<span class='warning'>You fail to unbuckle yourself!</span>")
return
@@ -48,8 +48,8 @@
unbuckle_mob(M)
add_fingerprint(user)
/obj/structure/bed/nest/user_buckle_mob(mob/living/M, mob/living/user)
if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.incapacitated() || M.buckled )
/obj/structure/bed/nest/user_buckle_mob(mob/living/M, mob/living/carbon/user)
if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || !user.cuff_resist_check() || M.buckled )
return
if(M.getorgan(/obj/item/organ/alien/plasmavessel))

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

@@ -267,7 +267,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)