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

Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by github:DreamlyJack(624946166152298517)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Misc/poppybouquet.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprite taked from TG station.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/Structures/Furniture/chairs.rsi/meta.json

@@ -1,103 +1,108 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC, brass chair.png taken from tgstation at https://github.com/tgstation/tgstation/blob/b7e7779c19b76449c290aaf2150fb93545b1a79a/icons/obj/chairs.dmi, wooden bench by Ko4erga (discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "bar",
-      "directions": 4
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC, brass chair.png taken from tgstation at https://github.com/tgstation/tgstation/blob/b7e7779c19b76449c290aaf2150fb93545b1a79a/icons/obj/chairs.dmi, pufi-greyscale pufi-greyscale-overlay comfy-greyscale comfy-overlay-greyscale sprited by github:DreamlyJack(624946166152298517)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "bar-knocked",
-      "directions": 4
-    },
-    {
-      "name": "chair",
-      "directions": 4
-    },
-    {
-      "name": "chair-knocked",
-      "directions": 4
-    },
-    {
-      "name": "chair-greyscale",
-      "directions": 4
-    },
-    {
-      "name": "chair-greyscale-knocked",
-      "directions": 4
-    },
-    {
-      "name": "comfy",
-      "directions": 4
-    },
-    {
-      "name": "comfy-overlay",
-      "directions": 4
-    },
-    {
-      "name": "meat",
-      "directions": 4
-    },
-    {
-      "name": "office-dark",
-      "directions": 4
-    },
-    {
-      "name": "office-white",
-      "directions": 4
-    },
-    {
-      "name": "shuttle",
-      "directions": 4
-    },
-    {
-      "name": "shuttle-overlay",
-      "directions": 4
-    },
-    {
-      "name": "stool",
-      "directions": 4
-    },
-    {
-      "name": "stool-knocked",
-      "directions": 4
-    },
-    {
-      "name": "wooden",
-      "directions": 4
-    },
-    {
-      "name": "wooden-bench",
-      "directions": 4
-    },
-    {
-      "name": "wooden-wings",
-      "directions": 4
-    },
-    {
-      "name": "wooden-wings-knocked",
-      "directions": 4
-    },
-    {
-      "name": "ritual",
-      "directions": 4
-    },
-    {
-      "name": "cursed",
-      "directions": 4
-    },
-    {
-      "name": "steel-bench",
-      "directions": 4
-    },
-	{
-		"name": "brass_chair",
-		"directions": 4
-	}
-  ]
+    "states": [
+        {
+            "name": "bar",
+            "directions": 4
+        },
+        {
+            "name": "bar-knocked",
+            "directions": 4
+        },
+        {
+            "name": "chair",
+            "directions": 4
+        },
+        {
+            "name": "chair-knocked",
+            "directions": 4
+        },
+        {
+            "name": "chair-greyscale",
+            "directions": 4
+        },
+        {
+            "name": "chair-greyscale-knocked",
+            "directions": 4
+        },
+        {
+            "name": "meat",
+            "directions": 4
+        },
+        {
+            "name": "office-dark",
+            "directions": 4
+        },
+        {
+            "name": "office-white",
+            "directions": 4
+        },
+        {
+            "name": "shuttle",
+            "directions": 4
+        },
+        {
+            "name": "shuttle-overlay",
+            "directions": 4
+        },
+        {
+            "name": "stool",
+            "directions": 4
+        },
+        {
+            "name": "stool-knocked",
+            "directions": 4
+        },
+        {
+            "name": "wooden",
+            "directions": 4
+        },
+        {
+            "name": "wooden-wings",
+            "directions": 4
+        },
+        {
+            "name": "wooden-wings-knocked",
+            "directions": 4
+        },
+        {
+            "name": "ritual",
+            "directions": 4
+        },
+        {
+            "name": "cursed",
+            "directions": 4
+        },
+        {
+            "name": "steel-bench",
+            "directions": 4
+        },
+        {
+            "name": "brass_chair",
+            "directions": 4
+        },
+        {
+            "name": "pufi-box-greyscale"
+        },
+        {
+            "name": "comfy-greyscale",
+            "directions": 4
+        },
+        {
+            "name": "comfy-random"
+        },
+        {
+            "name": "pufi-box-random"
+        },
+        {
+            "name": "wooden-bench",
+            "directions": 4
+        }
+    ]
 }

Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "size": {
+        "x": 48,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "bolt-open"
+        }
+    ]
+}

Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}