From 25f28a8e694d8ad555b52057a21316646c5f434c Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Mon, 8 Apr 2024 10:28:02 +0200 Subject: [PATCH] Removes some additional waitfors and backgrounds (#18870) Removes some additional waitfors and backgrounds, mark the relative procs as should not sleep --------- Co-authored-by: FluffyGhost --- code/controllers/subsystems/news.dm | 2 +- code/game/antagonist/antagonist_update.dm | 4 +- code/game/atoms.dm | 4 +- code/game/turfs/turf.dm | 4 +- code/game/turfs/turf_flick_animations.dm | 2 +- code/modules/admin/admin_ranks.dm | 2 - code/modules/admin/verbs/atmosdebug.dm | 1 - code/modules/mob/living/carbon/alien/life.dm | 2 - html/changelogs/FluffyGhost-waitfors_away.yml | 41 +++++++++++++++++++ 9 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 html/changelogs/FluffyGhost-waitfors_away.yml diff --git a/code/controllers/subsystems/news.dm b/code/controllers/subsystems/news.dm index 73812185370..b2f85fcf9c3 100644 --- a/code/controllers/subsystems/news.dm +++ b/code/controllers/subsystems/news.dm @@ -150,7 +150,7 @@ SUBSYSTEM_DEF(news) alert_readers(FC.announcement) /datum/controller/subsystem/news/proc/alert_readers(var/annoncement) - set waitfor = FALSE + SHOULD_NOT_SLEEP(TRUE) for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) NEWSCASTER.newsAlert(annoncement) NEWSCASTER.update_icon() diff --git a/code/game/antagonist/antagonist_update.dm b/code/game/antagonist/antagonist_update.dm index 590dfc3cb03..96f5dc83e16 100644 --- a/code/game/antagonist/antagonist_update.dm +++ b/code/game/antagonist/antagonist_update.dm @@ -52,7 +52,7 @@ antag.current.client.images |= get_indicator(antag, other_antag) /datum/antagonist/proc/update_icons_added(var/datum/mind/player) - set waitfor = FALSE + SHOULD_NOT_SLEEP(TRUE) if(!antag_indicator || !player.current) return @@ -68,7 +68,7 @@ player.current.client.images |= get_indicator(player, antag) /datum/antagonist/proc/update_icons_removed(var/datum/mind/player) - set waitfor = FALSE + SHOULD_NOT_SLEEP(TRUE) if(!antag_indicator || !player.current) return diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 20806ad54df..d279182320c 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -646,7 +646,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 + SHOULD_NOT_SLEEP(TRUE) if(!hearing_distance) hearing_distance = world.view @@ -660,7 +660,7 @@ intent_message(intent_message, intent_range, hearers) // pass our hearers list through to intent_message so it doesn't have to call get_hearers again /atom/proc/intent_message(var/message, var/range = 7, var/list/hearers = list()) - set waitfor = FALSE + SHOULD_NOT_SLEEP(TRUE) if(air_sound(src)) if(!hearers.len) hearers = get_hearers_in_view(range, src) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index e27135bc451..f0a461bc898 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -325,8 +325,8 @@ var/const/enterloopsanity = 100 tracks.add_tracks(footprint_DNA, comingdir, goingdir, footprint_color) /atom/movable/proc/proximity_callback(atom/movable/AM) - set waitfor = FALSE - sleep(0) + SHOULD_NOT_SLEEP(TRUE) + HasProximity(AM, TRUE) if (!QDELETED(AM) && !QDELETED(src) && (AM.movable_flags & MOVABLE_FLAG_PROXMOVE)) AM.HasProximity(src, TRUE) diff --git a/code/game/turfs/turf_flick_animations.dm b/code/game/turfs/turf_flick_animations.dm index 60d93abb904..520c2b5041a 100644 --- a/code/game/turfs/turf_flick_animations.dm +++ b/code/game/turfs/turf_flick_animations.dm @@ -1,5 +1,5 @@ /proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,flick_anim as text,sleeptime = 0,direction as num) - set waitfor = FALSE + SHOULD_NOT_SLEEP(TRUE) //This proc throws up either an icon or an animation for a specified amount of time. //The variables should be apparent enough. if(!location && target) diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index 364d982641b..bd3f19ecf74 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -168,8 +168,6 @@ var/list/forum_groupids_to_ranks = list() world.SetConfig("APP/admin", A, null) /proc/update_admins_from_api(reload_once_done=FALSE) - set background = TRUE - if (!establish_db_connection(GLOB.dbcon)) log_and_message_admins("AdminRanks: Failed to connect to database in update_admins_from_api(). Carrying on with old staff lists.") return FALSE diff --git a/code/modules/admin/verbs/atmosdebug.dm b/code/modules/admin/verbs/atmosdebug.dm index b8512d068d2..6333285441e 100644 --- a/code/modules/admin/verbs/atmosdebug.dm +++ b/code/modules/admin/verbs/atmosdebug.dm @@ -1,7 +1,6 @@ /client/proc/atmosscan() set category = "Mapping" set name = "Check Piping" - set background = 1 if(!src.holder) to_chat(src, "Only administrators may use this command.") return diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm index b24e70e9afb..28dbc6261f1 100644 --- a/code/modules/mob/living/carbon/alien/life.dm +++ b/code/modules/mob/living/carbon/alien/life.dm @@ -1,7 +1,5 @@ // Alien larva are quite simple. /mob/living/carbon/alien/Life() - set background = BACKGROUND_ENABLED - if (transforming) return if(!loc) return diff --git a/html/changelogs/FluffyGhost-waitfors_away.yml b/html/changelogs/FluffyGhost-waitfors_away.yml new file mode 100644 index 00000000000..042ae4772cd --- /dev/null +++ b/html/changelogs/FluffyGhost-waitfors_away.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: FluffyGhost + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - backend: "Removes some additional waitfors and backgrounds, mark the relative procs as should not sleep."