Merge remote-tracking branch 'upstream/master' into ups

Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json

@@ -0,0 +1,47 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "chem-0"
+    },
+    {
+      "name": "chem-1"
+    },
+    {
+      "name": "chem-2"
+    },
+    {
+      "name": "chem-3"
+    },
+    {
+      "name": "chem-4"
+    },
+    {
+      "name": "chem-5"
+    },
+    {
+      "name": "chem-6"
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json

@@ -0,0 +1,53 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "bar-0"
+    },
+    {
+      "name": "bar-1"
+    },
+    {
+      "name": "bar-2"
+    },
+    {
+      "name": "bar-3"
+    },
+    {
+      "name": "bar-4"
+    },
+    {
+      "name": "bar-5"
+    },
+    {
+      "name": "bar-6"
+    },
+    {
+      "name": "bar-7"
+    },
+    {
+      "name": "bar-8"
+    },
+    {
+      "name": "bar-9"
+    },
+    {
+      "name": "bar-10"
+    },
+    {
+      "name": "bar-11"
+    },
+    {
+      "name": "bar-12"
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json

@@ -0,0 +1,53 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "kitchen-0"
+    },
+    {
+      "name": "kitchen-1"
+    },
+    {
+      "name": "kitchen-2"
+    },
+    {
+      "name": "kitchen-3"
+    },
+    {
+      "name": "kitchen-4"
+    },
+    {
+      "name": "kitchen-5"
+    },
+    {
+      "name": "kitchen-6"
+    },
+    {
+      "name": "kitchen-7"
+    },
+    {
+      "name": "kitchen-8"
+    },
+    {
+      "name": "kitchen-9"
+    },
+    {
+      "name": "kitchen-10"
+    },
+    {
+      "name": "kitchen-11"
+    },
+    {
+      "name": "kitchen-12"
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "rbase"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "rbase"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}

Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "rbase"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}

Resources/Textures/White/Cult/Entities/stun.rsi/meta.json

@@ -0,0 +1,66 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+          "name": "inhand-left",
+          "directions": 4,
+          "delays": [
+            [
+              0.1,
+              0.1,
+              0.1
+            ],
+            [
+              0.1,
+              0.1,
+              0.1
+            ],
+            [
+              0.1,
+              0.1,
+              0.1
+            ],
+            [
+              0.1,
+              0.1,
+              0.1
+            ]
+          ]
+        },
+        {
+          "name": "inhand-right",
+          "directions": 4,
+          "delays": [
+            [
+              0.1,
+              0.1,
+              0.1
+            ],
+            [
+              0.1,
+              0.1,
+              0.1
+            ],
+            [
+              0.1,
+              0.1,
+              0.1
+            ],
+            [
+              0.1,
+              0.1,
+              0.1
+            ]
+          ]
+        }
+    ]
+}

Resources/Textures/White/Items/Tools/rpd.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/ce025775f73b66934ca96f3a8edc30993ea70b4d and modified by Swept",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_Sunrise/Entities/Objects/Devices/portable_camera_viewer.rsi/meta.json

@@ -1,14 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "",
-    "states": [
-        {
-            "name": "icon"
-        }
-    ]
-}