cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 11:35:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes uses of do_after sane (#18334)

Browse Source 
* 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:
Cameron Lennox
2025-09-07 20:25:08 -04:00
committed by GitHub
parent 736fe6ef28
commit d73f6b8dbd
330 changed files with 682 additions and 690 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/beekeeping/beehive.dm
+3 -3
View File
@@ -120,7 +120,7 @@
return
to_chat(user, span_notice("You start dismantling \the [src]..."))
playsound(src, I.usesound, 50, 1)
if(do_after(user, 30))
if(do_after(user, 3 SECONDS, target = src))
user.visible_message(span_notice("[user] dismantles \the [src]."), span_notice("You dismantle \the [src]."))
new /obj/item/beehive_assembly(loc)
qdel(src)
@@ -135,7 +135,7 @@
to_chat(user, span_notice("The bees won't let you take the honeycombs out like this, smoke them first."))
return
user.visible_message(span_notice("[user] starts taking the honeycombs out of \the [src]."), span_notice("You start taking the honeycombs out of \the [src]..."))
while(honeycombs >= 100 && length(frames) && do_after(user, 30))
while(honeycombs >= 100 && length(frames) && do_after(user, 3 SECONDS, target = src))
var/obj/item/honey_frame/H = pop(frames)
H.honey = 20
honeycombs -= 100
@@ -292,7 +292,7 @@
/obj/item/beehive_assembly/attack_self(var/mob/user)
to_chat(user, span_notice("You start assembling \the [src]..."))
if(do_after(user, 30))
if(do_after(user, 3 SECONDS, target = src))
user.visible_message(span_notice("[user] constructs a beehive."), span_notice("You construct a beehive."))
new /obj/machinery/beehive(get_turf(user))
user.drop_from_inventory(src)
code/modules/hydroponics/trays/tray_soil.dm
+2 -2
View File
@@ -16,7 +16,7 @@
if(!choice||choice=="No")
return
user.visible_message("[user] starts dispersing the [src]...", runemessage = "disperses the [src]")
if(do_after(user, 5 SECONDS))
if(do_after(user, 5 SECONDS, target = src))
qdel(src)
else
to_chat(user, span_notice("There is something growing here."))
@@ -35,7 +35,7 @@
/obj/machinery/portable_atmospherics/hydroponics/soil/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/shovel) && user.a_intent == I_HURT)
user.visible_message(span_notice("\The [user] begins filling in \the [src]."))
if(do_after(user, 3 SECONDS) && !QDELETED(src))
if(do_after(user, 3 SECONDS, target = src) && !QDELETED(src))
user.visible_message(span_notice("\The [user] fills in \the [src]."))
qdel(src)
return