Aurorastation · FluffyGhoster · Mar 7, 2024 · Mar 8, 2024 · Mar 8, 2024 · Mar 8, 2024
diff --git 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/datums/datum.dm b/code/datums/datum.dm
@@ -59,7 +59,7 @@
 // Return the appropriate QDEL_HINT; in most cases this is QDEL_HINT_QUEUE.
 /datum/proc/Destroy(force=FALSE)
 	SHOULD_CALL_PARENT(TRUE)
-	//SHOULD_NOT_SLEEP(TRUE) //Soon my friend, soon...
+	SHOULD_NOT_SLEEP(TRUE)
 
 	tag = null
 	datum_flags &= ~DF_USE_TAG //In case something tries to REF us

diff --git a/code/defines/procs/hud.dm b/code/defines/procs/hud.dm
@@ -15,13 +15,6 @@ the HUD updates properly! */
 	if(ismob(loc))
 		owner = loc
 
-/image/hud_overlay/Destroy()
-	if(owner)
-		owner?.client?.images -= src
-		owner = null
-
-	. = ..()
-
 //Medical HUD outputs. Called by the Life() proc of the mob using it, usually.
 /proc/process_med_hud(var/mob/M, var/local_scanner, var/mob/Alt)
 	if(!can_process_hud(M))

diff --git 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
@@ -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/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
@@ -257,6 +257,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/lobby_mobs_location)
 	LAZYINITLIST(GLOB.force_spawnpoints)
 	LAZYADD(GLOB.force_spawnpoints[job_tag], loc)
 
+/obj/effect/landmark/force_spawnpoint/Destroy()
+	LAZYREMOVE(GLOB.force_spawnpoints[job_tag], loc)
+	. = ..()
+
 var/list/ruin_landmarks = list()
 
 /obj/effect/landmark/ruin

diff --git 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
@@ -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
@@ -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
@@ -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

@@ -85,7 +85,7 @@
 			to_chat(usr, "<span class='notice'>Right Mouse Button       = Deconstruct / Delete / Downgrade</span>")
 			to_chat(usr, "<span class='notice'>Left Mouse Button + ctrl = R-Window</span>")
 			to_chat(usr, "<span class='notice'>Left Mouse Button + alt  = Airlock</span>")
-			to_chat(usr, "")
+			to_chat(usr, " ")
 			to_chat(usr, "<span class='notice'>Use the button in the upper left corner to</span>")
 			to_chat(usr, "<span class='notice'>change the direction of built objects.</span>")
 			to_chat(usr, "<span class='notice'>***********************************************************</span>")
@@ -96,7 +96,7 @@
 			to_chat(usr, "<span class='notice'>Middle Mouse Button on turf/obj        = Capture object type</span>")
 			to_chat(usr, "<span class='notice'>Left Mouse Button on turf/obj          = Place objects</span>")
 			to_chat(usr, "<span class='notice'>Right Mouse Button                     = Delete objects</span>")
-			to_chat(usr, "")
+			to_chat(usr, " ")
 			to_chat(usr, "<span class='notice'>Use the button in the upper left corner to</span>")
 			to_chat(usr, "<span class='notice'>change the direction of built objects.</span>")
 			to_chat(usr, "<span class='notice'>***********************************************************</span>")

@@ -322,9 +322,9 @@
 		var/datum/category_group/player_setup_category/cat = category
 		cat.modified = 1
 	if (. & TOPIC_REFRESH)
-		user.client.prefs.ShowChoices(user)
+		user.client?.prefs?.ShowChoices(user)
 	if(. & TOPIC_UPDATE_PREVIEW)
-		user.client.prefs.update_preview_icon()
+		user.client?.prefs?.update_preview_icon()
 
 /datum/category_item/player_setup_item/CanUseTopic(var/mob/user)
 	return 1

diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm
@@ -202,7 +202,6 @@
 		density = 0
 
 /obj/effect/plant/proc/calc_dir()
-	set background = 1
 	var/turf/T = get_turf(src)
 	if(!istype(T)) return
 

diff --git a/code/modules/lighting/lighting_atom.dm b/code/modules/lighting/lighting_atom.dm
@@ -61,7 +61,8 @@
 // Will update the light (duh).
 // Creates or destroys it if needed, makes it update values, makes sure it's got the correct source turf...
 /atom/proc/update_light()
-	set waitfor = FALSE
+	SHOULD_NOT_SLEEP(TRUE)
+
 	if (QDELING(src))
 		return
 
@@ -92,17 +93,6 @@
 	return loc
 
 
-// If we have opacity, make sure to tell (potentially) affected light sources.
-/atom/movable/Destroy()
-	var/turf/T = loc
-
-	. = ..()
-
-	if (opacity && istype(T))
-		T.recalc_atom_opacity()
-		T.reconsider_lights()
-
-
 // Should always be used to change the opacity of an atom.
 // It notifies (potentially) affected light sources so they can update (if needed).
 /atom/proc/set_opacity(var/new_opacity)

diff --git 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/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm
@@ -8,6 +8,10 @@
 
 INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
 
+/mob/living/carbon/human/dummy/mannequin/New(loc, ...)
+	. = ..()
+
+
 
 /mob/living/carbon/human/dummy/mannequin/Initialize()
 	. = ..()
@@ -320,6 +324,9 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
 /mob/living/carbon/human/phoron_golem/Initialize(mapload)
 	. = ..(mapload, SPECIES_GOLEM_PHORON)
 
+/mob/living/carbon/human/mhydrogen_golem/Destroy()
+	. = ..()
+
 /mob/living/carbon/human/mhydrogen_golem/Initialize(mapload)
 	. = ..(mapload, SPECIES_GOLEM_HYDROGEN)
 

diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
@@ -477,9 +477,9 @@
 	H.eat_types = allowed_eat_types
 	if(!kpg)
 		if(islesserform(H))
-			H.dna.SetSEState(MONKEYBLOCK,1)
+			H.dna?.SetSEState(MONKEYBLOCK,1)
 		else
-			H.dna.SetSEState(MONKEYBLOCK,0)
+			H.dna?.SetSEState(MONKEYBLOCK,0)
 	if(!H.client || !H.client.prefs || !H.client.prefs.gender)
 		H.gender = pick(default_genders)
 		H.pronouns = H.gender

diff --git a/code/modules/modular_computers/computers/modular_computer/core.dm b/code/modules/modular_computers/computers/modular_computer/core.dm
@@ -233,8 +233,8 @@
 	else
 		return FALSE
 	var/mob/user = usr
-	if(user && istype(user) && !forced)
-		ui_interact(user) // Re-open the UI on this computer. It should show the main screen now.
+	if(user && istype(user) && !forced && !QDELETED(src))
+		INVOKE_ASYNC(src, TYPE_PROC_REF(/datum, ui_interact), user) // Re-open the UI on this computer. It should show the main screen now.
 	update_icon()
 
 /**

@@ -258,8 +258,8 @@
 		keyparts += "norm"
 
 	keyparts += "[species.race_key]"
-	keyparts += "[dna.GetUIState(DNA_UI_GENDER)]"
-	keyparts += "[dna.GetUIValue(DNA_UI_SKIN_TONE)]"
+	keyparts += "[dna?.GetUIState(DNA_UI_GENDER)]"
+	keyparts += "[dna?.GetUIValue(DNA_UI_SKIN_TONE)]"
 	if (skin_color)
 		keyparts += "[skin_color]"
 	if (body_hair && hair_color)

diff --git a/html/changelogs/fluffyghost-attempt3mannequinharddelfix.yml b/html/changelogs/fluffyghost-attempt3mannequinharddelfix.yml
@@ -0,0 +1,44 @@
+################################
+# 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:
+  - bugfix: "Yet another attempt to reduce mannequin harddels."
+  - bugfix: "Fixed various bugs found along the way."
+  - backend: "Updated the reftracker to the latest version from TG."
+  - backend: "Removed some unused vars."