tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Give monkeys clumsy (#16320)

Browse Source
This commit is contained in:
Kara
2023-05-10 17:27:47 -07:00
committed by GitHub
parent 20d96b58f7
commit ab6707aef6
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Weapons/Ranged/Systems/GunSystem.cs
View File

@@ -83,7 +83,7 @@ public sealed partial class GunSystem : SharedGunSystem
// Apply salt to the wound ("Honk!") // Apply salt to the wound ("Honk!")
Audio.PlayPvs(new SoundPathSpecifier("/Audio/Weapons/Guns/Gunshots/bang.ogg"), gunUid); 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); PopupSystem.PopupEntity(Loc.GetString("gun-clumsy"), user.Value);
_adminLogger.Add(LogType.EntityDelete, LogImpact.Medium, $"Clumsy fire by {ToPrettyString(user.Value)} deleted {ToPrettyString(gunUid)}"); _adminLogger.Add(LogType.EntityDelete, LogImpact.Medium, $"Clumsy fire by {ToPrettyString(user.Value)} deleted {ToPrettyString(gunUid)}");

7
Content.Shared/Interaction/Components/ClumsyComponent.cs
View File

@@ -1,4 +1,5 @@
using Content.Shared.Damage; using Content.Shared.Damage;
using Robust.Shared.Audio;
namespace Content.Shared.Interaction.Components namespace Content.Shared.Interaction.Components
{ {
@@ -11,5 +12,11 @@ namespace Content.Shared.Interaction.Components
[DataField("clumsyDamage", required: true)] [DataField("clumsyDamage", required: true)]
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public DamageSpecifier ClumsyDamage = default!; public DamageSpecifier ClumsyDamage = default!;
/// <summary>
/// Sound to play when clumsy interactions fail
/// </summary>
[DataField("clumsySound")]
public SoundSpecifier ClumsySound = new SoundPathSpecifier("/Audio/Items/bikehorn.ogg");
} }
} }

9
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
View File

@@ -806,6 +806,15 @@
name: ghost-role-information-monkey-name name: ghost-role-information-monkey-name
description: ghost-role-information-monkey-description description: ghost-role-information-monkey-description
- type: GhostTakeoverAvailable - type: GhostTakeoverAvailable
- type: Clumsy
clumsyDamage:
types:
Blunt: 5
Piercing: 4
groups:
Burn: 3
clumsySound:
path: /Audio/Animals/monkey_scream.ogg
- type: entity - type: entity
name: guidebook monkey name: guidebook monkey