From f4131eeab1996256f3f739e9ac3ff98690cd6437 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 10 Jun 2024 01:34:45 -0500 Subject: [PATCH] fixed a few issues using regex made by anticept --- code/game/objects/effects/anomalies/_anomalies.dm | 2 +- code/game/objects/items/granters.dm | 4 ++-- code/game/objects/items/robot/robot_items.dm | 6 +++--- code/game/turfs/turf.dm | 2 +- code/modules/antagonists/changeling/powers/linglink.dm | 2 +- code/modules/clothing/spacesuits/hardsuit.dm | 2 +- .../mob/living/carbon/human/species_types/ethereal.dm | 2 +- .../mob/living/carbon/human/species_types/jellypeople.dm | 2 +- .../modules/mob/living/carbon/human/species_types/spider.dm | 4 ++-- code/modules/mob/living/silicon/pai/pai_defense.dm | 2 +- code/modules/mob/living/simple_animal/friendly/mouse.dm | 2 +- code/modules/ninja/suit/ninjaDrainAct.dm | 2 +- code/modules/projectiles/guns/ballistic.dm | 2 +- code/modules/projectiles/guns/ballistic/hmg.dm | 2 +- code/modules/projectiles/guns/energy.dm | 2 +- code/modules/vehicles/secway.dm | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/code/game/objects/effects/anomalies/_anomalies.dm b/code/game/objects/effects/anomalies/_anomalies.dm index ceae531eda93..4a85f9321154 100644 --- a/code/game/objects/effects/anomalies/_anomalies.dm +++ b/code/game/objects/effects/anomalies/_anomalies.dm @@ -133,7 +133,7 @@ /obj/effect/anomaly/attackby(obj/item/weapon, mob/user, params) if(weapon.tool_behaviour == TOOL_ANALYZER && aSignal) to_chat(user, span_notice("You start analyzing [src].")) - if(do_after(user, 20, src, TRUE)) + if(do_after(user, 20, src, hidden = TRUE)) to_chat(user, span_notice("[src]'s primary field is fluctuating along frequency [format_frequency(aSignal.frequency)], code [aSignal.code].")) if(bSignal) to_chat(user, span_notice("A second field is fluctuating along [format_frequency(bSignal.frequency)], code [bSignal.code]. It is highly unstable." )) diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index f3cdfb068944..50da920b06f1 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -12,7 +12,7 @@ /obj/item/book/granter/proc/turn_page(mob/user) playsound(user, pick('sound/effects/pageturn1.ogg','sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg'), 30, TRUE) - if(do_after(user, 50, TRUE, src)) + if(do_after(user, 50, src, hidden = TRUE)) if(remarks.len) to_chat(user, "[pick(remarks)]") else @@ -57,7 +57,7 @@ on_reading_stopped() reading = FALSE return - if(do_after(user, 50, TRUE, src)) + if(do_after(user, 50, src, hidden = TRUE)) on_reading_finished(user) reading = FALSE return TRUE diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index a0e5865e1528..243b84b7e1ec 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -176,7 +176,7 @@ return to_chat(user, "You connect to [M]'s power line...") - while(do_after(user, 15, target = M, progress = 0)) + while(do_after(user, 15, target = M, progress = TRUE)) if(!user || !user.cell || mode != "draw") return @@ -210,7 +210,7 @@ to_chat(user, "You connect to [target]'s power port...") - while(do_after(user, 15, target = target, progress = 0)) + while(do_after(user, 15, target = target, progress = TRUE)) if(!user || !user.cell || mode != "draw") return @@ -248,7 +248,7 @@ to_chat(user, "You connect to [target]'s power port...") - while(do_after(user, 15, target = target, progress = 0)) + while(do_after(user, 15, target = target, progress = TRUE)) if(!user || !user.cell || mode != "charge") return diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index fea9e665740e..e5cc9709559c 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -466,7 +466,7 @@ GLOBAL_LIST_EMPTY(created_baseturf_lists) var/list/things = src_object.contents() var/datum/progressbar/progress = new(user, things.len, src) - while (do_after(usr, 10, TRUE, src, FALSE, CALLBACK(src_object, TYPE_PROC_REF(/datum/component/storage, mass_remove_from_storage), src, things, progress))) + while (do_after(usr, 10, src, TRUE, FALSE, CALLBACK(src_object, TYPE_PROC_REF(/datum/component/storage, mass_remove_from_storage), src, things, progress))) stoplag(1) progress.end_progress() diff --git a/code/modules/antagonists/changeling/powers/linglink.dm b/code/modules/antagonists/changeling/powers/linglink.dm index 6036ae1d00f6..f158499d8b0f 100644 --- a/code/modules/antagonists/changeling/powers/linglink.dm +++ b/code/modules/antagonists/changeling/powers/linglink.dm @@ -67,7 +67,7 @@ to_chat(user, "We must keep holding on to [target] to sustain the link. ") while(user.pulling && user.grab_state >= GRAB_NECK) target.reagents.add_reagent(/datum/reagent/medicine/salbutamol, 0.5) // So they don't choke to death while you interrogate them - do_after(user, 10 SECONDS, target, TRUE) + do_after(user, 10 SECONDS, target, hidden = TRUE) changeling.islinking = 0 target.mind.linglink = 0 diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 9851594b6d8c..09acb559b8b4 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -166,7 +166,7 @@ if(L.status) to_chat(user, "This bulb is too damaged to use as a replacement!") return - if(do_after(user, 50, src, 1)) + if(do_after(user, 50, src)) qdel(I) helmet = new helmettype(src) to_chat(user, "You have successfully repaired [src]'s helmet.") diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index 4ad5297b73d9..27362b348cab 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -271,7 +271,7 @@ var/static/mutable_appearance/overcharge //shameless copycode from lightning spell overcharge = overcharge || mutable_appearance('icons/effects/effects.dmi', "electricity", EFFECTS_LAYER) _human.add_overlay(overcharge) - if(do_after(_human, 50, _human, 1)) + if(do_after(_human, 50, _human, TRUE)) _human.flash_lighting_fx(5, 7, current_color) var/obj/item/organ/stomach/ethereal/stomach = _human.getorganslot(ORGAN_SLOT_STOMACH) playsound(_human, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5) diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 30f3d5f74b58..14526059354d 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -313,7 +313,7 @@ H.notransform = TRUE - if(do_after(owner, delay=60, target=owner, progress=TRUE, timed_action_flags = IGNORE_HELD_ITEM)) + if(do_after(owner, delay = 60, target = owner, progress = TRUE, timed_action_flags = IGNORE_HELD_ITEM)) if(H.blood_volume >= BLOOD_VOLUME_SLIME_SPLIT) make_dupe() else diff --git a/code/modules/mob/living/carbon/human/species_types/spider.dm b/code/modules/mob/living/carbon/human/species_types/spider.dm index f90f2de9dab4..764a7166ff2d 100644 --- a/code/modules/mob/living/carbon/human/species_types/spider.dm +++ b/code/modules/mob/living/carbon/human/species_types/spider.dm @@ -147,7 +147,7 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt")) var/nutrition_threshold = NUTRITION_LEVEL_FED if (H.nutrition >= nutrition_threshold) to_chat(H, "You begin spinning some web...") - if(!do_after(H, 10 SECONDS, T, TRUE)) + if(!do_after(H, 10 SECONDS, T, hidden = TRUE)) to_chat(H, "Your web spinning was interrupted!") return if(prob(75)) @@ -208,7 +208,7 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt")) to_chat(H, "You cannot wrap this.") return H.visible_message("[H] starts to wrap [A] into a cocoon!","You start to wrap [A] into a cocoon.") - if(!do_after(H, 10 SECONDS, A, TRUE)) + if(!do_after(H, 10 SECONDS, A, hidden = TRUE)) to_chat(H, "Your web spinning was interrupted!") return H.adjust_nutrition(E.spinner_rate * -3.5) diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm index 777555e92ae5..4a3e284addd6 100644 --- a/code/modules/mob/living/silicon/pai/pai_defense.dm +++ b/code/modules/mob/living/silicon/pai/pai_defense.dm @@ -50,7 +50,7 @@ user.do_attack_animation(src) if (user.name == master) visible_message("Responding to its master's touch, [src] disengages its holochassis emitter, rapidly losing coherence.") - if(do_after(user, 1 SECONDS, src, TRUE)) + if(do_after(user, 1 SECONDS, src, hidden = TRUE)) fold_in() if(user.put_in_hands(card)) user.visible_message("[user] promptly scoops up [user.p_their()] pAI's card.") diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index ff18c33ddb45..f2fbf6e5b262 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -165,7 +165,7 @@ GLOBAL_VAR_INIT(mouse_killed, 0) visible_message( "[src] starts eating away [A]...", "You start eating the [A]...") - if(do_after(src, 30, A, TRUE)) + if(do_after(src, 30, A, hidden = TRUE)) if(QDELETED(A)) return visible_message( diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm index 1446a5ffeb02..f45c231c7098 100644 --- a/code/modules/ninja/suit/ninjaDrainAct.dm +++ b/code/modules/ninja/suit/ninjaDrainAct.dm @@ -235,7 +235,7 @@ They *could* go in their appropriate files, but this is supposed to be modular if(S.cell.charge+drain > S.cell.maxcharge) drain = S.cell.maxcharge - S.cell.charge maxcapacity = 1 - if (do_after(H,10, hidden = TRUE)) + if (do_after(H, 10, hidden = TRUE)) spark_system.start() playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) cell.use(drain) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index e97ee70c8ef8..71a291f301de 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -241,7 +241,7 @@ update_appearance() SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD) if (tac_load) - if(do_after(user, tactical_reload_delay, src, TRUE)) + if(do_after(user, tactical_reload_delay, src, hidden = TRUE)) if (insert_magazine(user, tac_load, FALSE)) to_chat(user, "You perform a tactical reload on \the [src].") else diff --git a/code/modules/projectiles/guns/ballistic/hmg.dm b/code/modules/projectiles/guns/ballistic/hmg.dm index 4e9abd0cd70c..afa111c6bbf8 100644 --- a/code/modules/projectiles/guns/ballistic/hmg.dm +++ b/code/modules/projectiles/guns/ballistic/hmg.dm @@ -88,7 +88,7 @@ if(!can_deploy) to_chat(user, "You need to brace against something to deploy [src]'s bipod! Either lie on the floor or stand next to a waist high object like a table!") return - if(!do_after(user, deploy_time, src, FALSE, TRUE, CALLBACK(src, PROC_REF(is_wielded)))) + if(!do_after(user, deploy_time, src, NONE, TRUE, CALLBACK(src, PROC_REF(is_wielded)))) to_chat(user, "You need to hold still to deploy [src]'s bipod!") return playsound(src, 'sound/machines/click.ogg', 75, TRUE) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 3761037ad53e..dffa9a7fe7b1 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -158,7 +158,7 @@ to_chat(user, "You pull the cell out of \the [src].") update_appearance() if(tac_load && tac_reloads) - if(do_after(user, tactical_reload_delay, src, TRUE)) + if(do_after(user, tactical_reload_delay, src, hidden = TRUE)) if(insert_cell(user, tac_load)) to_chat(user, "You perform a tactical reload on \the [src].") else diff --git a/code/modules/vehicles/secway.dm b/code/modules/vehicles/secway.dm index 197a76d96856..4d327c7a8234 100644 --- a/code/modules/vehicles/secway.dm +++ b/code/modules/vehicles/secway.dm @@ -47,7 +47,7 @@ if(istype(W, /obj/item/reagent_containers/food/snacks/grown/banana)) // ignore the occupants because they're presumably too distracted to notice the guy stuffing fruit into their vehicle's exhaust. do segways have exhausts? they do now! user.visible_message("[user] begins stuffing [W] into [src]'s tailpipe.", "You begin stuffing [W] into [src]'s tailpipe...", ignored_mobs = occupants) - if(do_after(user, 30, src, TRUE)) + if(do_after(user, 30, src)) if(user.transferItemToLoc(W, src)) user.visible_message("[user] stuffs [W] into [src]'s tailpipe.", "You stuff [W] into [src]'s tailpipe.", ignored_mobs = occupants) eddie_murphy = W