From da3b40d50256483259bbfdcaf624f5eeecf9acb5 Mon Sep 17 00:00:00 2001 From: Batrachophreno Date: Fri, 25 Jul 2025 15:47:23 -0400 Subject: [PATCH] Remove false positive 'fire alarm in area' text from atmos alerts (#21050) Orphaned code from when fire alarms were migrated to their own machinery obj. Handled. --- code/game/machinery/alarm.dm | 5 +- .../Batrachophreno-FalseFireAlarm.yml | 58 +++++++++++++++++++ nano/templates/air_alarm.tmpl | 13 ++--- 3 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 html/changelogs/Batrachophreno-FalseFireAlarm.yml diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 3163ccbbefd..f81a788d022 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -1,5 +1,5 @@ //////////////////////////////////////// -//CONTAINS: Air Alarms and Fire Alarms// +//CONTAINS: Air Alarms// //////////////////////////////////////// #define AALARM_MODE_SCRUBBING 1 @@ -708,7 +708,6 @@ pixel_x = 10; data["total_danger"] = danger_level data["environment"] = environment_data data["atmos_alarm"] = alarm_area.atmosalm - data["fire_alarm"] = alarm_area.fire != null data["target_temperature"] = "[target_temperature - T0C]C" /obj/machinery/alarm/proc/populate_controls(var/list/data) @@ -1049,8 +1048,6 @@ Just a object used in constructing air alarms w_class = WEIGHT_CLASS_SMALL matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 50) -// Fire Alarms moved to firealarm.dm - #undef AALARM_MODE_SCRUBBING #undef AALARM_MODE_REPLACEMENT #undef AALARM_MODE_PANIC diff --git a/html/changelogs/Batrachophreno-FalseFireAlarm.yml b/html/changelogs/Batrachophreno-FalseFireAlarm.yml new file mode 100644 index 00000000000..29afac26310 --- /dev/null +++ b/html/changelogs/Batrachophreno-FalseFireAlarm.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Batrachophrenoboocosmomachia + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Remove orphaned fire alarm code from air alarms." diff --git a/nano/templates/air_alarm.tmpl b/nano/templates/air_alarm.tmpl index 4ae60f944d5..3dde73a1c9e 100644 --- a/nano/templates/air_alarm.tmpl +++ b/nano/templates/air_alarm.tmpl @@ -1,4 +1,4 @@ -