Merge remote-tracking branch 'upstream/master'

2024-07-07 22:09:11 +03:00
parent 8d635232d7 b32f09a5e5
commit 14e413b38a
1623 changed files with 27182 additions and 32363 deletions
--- a/Resources/Textures/White/Cult/bola.rsi/icon.png
+++ b/Resources/Textures/White/Cult/bola.rsi/icon.png
--- a/Resources/Textures/White/Cult/bola.rsi/meta.json
+++ b/Resources/Textures/White/Cult/bola.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Citadel Station at https://github.com/Citadel-Station-13/Citadel-Station-13/commit/3cfea7eb92246d311de8b531347795bc76d6dab6",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
--- a/Resources/Textures/White/Objects/Weapons/Throwable/energybola.rsi/icon.png
+++ b/Resources/Textures/White/Objects/Weapons/Throwable/energybola.rsi/icon.png
--- a/Resources/Textures/White/Objects/Weapons/Throwable/energybola.rsi/meta.json
+++ b/Resources/Textures/White/Objects/Weapons/Throwable/energybola.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": null,
+  "copyright": null,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}