More Zombie Tweaks (#25789)

* lmao

* text fix

* lol
This commit is contained in:
Contrabang
2024-06-12 22:02:53 +00:00
committed by GitHub
parent e7e340598c
commit a7c273463d
12 changed files with 47 additions and 31 deletions
@@ -892,16 +892,18 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
/mob/living/carbon/proc/cuff_resist(obj/item/I, breakouttime = 600, cuff_break = 0)
breakouttime = I.breakouttime
if(HAS_TRAIT(src, TRAIT_I_WANT_BRAINS))
breakouttime /= 2
var/displaytime = breakouttime / 10
if(!cuff_break)
if(has_status_effect(STATUS_EFFECT_REMOVE_CUFFS))
to_chat(src, "<span class='notice'>You are already trying to remove [I].</span>")
return
apply_status_effect(STATUS_EFFECT_REMOVE_CUFFS)
visible_message("<span class='warning'>[src] attempts to remove [I]!</span>")
to_chat(src, "<span class='notice'>You attempt to remove [I]... (This will take around [displaytime] seconds and you need to stand still.)</span>")
if(do_after(src, breakouttime, 0, target = src))
var/is_zombie = HAS_TRAIT(src, TRAIT_I_WANT_BRAINS)
to_chat(src, "<span class='notice'>You attempt to remove [I]... (This will take around [breakouttime / 10] seconds[is_zombie ? "" : " and you need to stand still"].)</span>")
if(do_after(src, breakouttime, 0, target = src, allow_moving = is_zombie, allow_moving_target = is_zombie))
remove_status_effect(STATUS_EFFECT_REMOVE_CUFFS)
if(I.loc != src || buckled)
return
-3
View File
@@ -64,9 +64,6 @@
clean_grabbed_by(assailant, affecting)
adjust_position()
if(HAS_TRAIT(assailant, TRAIT_SLOW_GRABBER))
assailant.changeNext_move(1.5 * CLICK_CD_MELEE)
/obj/item/grab/Destroy()
if(affecting)
UnregisterSignal(affecting, COMSIG_MOVABLE_MOVED)