mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-12 07:35:31 +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:
@@ -46,7 +46,7 @@
|
||||
else if(P.has_tool_quality(TOOL_SCREWDRIVER))
|
||||
to_chat(user, span_notice("You begin taking the [name] apart."))
|
||||
playsound(src, P.usesound, 50, 1)
|
||||
if(do_after(user, 10 * P.toolspeed))
|
||||
if(do_after(user, 1 SECOND * P.toolspeed, target = src))
|
||||
playsound(src, P.usesound, 50, 1)
|
||||
to_chat(user, span_notice("You take the [name] apart."))
|
||||
new /obj/item/stack/material/steel( src.loc, 4 )
|
||||
|
||||
@@ -225,7 +225,7 @@
|
||||
else
|
||||
user.visible_message(span_warning("[user] begins to wipe [H]'s lipstick off with \the [src]."), \
|
||||
span_notice("You begin to wipe off [H]'s lipstick."))
|
||||
if(do_after(user, 10) && do_after(H, 10, 5, 0)) //user needs to keep their active hand, H does not.
|
||||
if(do_after(user, 1 SECOND, target = H) && do_after(H, 1 SECONDS, target = user)) //user needs to keep their active hand, H does not.
|
||||
user.visible_message(span_notice("[user] wipes [H]'s lipstick off with \the [src]."), \
|
||||
span_notice("You wipe off [H]'s lipstick."))
|
||||
H.lip_style = null
|
||||
|
||||
@@ -171,7 +171,7 @@
|
||||
return
|
||||
user.visible_message(span_warning("\The [user] holds \the [P] up to \the [src]. It looks like [TU.he] [TU.is] trying to burn it!"), \
|
||||
span_warning("You hold \the [P] up to \the [src], burning it slowly."))
|
||||
if(!do_after(user,20))
|
||||
if(!do_after(user, 2 SECONDS, target = src))
|
||||
to_chat(user, span_warning("You must hold \the [P] steady to burn \the [src]."))
|
||||
return
|
||||
user.visible_message(span_danger("\The [user] burns right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap."), \
|
||||
|
||||
Reference in New Issue
Block a user