]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fixing foam dart sprite in hands (#39758)
authorM4rchy-S <89603088+M4rchy-S@users.noreply.github.com>
Tue, 19 Aug 2025 22:39:25 +0000 (01:39 +0300)
committerGitHub <noreply@github.com>
Tue, 19 Aug 2025 22:39:25 +0000 (18:39 -0400)
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/meta.json
Resources/Textures/Objects/Fun/Foam/foam_dart.rsi/foamdart.png [moved from Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/foamdart.png with 100% similarity]
Resources/Textures/Objects/Fun/Foam/foam_dart.rsi/meta.json [new file with mode: 0644]

index cfe080da6d5930d9cb2245ade27da4a080235751..3e4235f67712d44cf1eab84e852fe095a9684d8c 100644 (file)
@@ -24,7 +24,7 @@
       - Trash
   - type: Ammo
   - type: Sprite
-    sprite: Objects/Fun/Foam/foam_crossbow.rsi
+    sprite: Objects/Fun/Foam/foam_dart.rsi
     layers:
       - state: foamdart
   - type: EmbeddableProjectile
index b245d7e77db34a9d771534c1a318ab52c804241d..79a6ec3509e107a85e3269872a94aeedbe36df02 100644 (file)
@@ -10,9 +10,6 @@
         {
             "name": "icon"
         },
-        {
-            "name": "foamdart"
-        },
         {
             "name": "foambox"
         },
diff --git a/Resources/Textures/Objects/Fun/Foam/foam_dart.rsi/meta.json b/Resources/Textures/Objects/Fun/Foam/foam_dart.rsi/meta.json
new file mode 100644 (file)
index 0000000..a7e64d4
--- /dev/null
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "foamdart"
+        }
+    ]
+}