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

Enable nullability in Content.Server (#3685)

Browse Source
This commit is contained in:
DrSmugleaf
2021-03-16 15:50:20 +01:00
committed by GitHub
parent 90fec0ed24
commit a5ade526b7
306 changed files with 1616 additions and 1441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs
View File

@@ -31,7 +31,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
public override string Name => "Food";
[ViewVariables] [DataField("useSound")] protected virtual string UseSound { get; set; } = "/Audio/Items/eatfood.ogg";
[ViewVariables] [DataField("useSound")] protected virtual string? UseSound { get; set; } = "/Audio/Items/eatfood.ogg";
[ViewVariables] [DataField("trash")] protected virtual string? TrashPrototype { get; set; }
@@ -161,8 +161,12 @@ namespace Content.Server.GameObjects.Components.Nutrition
firstStomach.TryTransferSolution(split);
_entitySystem.GetEntitySystem<AudioSystem>()
.PlayFromEntity(UseSound, trueTarget, AudioParams.Default.WithVolume(-1f));
if (UseSound != null)
{
_entitySystem.GetEntitySystem<AudioSystem>()
.PlayFromEntity(UseSound, trueTarget, AudioParams.Default.WithVolume(-1f));
}
trueTarget.PopupMessage(user, Loc.GetString("Nom"));
// If utensils were used