[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 88eeace3d8543f772bb03cff5e88f0d2b8de85b2..191aa398a968d961355cbad3b8b33f5fdca67f68 100644 (file)
--- 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 8f7e5e6782be6beba8daa6b5cb702bafd38ea77e..efc173d893669b4ff418f61ae32ccd3d92ffd3fd 100644 (file)
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 bdef533ae36dd9ff691ee057dd48a3444f6c1093..9bc5d8c0bf341e5ecd829e77a0e1b8f689be12cb 100644 (file)
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 6bbc79c31b2b608934a9acc0380951052ecde90b..75ba6d6de046aae288fa21c5aa213a07c35a64a6 100644 (file)
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 c7fd087c81d7f95f779b5626e7f086dc8f2313e4..087777a888b4e36294cf5c6e2b17f25d92bc1031 100644 (file)
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 d22d0066842f6cb3fa8a2a181b554e64b09fceab..74e1688748df93b3c207d51acb09f8ff9030c751 100644 (file)
--- 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 17a740920f85f7902cdbd0bc8edebb1044023ad6..cf1b050c0246a699f147b5c266fe21f404b4f2fe 100644 (file)
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 b32003c69875377f1c74b926270c3bb17a93c7d0..bf0b9c928eec6d868a5de6bcbfc05e05e547f4eb 100644 (file)
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 8380b47e7c595a9d1bef7978146457b112ec41dd..6208c59db793f9026125288653ea9d2ffe249a05 100644 (file)
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 67890d4be28175861544e307599e49cd43eb7d5d..e038706b0e43c0aa10a935bb90a0ea0ebcb6b88f 100644 (file)
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 9c732a4e7a7c2622a04a6d110345e3cdcbc7f973..5ff27ef75900113079d1b41fd15a9f7bec222ff1 100644 (file)
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 0ecc5b4c9cd6d85d2552a81664729f424ec6b3c7..b45ae1cb5fc160d9dc9635397c8cd049b0e6a306 100644 (file)
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