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

quick fixes

Browse Source
This commit is contained in:
EnefFlow
2024-01-27 16:02:34 +03:00
committed by Aviu00
parent 2e8ce99380
commit 63c354eadb
24 changed files with 75 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Content.Server/_White/Cult/HolyWater/HolyWaterSystem.cs
View File

@@ -4,6 +4,7 @@ using Content.Shared.Chemistry.Components.SolutionManager;
using Content.Shared.Interaction;
using Content.Shared.Mobs.Components;
using Content.Shared.Popups;
using Robust.Server.Audio;
using Robust.Server.GameObjects;
namespace Content.Server.White.Cult.HolyWater;
@@ -29,25 +30,29 @@ public sealed class HolyWaterSystem : EntitySystem
if (!TryComp<SolutionContainerManagerComponent>(args.Target, out var container))
return;
foreach (var solution in container.Solutions.Values.Where(solution => solution.ContainsReagent(component.ConvertedId, null)))
if (container.Solutions != null)
{
foreach (var reagent in solution.Contents)
foreach (var solution in container.Solutions.Values.Where(solution =>
solution.ContainsReagent(component.ConvertedId, null)))
{
if (reagent.Reagent.Prototype != component.ConvertedId)
continue;
foreach (var reagent in solution.Contents)
{
if (reagent.Reagent.Prototype != component.ConvertedId)
continue;
var amount = reagent.Quantity;
var amount = reagent.Quantity;
solution.RemoveReagent(reagent.Reagent.Prototype, reagent.Quantity);
solution.AddReagent(component.ConvertedToId, amount);
solution.RemoveReagent(reagent.Reagent.Prototype, reagent.Quantity);
solution.AddReagent(component.ConvertedToId, amount);
if (args.Target == null)
return;
_popup.PopupEntity(Loc.GetString("holy-water-converted"), args.Target.Value, args.User);
_audio.PlayPvs("/Audio/Effects/holy.ogg", args.Target.Value);
if (args.Target == null)
return;
_popup.PopupEntity(Loc.GetString("holy-water-converted"), args.Target.Value, args.User);
_audio.PlayPvs("/Audio/Effects/holy.ogg", args.Target.Value);
return;
}
}
}
}