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 657c803d928de95827cbfb716e9179f0b18cfdf6..dc94e2d09f282ae5598b5018b3c1d354854bae51 100644 (file)
--- 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 995aaabb329695f3c0e4c15cb23e5cf68e4473d9..cee119f79e955c120ed15383290279e493c3cb23 100644 (file)
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 03c7cfa26820c12915216f04edf4c5a67e9cd83b..0e239f6a4ce92e3928f946ab51aa60c6634251a1 100644 (file)
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 684898f1b63ce00e580127b7637395ee70efdd62..d2c54b825e4c655e4cc5f772d4e55a429c826824 100644 (file)
Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png differ