Give monkeys clumsy (#16320)

diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index 72a85776ed73715b5aa483690d7103ff12f48a88..995c1ffbc6b4938e4168356aa0156aef183f09ab 100644 (file)
--- 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 6938187f46cdd1db0918adabb39e92c295aee0de..2acbdeaf68d82adbb3a91ca9ba7a053509b8eb94 100644 (file)
--- 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!;
+
+        /// <summary>
+        ///     Sound to play when clumsy interactions fail
+        /// </summary>
+        [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 d2d3f14b73a6c7df666aed7f4ce56442a0b1c284..0fe5bca505047e4dc8d766fb182630bae0f1eb42 100644 (file)
--- 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