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

2024-03-02 18:40:57 +03:00
parent b768af5485 e185a5d7b4
commit ffaa0c6815
35 changed files with 597 additions and 221 deletions
--- a/Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png
+++ b/Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png
--- a/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png
+++ b/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png
--- a/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png
+++ b/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png
--- a/Resources/Textures/Structures/Doors/secret_door.rsi/open.png
+++ b/Resources/Textures/Structures/Doors/secret_door.rsi/open.png
--- a/Resources/Textures/Structures/Doors/secret_door.rsi/opening.png
+++ b/Resources/Textures/Structures/Doors/secret_door.rsi/opening.png
--- a/Resources/Textures/White/Overlays/mindslave.rsi/master.png
+++ b/Resources/Textures/White/Overlays/mindslave.rsi/master.png
--- a/Resources/Textures/White/Overlays/mindslave.rsi/meta.json
+++ b/Resources/Textures/White/Overlays/mindslave.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "@JustNemo",
+    "states": [
+        {
+            "name": "slave"
+        },
+        {
+            "name": "master"
+        }
+    ]
+}
--- a/Resources/Textures/White/Overlays/mindslave.rsi/slave.png
+++ b/Resources/Textures/White/Overlays/mindslave.rsi/slave.png