]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
made the guitars be able to be worn on suitstorage (#29048)
authorBoaz1111 <149967078+Boaz1111@users.noreply.github.com>
Tue, 9 Jul 2024 23:28:10 +0000 (01:28 +0200)
committerGitHub <noreply@github.com>
Tue, 9 Jul 2024 23:28:10 +0000 (09:28 +1000)
* made the guitars be able to be worn on suitstorage

* minor fix

Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/equipped-SUITSTORAGE.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/meta.json
Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/equipped-SUITSTORAGE.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json
Resources/Textures/Objects/Fun/Instruments/guitar.rsi/equipped-SUITSTORAGE.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Instruments/guitar.rsi/meta.json
Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/equipped-SUITSTORAGE.png [new file with mode: 0644]
Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json

index 7224efa9e0231e13a507a08c3cc02f95d42e97c0..6ceb5e23edc1516cc5fb165b39b540b3fa8d963e 100644 (file)
@@ -21,6 +21,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
     sprite: Objects/Fun/Instruments/eguitar.rsi
   - type: Tag
     tags:
@@ -50,6 +51,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
     sprite: Objects/Fun/Instruments/bassguitar.rsi
   - type: Tag
     tags:
@@ -78,6 +80,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
     sprite: Objects/Fun/Instruments/rockguitar.rsi
   - type: Tag
     tags:
     quickEquip: false
     slots:
     - back
+    - suitStorage
     sprite: Objects/Fun/Instruments/guitar.rsi
   - type: Wieldable
   - type: Damageable # Smash it! Does 20 damage a hit, but breaks after 1 hit.
diff --git a/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/equipped-SUITSTORAGE.png
new file mode 100644 (file)
index 0000000..72146d4
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/equipped-SUITSTORAGE.png differ
index 831493169f732bf5798480745f2ffadda912c2a1..3fd240a93b9ef0e927f1a36186dc9404c60cc54a 100644 (file)
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/equipped-SUITSTORAGE.png
new file mode 100644 (file)
index 0000000..ba9d487
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/equipped-SUITSTORAGE.png differ
index 0891477f1b59c11e898b634ad6580a5a9abf6110..8723daef066c7d0d4b58761c9083923e351e8842 100644 (file)
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/equipped-SUITSTORAGE.png
new file mode 100644 (file)
index 0000000..71667f4
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/equipped-SUITSTORAGE.png differ
index 6813282372743435ee3e3e16436d703768e2f187..bcd517578fc7cd3a9961057597a1b2fb37dd8e97 100644 (file)
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/equipped-SUITSTORAGE.png
new file mode 100644 (file)
index 0000000..36cb11d
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/equipped-SUITSTORAGE.png differ
index 7fb73d450dc30b48632952a3f5f3ba674e1e060f..96bd8a37e53da8b2d6643f70503fe521e71d776d 100644 (file)
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4