]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Adds gorilla gauntlet storage sprite and updates hit sound (#33167)
authorSpaceRox1244 <138547931+SpaceRox1244@users.noreply.github.com>
Fri, 15 Nov 2024 22:48:28 +0000 (17:48 -0500)
committerGitHub <noreply@github.com>
Fri, 15 Nov 2024 22:48:28 +0000 (16:48 -0600)
* Adds storage sprite for gorilla gauntlet

* Specifies a heavier hitsound for gorilla gauntlet

* Modifies gauntlet icon and storage sprite

* Updates credit to my new username

Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/icon.png
Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/meta.json
Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/storage.png [new file with mode: 0644]

index 516bd0f6bdaf5956f3aff6d79e3084f22cdfc425..efbd7c2db4f199c3ae6d2aa4e6119e03df4b05d7 100644 (file)
     state: icon
   - type: Item
     size: Large
+    storedSprite:
+      state: storage
+      sprite: Objects/Weapons/Melee/gorilla.rsi
   - type: MeleeWeapon
     attackRate: 0.5
     angle: 0
     damage:
       types:
         Blunt: 20
+    soundHit:
+      path: "/Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg"
   - type: CorePoweredThrower
   - type: MeleeThrowOnHit
     unanchorOnHit: true
index a57ce53cc4633590e7be46bbe293c5bd7cace1f4..9ce8603d2a68d0c78a8f09a9f95844ea5ca986b7 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/icon.png differ
index 97a5fdbd2e24d1f139a58ffaab772ea875aec84a..55417c2e716fae58cb1b1f9e78b7df941ae03f65 100644 (file)
@@ -1,14 +1,17 @@
 {
   "version": 1,
   "license": "CC0-1.0",
-  "copyright": "Design and inhands by ricemar (discord) and icon by EmoGarbage404 (github)",
+  "copyright": "Design, inhands, and storage sprite by SpaceRox1244 (github) and icon by EmoGarbage404 (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "icon"
+        "name": "icon"
+    },
+    {
+        "name":  "storage"
     },
     {
       "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/storage.png
new file mode 100644 (file)
index 0000000..e21fc82
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/gorilla.rsi/storage.png differ