Skip to content

Commit

Permalink
fixed a few issues using regex made by anticept
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Jun 10, 2024
1 parent d1735d7 commit f4131ee
Show file tree
Hide file tree
Showing 16 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/effects/anomalies/_anomalies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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." ))
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/granters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, "<span class='notice'>[pick(remarks)]</span>")
else
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/robot/robot_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
return

to_chat(user, "<span class='notice'>You connect to [M]'s power line...</span>")
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

Expand Down Expand Up @@ -210,7 +210,7 @@

to_chat(user, "<span class='notice'>You connect to [target]'s power port...</span>")

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

Expand Down Expand Up @@ -248,7 +248,7 @@

to_chat(user, "<span class='notice'>You connect to [target]'s power port...</span>")

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

Expand Down
2 changes: 1 addition & 1 deletion code/game/turfs/turf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/changeling/powers/linglink.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
to_chat(user, "<span class='notice'>We must keep holding on to [target] to sustain the link. </span>")
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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/spacesuits/hardsuit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
if(L.status)
to_chat(user, "<span class='warning'>This bulb is too damaged to use as a replacement!</span>")
return
if(do_after(user, 50, src, 1))
if(do_after(user, 50, src))
qdel(I)
helmet = new helmettype(src)
to_chat(user, "<span class='notice'>You have successfully repaired [src]'s helmet.</span>")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/human/species_types/spider.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, "<i>You begin spinning some web...</i>")
if(!do_after(H, 10 SECONDS, T, TRUE))
if(!do_after(H, 10 SECONDS, T, hidden = TRUE))
to_chat(H, "<span class='warning'>Your web spinning was interrupted!</span>")
return
if(prob(75))
Expand Down Expand Up @@ -208,7 +208,7 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt"))
to_chat(H, "<span class='warning'>You cannot wrap this.</span>")
return
H.visible_message("<span class='danger'>[H] starts to wrap [A] into a cocoon!</span>","<span class='warning'>You start to wrap [A] into a cocoon.</span>")
if(!do_after(H, 10 SECONDS, A, TRUE))
if(!do_after(H, 10 SECONDS, A, hidden = TRUE))
to_chat(H, "<span class='warning'>Your web spinning was interrupted!</span>")
return
H.adjust_nutrition(E.spinner_rate * -3.5)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/silicon/pai/pai_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
user.do_attack_animation(src)
if (user.name == master)
visible_message("<span class='notice'>Responding to its master's touch, [src] disengages its holochassis emitter, rapidly losing coherence.</span>")
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("<span class='notice'>[user] promptly scoops up [user.p_their()] pAI's card.</span>")
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/friendly/mouse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ GLOBAL_VAR_INIT(mouse_killed, 0)
visible_message(
"<span class='danger'>[src] starts eating away [A]...</span>",
"<span class='notice'>You start eating the [A]...</span>")
if(do_after(src, 30, A, TRUE))
if(do_after(src, 30, A, hidden = TRUE))
if(QDELETED(A))
return
visible_message(
Expand Down
2 changes: 1 addition & 1 deletion code/modules/ninja/suit/ninjaDrainAct.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/ballistic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, "<span class='notice'>You perform a tactical reload on \the [src].</span>")
else
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/ballistic/hmg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
if(!can_deploy)
to_chat(user, "<span class='warning'>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!</span>")
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, "<span class='warning'>You need to hold still to deploy [src]'s bipod!</span>")
return
playsound(src, 'sound/machines/click.ogg', 75, TRUE)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/energy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
to_chat(user, "<span class='notice'>You pull the cell out of \the [src].</span>")
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, "<span class='notice'>You perform a tactical reload on \the [src].</span>")
else
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/secway.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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("<span class='warning'>[user] begins stuffing [W] into [src]'s tailpipe.</span>", "<span class='warning'>You begin stuffing [W] into [src]'s tailpipe...</span>", ignored_mobs = occupants)
if(do_after(user, 30, src, TRUE))
if(do_after(user, 30, src))
if(user.transferItemToLoc(W, src))
user.visible_message("<span class='warning'>[user] stuffs [W] into [src]'s tailpipe.</span>", "<span class='warning'>You stuff [W] into [src]'s tailpipe.</span>", ignored_mobs = occupants)
eddie_murphy = W
Expand Down

0 comments on commit f4131ee

Please sign in to comment.