Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into weapon-modules

Browse Source
This commit is contained in:
CaYpeN1
2024-03-22 19:40:53 +05:00
parent 3dbd027b52 1337e4d26e
commit 60492620af
86 changed files with 1752643 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/_White/Felinid/FelinidComponent.cs
View File

@@ -1,3 +1,4 @@
using Robust.Shared.Audio;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.Prototypes;
@@ -12,6 +13,9 @@ namespace Content.Server.Abilities.Felinid
[DataField("hairballPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
public string HairballPrototype = "Hairball";
[DataField]
public SoundSpecifier MouseEatingSound = new SoundCollectionSpecifier("eating");
public EntityUid? HairballAction;
public EntityUid? EatMouseAction;

2
Content.Server/_White/Felinid/FelinidSystem.cs
View File

@@ -137,7 +137,7 @@ namespace Content.Server.Abilities.Felinid
Del(component.PotentialTarget.Value);
component.PotentialTarget = null;
_audio.PlayPvs("/Audio/Items/eatfood.ogg", uid, AudioParams.Default.WithVariation(0.15f));
_audio.PlayPvs(component.MouseEatingSound, uid, AudioParams.Default.WithVariation(0.15f));
_hungerSystem.ModifyHunger(uid, 70f, hunger);