From fb8d2ca917f434cbbe97e971c817064d281a8d48 Mon Sep 17 00:00:00 2001
From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Date: Sat, 17 Jun 2023 22:04:55 +0200
Subject: [PATCH] Wallrot runtime fix (#16458)

* Atomization

* Changelog

---------

Co-authored-by: FluffyGhost <FluffyGhost>
---
 code/modules/events/wallrot.dm                |  3 +-
 .../FluffyGhost-wallrot_runtime_fix           | 41 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/FluffyGhost-wallrot_runtime_fix

diff --git a/code/modules/events/wallrot.dm b/code/modules/events/wallrot.dm
index 71963dc9dba..df509f42bdf 100644
--- a/code/modules/events/wallrot.dm
+++ b/code/modules/events/wallrot.dm
@@ -6,7 +6,8 @@
 	endWhen = announceWhen + 1
 
 /datum/event/wallrot/announce()
-	command_announcement.Announce("Harmful fungi detected at coordinates ([origin_turf.x], [origin_turf.y], [origin_turf.z]). The structure may be contaminated.", "Biohazard Alert", new_sound = 'sound/AI/fungi.ogg', zlevels = affecting_z)
+	if(origin_turf)
+		command_announcement.Announce("Harmful fungi detected at coordinates ([origin_turf.x], [origin_turf.y], [origin_turf.z]). The structure may be contaminated.", "Biohazard Alert", new_sound = 'sound/AI/fungi.ogg', zlevels = affecting_z)
 
 /datum/event/wallrot/start()
 	set waitfor = FALSE
diff --git a/html/changelogs/FluffyGhost-wallrot_runtime_fix b/html/changelogs/FluffyGhost-wallrot_runtime_fix
new file mode 100644
index 00000000000..bb0952f11cf
--- /dev/null
+++ b/html/changelogs/FluffyGhost-wallrot_runtime_fix
@@ -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: "Resolved a runtime with wallrot announcement."