Merge remote-tracking branch 'upstream/master'

2024-05-27 08:43:42 +03:00
parent 134f27b87d
commit 7282ac2471
114 changed files with 22220 additions and 22980 deletions
--- a/Resources/Textures/White/Fluff/purplemab/lunar_cmo_bio.rsi/meta.json
+++ b/Resources/Textures/White/Fluff/purplemab/lunar_cmo_bio.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}