tweak: adjust vent and air alarm sprites

* air alarm * vent and scrubbers * fix lockout vent * make air alarm less blue
Mira-Sector · Jan 28, 2025 · 493bdc9 · 493bdc9
1 parent 067fd37
commit 493bdc9
Show file tree

Hide file tree

Showing 28 changed files with 200 additions and 132 deletions.
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
@@ -81,8 +81,10 @@
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors.rsi
     layers:
+    - state: alarmp
     - state: alarm0
       map: ["airAlarmBase"] # TODO: fire alarm enum
+      shader: unshaded
     - state: alarmx
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Transform

diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml
@@ -325,7 +325,7 @@
   description: An air alarm. Alarms... air?
   icon:
     sprite: Structures/Wallmounts/air_monitors.rsi
-    state: alarm0
+    state: alarmp
   placementMode: SnapgridCenter
   objectType: Structure
   canRotate: true
@@ -373,7 +373,7 @@
   startNode: start
   targetNode: sensor
   category: construction-category-structures
-  description: Reports on the status of the gas within the attached pipe network. 
+  description: Reports on the status of the gas within the attached pipe network.
   icon:
     sprite: Structures/Piping/Atmospherics/gas_pipe_sensor.rsi
     state: icon

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json
@@ -1,34 +1,55 @@
 {
-   "version":1,
-   "size":{
-      "x":32,
-      "y":32
+   "version": 1,
+   "size": {
+        "x":32,
+        "y":32
    },
-   "license":"CC-BY-SA-3.0",
-   "copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da",
-   "states":[
-      {
-         "name":"scrub_off",
-         "directions": 4
-      },
-      {
-         "name":"scrub_welded",
-         "directions": 4
-      },
-      {
-         "name":"scrub_on",
-         "directions": 4,
-         "delays": [[0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08], [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08], [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08], [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08]]
-      },
-      {
-         "name": "scrub_purge",
-         "directions": 4,
-         "delays": [[0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04]]
-      },
-      {
-         "name": "scrub_wide",
-         "directions": 4,
-         "delays": [[0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04]]
-      }
-   ]
+   "license": "CC-BY-SA-3.0",
+   "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/9b308c274d206fecb0c04165405130255866b8c9/icons/obj/atmospherics/components/unary_devices.dmi",
+   "states": [
+    {
+        "name": "scrub_off"
+    },
+    {
+        "name": "scrub_on",
+        "delays": [
+            [
+                0.08,
+                0.08,
+                0.08,
+                0.08,
+                0.08,
+                0.08
+            ]
+        ]
+    },
+    {
+        "name": "scrub_purge",
+        "delays": [
+            [
+                0.06,
+                0.06,
+                0.06,
+                0.06,
+                0.06,
+                0.06
+            ]
+        ]
+    },
+    {
+        "name": "scrub_welded"
+    },
+    {
+        "name": "scrub_wide",
+        "delays": [
+            [
+                0.08,
+                0.08,
+                0.08,
+                0.08,
+                0.08,
+                0.08
+            ]
+        ]
+    }]
 }
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_welded.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_welded.png
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json
@@ -1,37 +1,139 @@
 {
-   "version":1,
-   "size":{
-      "x":32,
-      "y":32
+   "version": 1,
+   "size": {
+        "x":32,
+        "y":32
    },
-   "license":"CC-BY-SA-3.0",
-   "copyright":"Taken from https://github.com/BeeStation/BeeStation-Hornet at commit 4ccd79de285e79e504308bcd6fa5908d6b7685f7",
-   "states":[
-      {
-         "name":"vent_passive",
-         "directions" : 4
-      },
-      {
-         "name":"vent_off",
-         "directions" : 4
-      },
-      {
-         "name":"vent_welded",
-         "directions" : 4
-      },
-      {
-         "name":"vent_out",
-         "directions" : 4,
-         "delays":[ [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ] ]
-      },
-      {
-         "name":"vent_in",
-         "directions" : 4,
-         "delays":[ [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ] ]
-      },
-      {
-         "name":"vent_lockout",
-         "directions" : 4
-      }
-   ]
+   "license": "CC-BY-SA-3.0",
+   "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/9b308c274d206fecb0c04165405130255866b8c9/icons/obj/atmospherics/components/unary_devices.dmi, vent_passive and vent_lockout modified by Doctor-Cpu",
+   "states": [
+    {
+        "name": "vent_in-off",
+        "delays": [
+            [
+                0.03,
+                0.04,
+                0.05,
+                0.06,
+                0.08,
+                0.1,
+                0.15,
+                0.2,
+                0.3,
+                1
+            ]
+        ]
+    },
+    {
+        "name": "vent_in-starting",
+        "delays": [
+            [
+                0.3,
+                0.2,
+                0.15,
+                0.1,
+                0.08,
+                0.06,
+                0.05,
+                0.04
+            ]
+        ]
+    },
+    {
+        "name": "vent_in",
+        "delays": [
+            [
+                0.03,
+                0.03,
+                0.03,
+                0.03,
+                0.03,
+                0.03
+            ]
+        ]
+    },
+    {
+        "name": "vent_lockout"
+    },
+    {
+        "name": "vent_lockout-off",
+        "delays": [
+            [
+                0.03,
+                0.04,
+                0.05,
+                0.06,
+                0.08,
+                0.1,
+                0.15,
+                0.2,
+                0.3,
+                1
+            ]
+        ]
+    },
+    {
+        "name": "vent_off"
+    },
+    {
+        "name": "vent_out-off",
+        "delays": [
+            [
+                0.03,
+                0.04,
+                0.05,
+                0.06,
+                0.08,
+                0.1,
+                0.15,
+                0.2,
+                0.3,
+                0.1
+            ]
+        ]
+    },
+    {
+        "name": "vent_out-starting",
+        "delays": [
+            [
+                0.3,
+                0.2,
+                0.15,
+                0.1,
+                0.08,
+                0.06,
+                0.05,
+                0.04
+            ]
+        ]
+    },
+    {
+        "name": "vent_out",
+        "delays": [
+            [
+                0.03,
+                0.03,
+                0.03,
+                0.03,
+                0.03,
+                0.03
+            ]
+        ]
+    },
+    {
+        "name": "vent_passive",
+        "delays": [
+            [
+                0.03,
+                0.03,
+                0.03,
+                0.03,
+                0.03,
+                0.03
+            ]
+        ]
+    },
+    {
+        "name": "vent_welded"
+    }]
 }
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in-off.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in-off.png
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in-starting.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in-starting.png
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_lockout-off.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_lockout-off.png
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_lockout.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_lockout.png
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out-off.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out-off.png
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out-starting.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out-starting.png
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_passive.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_passive.png
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png