From: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com>
Date: Fri, 30 May 2025 23:37:51 +0000 (-0400)
Subject: Decouple the lamp from the base air alarm sprite. (#37950)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=85636335ec7223c2d368759bfc4929102794a628;p=space-station-14.git

Decouple the lamp from the base air alarm sprite. (#37950)

a touch of verin here and a sprinkle of verin there
---

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
index 657c803d92..dc94e2d09f 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
@@ -42,13 +42,12 @@
     - GasVent
     - GasScrubber
   - type: AtmosAlarmableVisuals
-    layerMap: "airAlarmBase"
+    layerMap: "airAlarmState"
     alarmStates:
       Normal: alarm0
-      Warning: alarm2
-      Danger: alarm1
-    setOnDepowered:
-      airAlarmBase: alarmp
+      Warning: alarm1
+      Danger: alarm2
+    hideOnDepowered: [ "airAlarmState" ]
   - type: Tag
     tags:
       - AirAlarm
@@ -81,8 +80,10 @@
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors.rsi
     layers:
+    - state: alarmp
+      map: ["airAlarmBase"]
     - state: alarm0
-      map: ["airAlarmBase"] # TODO: fire alarm enum
+      map: ["airAlarmState"] # TODO: fire alarm enum
     - state: alarmx
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Transform
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png
index 995aaabb32..cee119f79e 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png
index 03c7cfa268..0e239f6a4c 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png
index 684898f1b6..d2c54b825e 100644
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png differ