Axes do_mob and replaces with do_after (#18739)

* moooore do_afters

* theese

* Failsafe

* Update human_attackhand.dm
This commit is contained in:
Cameron Lennox
2025-11-08 02:01:23 +01:00
committed by GitHub
parent e889a5a9f9
commit 57d1d031da
28 changed files with 154 additions and 132 deletions
@@ -127,7 +127,7 @@
else
other_feed_message_start(user, target)
if(!do_mob(user, target))
if(!do_after(user, 3 SECONDS, target))
return FALSE
other_feed_message_finish(user, target)
@@ -43,7 +43,7 @@
var/time = 20 //2/3rds the time of a syringe
user.visible_message(span_warning("[user] is trying to squirt something into [target]'s eyes!"))
if(!do_mob(user, target, time))
if(!do_after(user, time, target))
return
if(ishuman(target))
@@ -61,7 +61,7 @@
user.visible_message(span_warning("[user] attempts to place \the [src] onto [H]`s [affecting]."))
user.setClickCooldown(user.get_attack_speed(src))
if(!do_mob(user, M))
if(!do_after(user, 3 SECONDS, M))
return
user.drop_from_inventory(src) //icon update
@@ -59,7 +59,7 @@
user.balloon_alert_visible("[user] attempts to force [M] to swallow \the [src].")
user.setClickCooldown(user.get_attack_speed(src))
if(!do_mob(user, M))
if(!do_after(user, 3 SECONDS, M))
return
user.drop_from_inventory(src) //icon update
@@ -29,7 +29,7 @@
var/image/filling //holds a reference to the current filling overlay
var/visible_name = "a syringe"
var/time = 30
var/drawing = 0
var/drawing = FALSE
var/used = FALSE
var/dirtiness = 0
var/list/targets
@@ -133,24 +133,24 @@
return
var/datum/reagent/B
drawing = 1
drawing = TRUE
if(ishuman(T))
var/mob/living/carbon/human/H = T
if(H.species && !H.should_have_organ(O_HEART))
H.reagents.trans_to_obj(src, amount)
else
if(ismob(H) && H != user)
if(!do_mob(user, target, time))
drawing = 0
if(!do_after(user, time, target))
drawing = FALSE
return
B = T.take_blood(src, amount)
drawing = 0
drawing = FALSE
else
if(!do_mob(user, target, time))
drawing = 0
if(!do_after(user, time, target))
drawing = FALSE
return
B = T.take_blood(src,amount)
drawing = 0
drawing = FALSE
if (B)
reagents.reagent_list += B