mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-19 19:15:11 +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:
@@ -84,7 +84,7 @@
|
||||
var/target_text = trans_dest? "\the [trans_dest]" : "\the [user.loc]"
|
||||
user.visible_message(span_danger("\The [user] begins to wring out [src] over [target_text]."), span_notice("You begin to wring out [src] over [target_text]."))
|
||||
|
||||
if(do_after(user, reagents.total_volume*5)) //50 for a fully soaked rag
|
||||
if(do_after(user, reagents.total_volume*5, target = src)) //50 for a fully soaked rag
|
||||
if(trans_dest)
|
||||
reagents.trans_to(trans_dest, reagents.total_volume)
|
||||
else
|
||||
@@ -98,7 +98,7 @@
|
||||
else
|
||||
user.visible_message("[user] starts to wipe [A] with [src].")
|
||||
update_name()
|
||||
if(do_after(user,30))
|
||||
if(do_after(user, 3 SECONDS, target = src))
|
||||
user.visible_message("[user] finishes wiping [A]!")
|
||||
A.on_rag_wipe(src)
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
|
||||
add_fingerprint(user)
|
||||
|
||||
if(!(do_after(user, 1 SECOND)))
|
||||
if(!(do_after(user, 1 SECOND, target = src)))
|
||||
to_chat(user, span_warning("You must remain still for the device to complete its work."))
|
||||
return 0
|
||||
|
||||
@@ -112,7 +112,7 @@
|
||||
if(A.forensic_data?.has_fibres())
|
||||
to_chat(user,span_notice("Fibers/Materials detected.[reveal_fibers ? " Analysing..." : " Acquisition of fibers for H.R.F.S. analysis advised."]"))
|
||||
flick("[icon_state]1",src)
|
||||
if(reveal_fibers && do_after(user, 5 SECONDS))
|
||||
if(reveal_fibers && do_after(user, 5 SECONDS, target = src))
|
||||
to_chat(user, span_notice("Apparel samples scanned:"))
|
||||
for(var/sample in A.forensic_data.get_fibres())
|
||||
to_chat(user, " - " + span_notice("[sample]"))
|
||||
@@ -120,7 +120,7 @@
|
||||
//Blood
|
||||
if (A.forensic_data?.has_blooddna())
|
||||
to_chat(user, span_notice("Blood detected.[reveal_blood ? " Analysing..." : " Acquisition of swab for H.R.F.S. analysis advised."]"))
|
||||
if(reveal_blood && do_after(user, 5 SECONDS))
|
||||
if(reveal_blood && do_after(user, 5 SECONDS, target = src))
|
||||
flick("[icon_state]1",src)
|
||||
var/list/blood_data = A.forensic_data.get_blooddna()
|
||||
for(var/blood in blood_data)
|
||||
@@ -152,7 +152,7 @@
|
||||
/obj/item/detective_scanner/proc/display_data(var/mob/user)
|
||||
if(user && stored && stored.len)
|
||||
for(var/objref in stored)
|
||||
if(!do_after(user, 1 SECOND)) // So people can move and stop the spam, if they refuse to wipe data.
|
||||
if(!do_after(user, 1 SECOND, target = src)) // So people can move and stop the spam, if they refuse to wipe data.
|
||||
break
|
||||
|
||||
var/datum/data/record/forensic/F = stored[objref]
|
||||
|
||||
Reference in New Issue
Block a user