Merge branch 'master' into 2020-08-19-firelocks

2020-09-12 15:52:20 +02:00
parent ca7cffbc48 7cd98a4bce
commit c27ab9bf6a
20 changed files with 355 additions and 11 deletions
--- a/Resources/Textures/Constructible/Atmos/scrubber.rsi/meta.json
+++ b/Resources/Textures/Constructible/Atmos/scrubber.rsi/meta.json
@@ -0,0 +1,48 @@
+{
+   "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":"scrubOff",
+         "directions":1,
+         "delays":[ [ 1.0 ] ]
+      },
+      {
+         "name":"scrubOn",
+         "directions":1,
+         "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
+            ]
+         ]
+      }
+   ]
+}
--- a/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrubOff.png
+++ b/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrubOff.png
--- a/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrubOn.png
+++ b/Resources/Textures/Constructible/Atmos/scrubber.rsi/scrubOn.png
--- a/Resources/Textures/Constructible/Atmos/vent.rsi/meta.json
+++ b/Resources/Textures/Constructible/Atmos/vent.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+   "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":"ventOff",
+         "directions":1,
+         "delays":[ [ 1.0 ] ]
+      },
+      {
+         "name":"ventOn",
+         "directions":1,
+         "delays":[
+            [
+               0.08,
+               0.08,
+               0.08,
+               0.08
+            ]
+         ]
+      }
+   ]
+}
--- a/Resources/Textures/Constructible/Atmos/vent.rsi/ventOff.png
+++ b/Resources/Textures/Constructible/Atmos/vent.rsi/ventOff.png
--- a/Resources/Textures/Constructible/Atmos/vent.rsi/ventOn.png
+++ b/Resources/Textures/Constructible/Atmos/vent.rsi/ventOn.png