diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs index b01d474131..7d4b749746 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs @@ -68,11 +68,13 @@ public sealed partial class PuddleSystem puddleSolution.SplitSolutionWithOnly(reagentTick, evaporatingReagent); } + //CP14 force evaporation under sky if (evaporation.CP14ForceEvaporation) { var reagentTick = evaporation.EvaporationAmount * EvaporationCooldown.TotalSeconds; puddleSolution.SplitSolution(reagentTick); } + //CP14 force evaporation under sky end // Despawn if we're done if (puddleSolution.Volume == FixedPoint2.Zero) diff --git a/Content.Server/_CP14/LockKey/CP14KeyholeGenerationSystem.cs b/Content.Server/_CP14/LockKey/CP14KeyholeGenerationSystem.cs index 77362bcf07..6241e3ab06 100644 --- a/Content.Server/_CP14/LockKey/CP14KeyholeGenerationSystem.cs +++ b/Content.Server/_CP14/LockKey/CP14KeyholeGenerationSystem.cs @@ -3,6 +3,7 @@ using Content.Server.Labels; using Content.Shared._CP14.LockKey; using Content.Shared._CP14.LockKey.Components; using Content.Shared.GameTicking; +using Content.Shared.Labels.EntitySystems; using Robust.Shared.Prototypes; using Robust.Shared.Random; diff --git a/Content.Server/_CP14/MagicSpell/CP14MagicSystem.cs b/Content.Server/_CP14/MagicSpell/CP14MagicSystem.cs index 190e7037e1..714f8064a0 100644 --- a/Content.Server/_CP14/MagicSpell/CP14MagicSystem.cs +++ b/Content.Server/_CP14/MagicSpell/CP14MagicSystem.cs @@ -10,6 +10,7 @@ using Content.Shared._CP14.MagicSpell.Spells; using Content.Shared.Actions; using Content.Shared.CombatMode.Pacification; using Content.Shared.FixedPoint; +using Content.Shared.Instruments; using Content.Shared.Projectiles; using Content.Shared.Throwing; using Content.Shared.Weapons.Melee.Events; diff --git a/Content.Shared/Item/SharedItemSystem.cs b/Content.Shared/Item/SharedItemSystem.cs index 5e70ba9672..18a98c7a0c 100644 --- a/Content.Shared/Item/SharedItemSystem.cs +++ b/Content.Shared/Item/SharedItemSystem.cs @@ -73,15 +73,6 @@ public abstract class SharedItemSystem : EntitySystem Dirty(uid, component); } - public void SetStoredOffset(EntityUid uid, Vector2i newOffset, ItemComponent? component = null) - { - if (!Resolve(uid, ref component, false)) - return; - - component.StoredOffset = newOffset; - Dirty(uid, component); - } - public void SetHeldPrefix(EntityUid uid, string? heldPrefix, bool force = false, ItemComponent? component = null) { if (!Resolve(uid, ref component, false)) diff --git a/Content.Shared/Labels/EntitySystems/LabelSystem.cs b/Content.Shared/Labels/EntitySystems/LabelSystem.cs index 569acc7bca..55a06fcab6 100644 --- a/Content.Shared/Labels/EntitySystems/LabelSystem.cs +++ b/Content.Shared/Labels/EntitySystems/LabelSystem.cs @@ -56,6 +56,15 @@ public sealed partial class LabelSystem : EntitySystem label.CurrentLabel = text; _nameModifier.RefreshNameModifiers(uid); + //CP14 Events + var ev = new CP14LabeledEvent() + { + LabeledEntity = uid, + Text = text, + }; + RaiseLocalEvent(uid, ev); + //CP14 Events end + Dirty(uid, label); } @@ -142,3 +151,10 @@ public sealed partial class LabelSystem : EntitySystem _appearance.SetData(ent, PaperLabelVisuals.LabelType, type.PaperType, ent.Comp2); } } + +//CP14 Labeling Event +public sealed class CP14LabeledEvent : EntityEventArgs +{ + public EntityUid? LabeledEntity; + public string? Text; +} diff --git a/Content.Shared/_CP14/ModularCraft/CP14SharedModularCraftSystem.cs b/Content.Shared/_CP14/ModularCraft/CP14SharedModularCraftSystem.cs index 93cd96c177..5e537938f0 100644 --- a/Content.Shared/_CP14/ModularCraft/CP14SharedModularCraftSystem.cs +++ b/Content.Shared/_CP14/ModularCraft/CP14SharedModularCraftSystem.cs @@ -10,7 +10,7 @@ namespace Content.Shared._CP14.ModularCraft; public abstract class CP14SharedModularCraftSystem : EntitySystem { [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedLabelSystem _label = default!; + [Dependency] private readonly LabelSystem _label = default!; [Dependency] private readonly MetaDataSystem _meta = default!; public override void Initialize()