diff --git a/Resources/Audio/Misc/attributions.yml b/Resources/Audio/Misc/attributions.yml index 67daaff404..25856d8c93 100644 --- a/Resources/Audio/Misc/attributions.yml +++ b/Resources/Audio/Misc/attributions.yml @@ -57,3 +57,18 @@ 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 index 0000000000..1a957104aa 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 index 0000000000..05b0b5935c 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 index 0000000000..02539c20e2 Binary files /dev/null and b/Resources/Audio/Misc/woosh.ogg differ diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 99c19cde9b..4008e5aaeb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -331,6 +331,33 @@ 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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 48ef2f6558..461aee3690 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1124,6 +1124,17 @@ - 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 index 0000000000..ae32a21036 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 index 0000000000..4367a5ed61 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 index 0000000000..a8aaf138bf 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 index 0000000000..32429ed8f8 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 index 0000000000..f96629f129 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/meta.json @@ -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 index 0000000000..7a3e03df9e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/sticky_hand.rsi/rope.png differ