mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-18 02:25:06 +01:00
Makes uses of do_after sane (#18334)
* Prevents insta-actions * Do_after sanity NOTE: NUKE do_after_action * Update bonfire.dm * The rest of them Also fixes a tpyo * no minitest :) * . * . * Gets rid of the slowdown for now --------- Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
@@ -56,7 +56,7 @@
|
||||
if(H != user && prototype)
|
||||
balloon_alert(user, "injecting [H] with \the [src]")
|
||||
balloon_alert(H, "[user] is trying to inject you with \the [src]")
|
||||
if(!do_after(user, 30, H))
|
||||
if(!do_after(user, 3 SECONDS, target = H))
|
||||
return
|
||||
//VOREstation Add End
|
||||
else if(!H.stat && !prototype)
|
||||
@@ -64,7 +64,7 @@
|
||||
if(H.a_intent != I_HELP)
|
||||
balloon_alert(user, "[H] resists your attempt to inject them with \the [src].")
|
||||
balloon_alert(H, "[user] is trying to inject you with \the [src]")
|
||||
if(!do_after(user, 30, H))
|
||||
if(!do_after(user, 3 SECONDS, target = H))
|
||||
return
|
||||
|
||||
do_injection(H, user)
|
||||
@@ -132,7 +132,7 @@
|
||||
if(istype(W, /obj/item/reagent_containers/glass/beaker/vial))
|
||||
if(!loaded_vial)
|
||||
balloon_alert_visible("[user] begins loading [W] into \the [src].", "loading [W] into \the [src].")
|
||||
if(!do_after(user,30) || loaded_vial || !(W in user))
|
||||
if(!do_after(user, 3 SECONDS, target = src) || loaded_vial || !(W in user))
|
||||
return 0
|
||||
if(W.is_open_container())
|
||||
W.flags ^= OPENCONTAINER
|
||||
|
||||
@@ -237,7 +237,7 @@
|
||||
|
||||
//The warmup
|
||||
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
|
||||
if(!do_after(user,warmup_time,target))
|
||||
if(!do_after(user, warmup_time, target))
|
||||
return
|
||||
|
||||
var/trans = 0
|
||||
@@ -246,7 +246,7 @@
|
||||
while(reagents.total_volume)
|
||||
trans += reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_BLOOD)
|
||||
update_icon()
|
||||
if(!reagents.total_volume || !do_after(user,cycle_time,target))
|
||||
if(!reagents.total_volume || !do_after(user, cycle_time, target))
|
||||
break
|
||||
else
|
||||
trans += reagents.trans_to_obj(target, amount_per_transfer_from_this)
|
||||
|
||||
Reference in New Issue
Block a user