diff --git a/Resources/Audio/Effects/bite.ogg b/Resources/Audio/Effects/bite.ogg new file mode 100644 index 0000000000..de79cbd49e Binary files /dev/null and b/Resources/Audio/Effects/bite.ogg differ diff --git a/Resources/Audio/Effects/license.txt b/Resources/Audio/Effects/license.txt index 8cc37bea43..b91972d6cf 100644 --- a/Resources/Audio/Effects/license.txt +++ b/Resources/Audio/Effects/license.txt @@ -20,4 +20,6 @@ saw.ogg taken from https://freesound.org/people/domiscz/sounds/461728/ and clipp smoke.ogg taken from https://github.com/tgstation/tgstation/blob/a5d362ce84e4f0c61026236d5ec84d3c81553664/sound/effects/smoke.ogg -voteding.ogg taken from "Bike, Bell Ding, Single, 01-01.wav" by InspectorJ (www.jshaw.co.uk) of Freesound.org at https://freesound.org/people/InspectorJ/sounds/484344/ under CC BY 3.0. The volume has been reduced. \ No newline at end of file +voteding.ogg taken from "Bike, Bell Ding, Single, 01-01.wav" by InspectorJ (www.jshaw.co.uk) of Freesound.org at https://freesound.org/people/InspectorJ/sounds/484344/ under CC BY 3.0. The volume has been reduced. + +bite.ogg take from https://github.com/tgstation/tgstation/commit/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index 0c928c9f3e..f92b7b8e0d 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -51,6 +51,8 @@ range: 1.5 arcwidth: 0 arc: bite + hitSound: + path: /Audio/Effects/bite.ogg damage: groups: Brute: 20 diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml index bbbb3f775e..2920f6f1ea 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml @@ -25,3 +25,9 @@ - type: Tag tags: - Payload # yes, you can make re-usable prank grenades + - type: MeleeWeapon + hitSound: + collection: BikeHorn + damage: + types: + Blunt: 0 diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 79ca4da42b..b55ba3aad7 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -6,6 +6,7 @@ abstract: true components: - type: Sprite + sprite: Objects/Fun/toys.rsi netsync: false - type: EmitSoundOnUse sound: @@ -19,6 +20,12 @@ - type: ItemCooldown - type: UseDelay delay: 1.0 + - type: MeleeWeapon + hitSound: + collection: ToySqueak + damage: + types: + Blunt: 0 - type: entity parent: BasePlushie @@ -27,7 +34,6 @@ description: A cute toy that resembles an even cuter programmer. You'd have to be a monster to grind this up. components: - type: Sprite - sprite: Objects/Fun/toys.rsi state: plushie_h - type: Extractable grindableSolutionName: bee @@ -57,7 +63,6 @@ description: A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. components: - type: Sprite - sprite: Objects/Fun/toys.rsi state: plushie_nuke - type: entity @@ -67,7 +72,6 @@ description: Rouny components: - type: Sprite - sprite: Objects/Fun/toys.rsi state: plushie_rouny - type: entity @@ -77,9 +81,7 @@ description: An adorable stuffed toy that resembles a lizardperson. Made by CentCom as a token initiative to combat speciesism in work environments. "Welcome your new colleagues as you do this plush, with open arms!" components: - type: Sprite - sprite: Objects/Fun/toys.rsi state: plushie_lizard - - type: ItemCooldown - type: EmitSoundOnUse sound: path: /Audio/Items/Toys/weh.ogg @@ -89,8 +91,9 @@ - type: EmitSoundOnActivate sound: path: /Audio/Items/Toys/weh.ogg - - type: UseDelay - delay: 1.0 + - type: MeleeWeapon + hitSound: + path: /Audio/Items/Toys/weh.ogg - type: entity parent: BasePlushie @@ -99,9 +102,7 @@ description: An adorable stuffed toy that resembles a lizardperson in an EVA suit. Made by CentCom as a token initiative to combat speciesism in space environments. "Welcome your new colleges as you do this plush, with open arms!" components: - type: Sprite - sprite: Objects/Fun/toys.rsi state: plushie_spacelizard - - type: ItemCooldown - type: EmitSoundOnUse sound: path: /Audio/Items/Toys/muffled_weh.ogg @@ -111,8 +112,9 @@ - type: EmitSoundOnActivate sound: path: /Audio/Items/Toys/muffled_weh.ogg - - type: UseDelay - delay: 1.0 + - type: MeleeWeapon + hitSound: + path: /Audio/Items/Toys/muffled_weh.ogg - type: entity parent: BasePlushie @@ -121,7 +123,6 @@ description: A small stuffed doll of the elder god Ratvar. components: - type: Sprite - sprite: Objects/Fun/toys.rsi state: plushie_ratvar - type: entity @@ -131,7 +132,6 @@ description: A small stuffed doll of the elder goddess Nar'Sie. components: - type: Sprite - sprite: Objects/Fun/toys.rsi state: narplush @@ -142,11 +142,21 @@ description: An adorable stuffed toy that resembles the monstrous space carp. components: - type: Sprite - sprite: Objects/Fun/toys.rsi state: carpplush - type: Item - sprite: Objects/Fun/toys.rsi HeldPrefix: carpplush + - type: EmitSoundOnUse + sound: + path: /Audio/Effects/bite.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Effects/bite.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Effects/bite.ogg + - type: MeleeWeapon + hitSound: + path: /Audio/Effects/bite.ogg - type: entity parent: BasePlushie @@ -155,43 +165,40 @@ description: An adorable stuffed toy that resembles a slime. It's basically a hacky sack. components: - type: Sprite - sprite: Objects/Fun/toys.rsi state: plushie_slime - type: entity - parent: BaseItem + parent: BasePlushie id: PlushieSnake name: snake plushie description: An adorable stuffed toy that resembles a snake. components: - type: Sprite - sprite: Objects/Fun/toys.rsi state: plushie_snake - - type: ItemCooldown - type: EmitSoundOnUse sound: path: /Audio/Items/Toys/rattle.ogg - - type: UseDelay - delay: 1.0 + - type: MeleeWeapon + hitSound: + path: /Audio/Items/Toys/rattle.ogg - type: entity - parent: BaseItem + parent: BasePlushie id: ToyMouse name: mouse toy description: A colorful toy mouse! components: - type: Sprite - sprite: Objects/Fun/toys.rsi state: toy_mouse - - type: ItemCooldown - type: EmitSoundOnUse sound: path: /Audio/Items/Toys/mousesqueek.ogg - - type: UseDelay - delay: 1.0 + - type: MeleeWeapon + hitSound: + path: /Audio/Items/Toys/mousesqueek.ogg - type: entity - parent: BaseItem + parent: BasePlushie id: ToyRubberDuck name: rubber ducky description: Not carried here by ocean currents. @@ -204,33 +211,28 @@ sprite: Objects/Fun/ducky.rsi Slots: - HEAD - - type: ItemCooldown - type: EmitSoundOnUse sound: path: /Audio/Items/Toys/quack.ogg - - type: UseDelay - delay: 1.0 - type: entity - parent: BaseItem + parent: BasePlushie id: PlushieVox name: vox plushie description: SKREEEEEEEEEEEE! components: - type: Sprite - sprite: Objects/Fun/toys.rsi state: plushie_vox netsync: false - - type: ItemCooldown - type: EmitSoundOnUse sound: path: /Audio/Voice/Vox/shriek1.ogg - type: EmitSoundOnLand sound: - path: /Audio/Voice/Vox/shriek1.ogg - - type: UseDelay - delay: 1.0 - + path: /Audio/Voice/Vox/shriek1.ogg + - type: MeleeWeapon + hitSound: + path: /Audio/Voice/Vox/shriek1.ogg ## Figurines - type: entity @@ -287,20 +289,19 @@ state: honkprize - type: entity - parent: BaseItem + parent: BasePlushie id: ToyIan name: ian toy description: Unable to eat, but just as fluffy as the real guy! components: - type: Sprite - sprite: Objects/Fun/toys.rsi state: ian - - type: ItemCooldown - type: EmitSoundOnUse sound: path: /Audio/Items/Toys/ian.ogg - - type: UseDelay - delay: 1.0 + - type: MeleeWeapon + hitSound: + path: /Audio/Items/Toys/ian.ogg - type: entity parent: BaseItem @@ -539,7 +540,7 @@ arc: spear damage: types: - Blunt: 1 + Blunt: 0 - type: Item size: 24 sprite: Objects/Fun/toys.rsi