From 4528b289f325d0980fa09463966aaecd34e547e0 Mon Sep 17 00:00:00 2001
From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Date: Mon, 11 Sep 2023 12:22:18 +0200
Subject: [PATCH] QDEL'd actions no longer get readded to the HUD (#17317)

* Atomization

* sadf

---------

Co-authored-by: FluffyGhost <FluffyGhost>
---
 code/modules/mob/living/living_defense.dm     |  3 ++
 .../FluffyGhost-no_add_qdeleted_actions.yml   | 41 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 html/changelogs/FluffyGhost-no_add_qdeleted_actions.yml

diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index bcb76210d1d..d99dc7cdaeb 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -393,6 +393,9 @@
 
 	var/button_number = 0
 	for(var/datum/action/A in actions)
+		if(QDELETED(A))
+			continue
+
 		button_number++
 		if(A.button == null)
 			var/obj/screen/movable/action_button/N = new(hud_used)
diff --git a/html/changelogs/FluffyGhost-no_add_qdeleted_actions.yml b/html/changelogs/FluffyGhost-no_add_qdeleted_actions.yml
new file mode 100644
index 00000000000..51269d6ffee
--- /dev/null
+++ b/html/changelogs/FluffyGhost-no_add_qdeleted_actions.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:
+  - bugfix: "QDEL'd actions no longer get readded to the HUD."