From ab6707aef6c28697c20068558d0e3bf134c73446 Mon Sep 17 00:00:00 2001 From: Kara Date: Wed, 10 May 2023 17:27:47 -0700 Subject: [PATCH] Give monkeys clumsy (#16320) --- Content.Server/Weapons/Ranged/Systems/GunSystem.cs | 2 +- Content.Shared/Interaction/Components/ClumsyComponent.cs | 7 +++++++ Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 9 +++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs index 72a85776ed..995c1ffbc6 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs @@ -83,7 +83,7 @@ public sealed partial class GunSystem : SharedGunSystem // Apply salt to the wound ("Honk!") Audio.PlayPvs(new SoundPathSpecifier("/Audio/Weapons/Guns/Gunshots/bang.ogg"), gunUid); - Audio.PlayPvs(new SoundPathSpecifier("/Audio/Items/bikehorn.ogg"), gunUid); + Audio.PlayPvs(clumsy.ClumsySound, gunUid); PopupSystem.PopupEntity(Loc.GetString("gun-clumsy"), user.Value); _adminLogger.Add(LogType.EntityDelete, LogImpact.Medium, $"Clumsy fire by {ToPrettyString(user.Value)} deleted {ToPrettyString(gunUid)}"); diff --git a/Content.Shared/Interaction/Components/ClumsyComponent.cs b/Content.Shared/Interaction/Components/ClumsyComponent.cs index 6938187f46..2acbdeaf68 100644 --- a/Content.Shared/Interaction/Components/ClumsyComponent.cs +++ b/Content.Shared/Interaction/Components/ClumsyComponent.cs @@ -1,4 +1,5 @@ using Content.Shared.Damage; +using Robust.Shared.Audio; namespace Content.Shared.Interaction.Components { @@ -11,5 +12,11 @@ namespace Content.Shared.Interaction.Components [DataField("clumsyDamage", required: true)] [ViewVariables(VVAccess.ReadWrite)] public DamageSpecifier ClumsyDamage = default!; + + /// + /// Sound to play when clumsy interactions fail + /// + [DataField("clumsySound")] + public SoundSpecifier ClumsySound = new SoundPathSpecifier("/Audio/Items/bikehorn.ogg"); } } diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index d2d3f14b73..0fe5bca505 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -806,6 +806,15 @@ name: ghost-role-information-monkey-name description: ghost-role-information-monkey-description - type: GhostTakeoverAvailable + - type: Clumsy + clumsyDamage: + types: + Blunt: 5 + Piercing: 4 + groups: + Burn: 3 + clumsySound: + path: /Audio/Animals/monkey_scream.ogg - type: entity name: guidebook monkey -- 2.51.2