From eda7e744a3bf88495ba05d094f157e17f3721b04 Mon Sep 17 00:00:00 2001 From: Vasilis Date: Tue, 1 Aug 2023 01:15:17 +0200 Subject: [PATCH] Spilling liquids no longer exposes true identify (#18505) * mama i did it by myself! * wait how does this fix it? what??? * oops --- Content.Server/Fluids/EntitySystems/PuddleSystem.cs | 3 ++- Content.Server/Power/EntitySystems/BatterySystem.cs | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs index c88acdf6f5..fe549fc2e0 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs @@ -14,6 +14,7 @@ using Content.Shared.Popups; using Content.Shared.Slippery; using Content.Shared.Fluids.Components; using Content.Shared.Friction; +using Content.Shared.IdentityManagement; using Content.Shared.StepTrigger.Components; using Content.Shared.StepTrigger.Systems; using Robust.Server.GameObjects; @@ -511,7 +512,7 @@ public sealed partial class PuddleSystem : SharedPuddleSystem } _reactive.DoEntityReaction(owner, splitSolution, ReactionMethod.Touch); - _popups.PopupEntity(Loc.GetString("spill-land-spilled-on-other", ("spillable", uid), ("target", owner)), owner, PopupType.SmallCaution); + _popups.PopupEntity(Loc.GetString("spill-land-spilled-on-other", ("spillable", uid), ("target", Identity.Entity(owner, EntityManager))), owner, PopupType.SmallCaution); } return TrySpillAt(coordinates, solution, out puddleUid, sound); diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs index 7906682a8d..410aa30bba 100644 --- a/Content.Server/Power/EntitySystems/BatterySystem.cs +++ b/Content.Server/Power/EntitySystems/BatterySystem.cs @@ -11,7 +11,6 @@ namespace Content.Server.Power.EntitySystems [UsedImplicitly] public sealed class BatterySystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _sharedAppearanceSystem = default!; public override void Initialize() { base.Initialize();