From d20dae5f9e12eca4a36411dc2c5729697d397292 Mon Sep 17 00:00:00 2001 From: Wildkins Date: Fri, 13 May 2022 21:34:54 -0400 Subject: [PATCH] Add waitfor=FALSE to visible_message (#13885) --- code/datums/datum.dm | 1 + code/game/atoms.dm | 5 ++++- code/modules/mob/mob.dm | 3 ++- html/changelogs/johnwildkins-waitfor.yml | 6 ++++++ 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/johnwildkins-waitfor.yml diff --git a/code/datums/datum.dm b/code/datums/datum.dm index 63112019345..36f3209aaeb 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -70,4 +70,5 @@ return QDEL_HINT_QUEUE /datum/proc/process() + set waitfor = FALSE return PROCESS_KILL diff --git a/code/game/atoms.dm b/code/game/atoms.dm index d06be6009da..5d06e8869e8 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -557,6 +557,7 @@ // The message is output to anyone who can see, e.g. "The [src] does something!" // "blind_message" (optional) is what blind people will hear e.g. "You hear something!" /atom/proc/visible_message(var/message, var/blind_message, var/range = world.view, var/intent_message = null, var/intent_range = 7) + set waitfor = FALSE var/turf/T = get_turf(src) var/list/mobs = list() var/list/objs = list() @@ -582,6 +583,7 @@ // "deaf_message" (optional) is what deaf people will see. // "hearing_distance" (optional) is the range, how many tiles away the message can be heard. /atom/proc/audible_message(var/message, var/deaf_message, var/hearing_distance, var/intent_message = null, var/intent_range = 7) + set waitfor = FALSE var/range = world.view if(hearing_distance) range = hearing_distance @@ -601,6 +603,7 @@ intent_message(intent_message, intent_range) /atom/proc/intent_message(var/message, var/range = 7) + set waitfor = FALSE if(air_sound(src)) var/turf/T = get_turf(src) var/list/mobs = list() @@ -667,4 +670,4 @@ transform = M /atom/proc/handle_middle_mouse_click(var/mob/user) - return FALSE \ No newline at end of file + return FALSE diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 7019cc489ba..89ff8f7978c 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -111,6 +111,7 @@ // blind_message (optional) is what blind people will hear e.g. "You hear something!" /mob/visible_message(var/message, var/self_message, var/blind_message, var/range = world.view, var/show_observers = TRUE, var/intent_message = null, var/intent_range = 7) + set waitfor = FALSE var/list/messageturfs = list() //List of turfs we broadcast to. var/list/messagemobs = list() //List of living mobs nearby who can hear it, and distant ghosts who've chosen to hear it var/list/messageobjs = list() //list of objs nearby who can see it @@ -1473,4 +1474,4 @@ if(!check_has_body_select()) return var/obj/screen/zone_sel/selector = mob.zone_sel - selector.set_selected_zone(next_in_list(mob.zone_sel.selecting,zones)) \ No newline at end of file + selector.set_selected_zone(next_in_list(mob.zone_sel.selecting,zones)) diff --git a/html/changelogs/johnwildkins-waitfor.yml b/html/changelogs/johnwildkins-waitfor.yml new file mode 100644 index 00000000000..25a47d82bae --- /dev/null +++ b/html/changelogs/johnwildkins-waitfor.yml @@ -0,0 +1,6 @@ +author: JohnWildkins + +delete-after: True + +changes: + - tweak: "Remove proc waiting on visible_message (and alike procs) as well as process()"