From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Mon, 28 Apr 2025 09:45:19 +0000 (-0400)
Subject: [HOTFIX] Revert "Updated air scrubber and air vent sprites." (#36992)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=4509821f0e0145bfa3632b667012b0031fdf8366;p=space-station-14.git

[HOTFIX] Revert "Updated air scrubber and air vent sprites." (#36992)

Revert "Updated air scrubber and air vent sprites. (#34223)"

This reverts commit 3957bbb97d7cd59ce32d9aff736ab52954b0c095.
---

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json
index 88eeace3d8..191aa398a9 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json
@@ -1,133 +1,34 @@
 {
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/32742/commits/44820f5b6e2c864a35bfad448e0a9437f01ad2e2",
-    "states": [
-        {
-            "name": "scrub_off",
-            "directions": 4
-        },
-        {
-            "name": "scrub_welded",
-            "directions": 4
-        },
-        {
-            "name": "scrub_on",
-            "directions": 4,
-            "delays": [
-                [
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10
-                ],
-                [
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10
-                ],
-                [
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10
-                ],
-                [
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10
-                ]
-            ]
-        },
-        {
-            "name": "scrub_purge",
-            "directions": 4,
-            "delays": [
-                [
-                    0.06,
-                    0.06,
-                    0.06,
-                    0.06,
-                    0.06,
-                    0.06
-                ],
-                [
-                    0.06,
-                    0.06,
-                    0.06,
-                    0.06,
-                    0.06,
-                    0.06
-                ],
-                [
-                    0.06,
-                    0.06,
-                    0.06,
-                    0.06,
-                    0.06,
-                    0.06
-                ],
-                [
-                    0.06,
-                    0.06,
-                    0.06,
-                    0.06,
-                    0.06,
-                    0.06
-                ]
-            ]
-        },
-        {
-            "name": "scrub_wide",
-            "directions": 4,
-            "delays": [
-                [
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10
-                ],
-                [
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10
-                ],
-                [
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10
-                ],
-                [
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10,
-                    0.10
-                ]
-            ]
-        }
-    ]
+   "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]]
+      }
+   ]
 }
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png
index 8f7e5e6782..efc173d893 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png and b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png
index bdef533ae3..9bc5d8c0bf 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png and b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png
index 6bbc79c31b..75ba6d6de0 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png and b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png
index c7fd087c81..087777a888 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png and b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json
index d22d006684..74e1688748 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json
@@ -1,103 +1,37 @@
 {
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/32742/commits/44820f5b6e2c864a35bfad448e0a9437f01ad2e2",
-  "states": [
-    {
-      "name": "vent_passive",
-      "directions": 4
-    },
-    {
-      "name": "vent_off",
-      "directions": 4
-    },
-    {
-      "name": "vent_welded",
-      "directions": 4
-    },
-    {
-      "name": "vent_out",
-      "directions": 4,
-      "delays": [
-        [
-          0.05,
-          0.05,
-          0.05,
-          0.05,
-          0.05,
-          0.05
-        ],
-        [
-          0.05,
-          0.05,
-          0.05,
-          0.05,
-          0.05,
-          0.05
-        ],
-        [
-          0.05,
-          0.05,
-          0.05,
-          0.05,
-          0.05,
-          0.05
-        ],
-        [
-          0.05,
-          0.05,
-          0.05,
-          0.05,
-          0.05,
-          0.05
-        ]
-      ]
-    },
-    {
-      "name": "vent_in",
-      "directions": 4,
-      "delays": [
-        [
-          0.05,
-          0.05,
-          0.05,
-          0.05,
-          0.05,
-          0.05
-        ],
-        [
-          0.05,
-          0.05,
-          0.05,
-          0.05,
-          0.05,
-          0.05
-        ],
-        [
-          0.05,
-          0.05,
-          0.05,
-          0.05,
-          0.05,
-          0.05
-        ],
-        [
-          0.05,
-          0.05,
-          0.05,
-          0.05,
-          0.05,
-          0.05
-        ]
-      ]
-    },
-    {
-      "name": "vent_lockout",
-      "directions": 4
-    }
-  ]
+   "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
+      }
+   ]
 }
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png
index 17a740920f..cf1b050c02 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png and b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_lockout.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_lockout.png
index b32003c698..bf0b9c928e 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_lockout.png and b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_lockout.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png
index 8380b47e7c..6208c59db7 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png and b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png
index 67890d4be2..e038706b0e 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png and b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_passive.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_passive.png
index 9c732a4e7a..5ff27ef759 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_passive.png and b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_passive.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png
index 0ecc5b4c9c..b45ae1cb5f 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png and b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png differ