]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Adds the sticky grappling hand (#37551)
authorAugust Sun <45527070+august-sun@users.noreply.github.com>
Sat, 6 Dec 2025 20:40:37 +0000 (13:40 -0700)
committerGitHub <noreply@github.com>
Sat, 6 Dec 2025 20:40:37 +0000 (20:40 +0000)
* Adds sprites, entity and sounds for sticky grappling hand

* Switched audio to mono

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

Co-authored-by: āda <ss.adasts@gmail.com>
* Added empty sound, changed yaml to suit conventions, added description

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
12 files changed:
Resources/Audio/Misc/attributions.yml
Resources/Audio/Misc/boing.ogg [new file with mode: 0644]
Resources/Audio/Misc/stickystretch.ogg [new file with mode: 0644]
Resources/Audio/Misc/woosh.ogg [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/base.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/hook.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/rope.png [new file with mode: 0644]

index 67daaff4042037005cfe3aefc5fee5624e7cb12f..25856d8c93ab83f4de520e731e977a0041641f8d 100644 (file)
   license: "CC-BY-SA-3.0"
   copyright: "Taken from Citadel Station 13"
   source: "https://github.com/Skyrat-SS13/Skyrat13/commit/2d4f2d1b489590b559e4073f41b126cef56f4c50"
+
+- files: ["woosh.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from SciFiSounds via freesound.org, edit by august-sun(GitHub)/augustsun(Discord)"
+  source: "https://freesound.org/people/SciFiSounds/sounds/529925/"
+
+- files: ["stickystretch.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from sdroliasnick via freesound.org, edit by august-sun(GitHub)/augustsun(Discord)"
+  source: "https://freesound.org/people/sdroliasnick/sounds/731262/"
+
+- files: ["boing.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from stevielematt via freesound.org, edit by august-sun(GitHub)/augustsun(Discord)"
+  source: "https://freesound.org/people/stevielematt/sounds/538066/"
diff --git a/Resources/Audio/Misc/boing.ogg b/Resources/Audio/Misc/boing.ogg
new file mode 100644 (file)
index 0000000..1a95710
Binary files /dev/null and b/Resources/Audio/Misc/boing.ogg differ
diff --git a/Resources/Audio/Misc/stickystretch.ogg b/Resources/Audio/Misc/stickystretch.ogg
new file mode 100644 (file)
index 0000000..05b0b59
Binary files /dev/null and b/Resources/Audio/Misc/stickystretch.ogg differ
diff --git a/Resources/Audio/Misc/woosh.ogg b/Resources/Audio/Misc/woosh.ogg
new file mode 100644 (file)
index 0000000..02539c2
Binary files /dev/null and b/Resources/Audio/Misc/woosh.ogg differ
index 7229fa0923fdbdf5c3873266b54f3dd365261dbf..f08de287d5799e0601a44ee46be446b294466d9f 100644 (file)
             False: { state: base-unshaded-off }
     - type: PacifismAllowedGun
 
+- type: entity
+  parent: BaseItem
+  id: WeaponStickyHand
+  name: sticky hand
+  description: They're saying you're reaching. They're saying it's a stretch. You'll show them all, and you'll stick it to them.
+  components:
+  - type: AmmoCounter
+  - type: GrapplingGun
+    cycleSound: /Audio/Misc/woosh.ogg
+    ropeSprite:
+      sprite: Objects/Weapons/Guns/Launchers/sticky_hand.rsi
+      state: rope
+  - type: Gun
+    soundGunshot: /Audio/Misc/stickystretch.ogg
+    fireRate: 0.5
+    clumsyProof: true
+    soundEmpty: /Audio/Misc/boing.ogg
+  - type: BasicEntityAmmoProvider
+    proto: StickyHandPalm
+    capacity: 1
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Launchers/sticky_hand.rsi
+    state: base
+  - type: UseDelay
+    delay: 1.5
+  - type: PacifismAllowedGun
+
 # Admeme
 - type: entity
   name: tether gun
index 132bd267fd9a45ba7650ec46e48eb04c219ef5ab..ee6b9abf39f69776a6badc1697e3ed5118f9c9dc 100644 (file)
             - HighImpassable
     - type: GrapplingProjectile
 
+- type: entity
+  parent: GrapplingHook
+  id: StickyHandPalm
+  name: sticky hand palm
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Launchers/sticky_hand.rsi
+  - type: Ammo
+    muzzleFlash: null
+
 - type: entity
   name : disabler bolt smg
   id: BulletDisablerSmg
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/base.png
new file mode 100644 (file)
index 0000000..ae32a21
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/hook.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/hook.png
new file mode 100644 (file)
index 0000000..4367a5e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/hook.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..a8aaf13
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..32429ed
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/meta.json
new file mode 100644 (file)
index 0000000..f96629f
--- /dev/null
@@ -0,0 +1,28 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by august-sun(GitHub)/augustsun(Discord) for Space Station 14.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "rope"
+        },
+        {
+            "name": "hook"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/rope.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/rope.png
new file mode 100644 (file)
index 0000000..7a3e03d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/rope.png differ