]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Partially reverts the remote signaller resprite (#27073)
authorFlareguy <78941145+Flareguy@users.noreply.github.com>
Thu, 18 Apr 2024 01:16:48 +0000 (20:16 -0500)
committerGitHub <noreply@github.com>
Thu, 18 Apr 2024 01:16:48 +0000 (21:16 -0400)
de-sprites the remote signaller

Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
Resources/Textures/Objects/Devices/signaller.rsi/advanced-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Devices/signaller.rsi/advanced-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Devices/signaller.rsi/advanced.png [new file with mode: 0644]
Resources/Textures/Objects/Devices/signaller.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Devices/signaller.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Devices/signaller.rsi/meta.json
Resources/Textures/Objects/Devices/signaller.rsi/signaller.png
Resources/Textures/Objects/Devices/signaller.rsi/signaller2.png [deleted file]

index aa889341b1bc50de4e509c1f3f707dcc306cbaab..db4406905a6afc96e54a8c4aae361bea5746e643 100644 (file)
   description: A handheld device used for remotely sending signals to objects within a small radius of about 50 meters.
   components:
   - type: Sprite
-    state: signaller2
+    state: advanced
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: advanced-inhand-left
+      right:
+      - state: advanced-inhand-right
   - type: WirelessNetworkConnection
     range: 50
   - type: StaticPrice
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/advanced-inhand-left.png b/Resources/Textures/Objects/Devices/signaller.rsi/advanced-inhand-left.png
new file mode 100644 (file)
index 0000000..e04554e
Binary files /dev/null and b/Resources/Textures/Objects/Devices/signaller.rsi/advanced-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/advanced-inhand-right.png b/Resources/Textures/Objects/Devices/signaller.rsi/advanced-inhand-right.png
new file mode 100644 (file)
index 0000000..a3a7a18
Binary files /dev/null and b/Resources/Textures/Objects/Devices/signaller.rsi/advanced-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/advanced.png b/Resources/Textures/Objects/Devices/signaller.rsi/advanced.png
new file mode 100644 (file)
index 0000000..2383bf5
Binary files /dev/null and b/Resources/Textures/Objects/Devices/signaller.rsi/advanced.png differ
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/inhand-left.png b/Resources/Textures/Objects/Devices/signaller.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..011508c
Binary files /dev/null and b/Resources/Textures/Objects/Devices/signaller.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/inhand-right.png b/Resources/Textures/Objects/Devices/signaller.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..751ae90
Binary files /dev/null and b/Resources/Textures/Objects/Devices/signaller.rsi/inhand-right.png differ
index cefaeebebfd8f5a27cc04a4e5bc761b6e67e392a..97bbc40162406d9e99e3e50f0a5ebc2704837e3e 100644 (file)
@@ -1,21 +1,33 @@
 {
-    "version": 1,
-
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Goonstation at commit https://github.com/goonstation/goonstation/commit/354d9635460c296dc7dce23ab39481dc4de6dc00, signaller2 created by TheShuEd",
-
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "signaller state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/2c980a1f423f26e990a578bae057d1eca19675ec. inhands & advanced made by Flaregy for Space Station 14. advanced is modified from signaller",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "signaller"
     },
-    "states": [
-        {
-            "name": "signaller",
-            "directions": 1
-        },
-        {
-            "name": "signaller2",
-            "directions": 1
-        }
-    ]
-}
\ No newline at end of file
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "advanced"
+    },
+    {
+      "name": "advanced-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "advanced-inhand-right",
+      "directions": 4
+    }
+  ]
+}
index 37a47342a6a0fadd153c1abb049caefe51b50e43..68ff28ad161f79d98cde4a9b092eb6bae72b16f6 100644 (file)
Binary files a/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png and b/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png differ
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/signaller2.png b/Resources/Textures/Objects/Devices/signaller.rsi/signaller2.png
deleted file mode 100644 (file)
index 799a7be..0000000
Binary files a/Resources/Textures/Objects/Devices/signaller.rsi/signaller2.png and /dev/null differ