cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Makes uses of do_after sane (#11582)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-09-07 20:02:27 -07:00
committed by GitHub
parent 2c34c93e00
commit 1b8f394a14
329 changed files with 692 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/food/kitchen/gibber.dm
View File

@@ -151,7 +151,7 @@
user.visible_message(span_danger("[user] starts to put [victim] into the gibber!"))
src.add_fingerprint(user)
if(do_after(user, 30) && victim.Adjacent(src) && user.Adjacent(src) && victim.Adjacent(user) && !occupant)
if(do_after(user, 3 SECONDS, target = src) && victim.Adjacent(src) && user.Adjacent(src) && victim.Adjacent(user) && !occupant)
user.visible_message(span_danger("[user] stuffs [victim] into the gibber!"))
if(victim.client)
victim.client.perspective = EYE_PERSPECTIVE

10
code/modules/food/kitchen/microwave.dm
View File

@@ -77,7 +77,7 @@
span_notice("You start to fix part of the microwave.") \
)
playsound(src, O.usesound, 50, 1)
if (do_after(user,20 * O.toolspeed))
if (do_after(user, 2 SECONDS * O.toolspeed, target = src))
user.visible_message( \
span_infoplain(span_bold("\The [user]") + " fixes part of the microwave."), \
span_notice("You have fixed part of the microwave.") \
@@ -88,7 +88,7 @@
span_infoplain(span_bold("\The [user]") + " starts to fix part of the microwave."), \
span_notice("You start to fix part of the microwave.") \
)
if (do_after(user,20 * O.toolspeed))
if (do_after(user, 2 SECONDS * O.toolspeed, target = src))
user.visible_message( \
span_infoplain(span_bold("\The [user]") + " fixes the microwave."), \
span_notice("You have fixed the microwave.") \
@@ -107,7 +107,7 @@
span_infoplain(span_bold("\The [user]") + " starts to clean the microwave."), \
span_notice("You start to clean the microwave.") \
)
if (do_after(user,20))
if (do_after(user, 2 SECONDS, target = src))
user.visible_message( \
span_notice("\The [user] has cleaned the microwave."), \
span_notice("You have cleaned the microwave.") \
@@ -199,7 +199,7 @@
span_notice("\The [user] begins [src.anchored ? "unsecuring" : "securing"] the microwave."), \
span_notice("You attempt to [src.anchored ? "unsecure" : "secure"] the microwave.")
)
if (do_after(user,20/O.toolspeed))
if (do_after(user, (2 SECONDS)/O.toolspeed, target = src))
user.visible_message( \
span_notice("\The [user] [src.anchored ? "unsecures" : "secures"] the microwave."), \
span_notice("You [src.anchored ? "unsecure" : "secure"] the microwave.")
@@ -560,7 +560,7 @@
span_notice("You try to open [src] and remove its contents.")
)
if(!do_after(usr, 1 SECONDS, target = src))
if(!do_after(usr, 1 SECOND, target = src))
return
if(operating)