diff --git a/Content.Server/DeltaV/Implants/SubdermalBionicSyrinxImplantSystem.cs b/Content.Server/DeltaV/Implants/SubdermalBionicSyrinxImplantSystem.cs index 60ec363ac2e..799a32b3d33 100644 --- a/Content.Server/DeltaV/Implants/SubdermalBionicSyrinxImplantSystem.cs +++ b/Content.Server/DeltaV/Implants/SubdermalBionicSyrinxImplantSystem.cs @@ -100,7 +100,7 @@ private void UpdateUI(EntityUid owner, SyrinxVoiceMaskComponent? component = nul return; if (_uiSystem.TryGetUi(owner, VoiceMaskUIKey.Key, out var bui)) - _uiSystem.SetUiState(bui, new VoiceMaskBuiState(component.VoiceName)); + _uiSystem.SetUiState(bui, new VoiceMaskBuiState(component.VoiceName, null)); } /// diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs index b7e7143988f..a22fbc26615 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs @@ -401,8 +401,6 @@ public void QueueExplosion(MapCoordinates epicenter, if (HasComp(gridUid) || ev.Cancelled) return null; - var visualEnt = CreateExplosionVisualEntity(epicenter, type.ID, spaceMatrix, spaceData, gridData.Values, iterationIntensity); - return new Explosion(this, queued.Proto, spaceData, diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs index bd33da45928..7b5c1a5a0c5 100644 --- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs +++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs @@ -88,7 +88,7 @@ public sealed partial class DeepFryerSystem : SharedDeepfryerSystem private static readonly string MobFlavorMeat = "meaty"; private static readonly AudioParams - AudioParamsInsertRemove = new(0.5f, 1f, "Master", 5f, 1.5f, 1f, false, 0f, 0.2f); + AudioParamsInsertRemove = new(0.5f, 1f, 5f, 1.5f, 1f, false, 0f, 0.2f); private ISawmill _sawmill = default!; @@ -634,8 +634,7 @@ private void OnClearSlagStart(EntityUid uid, DeepFryerComponent component, DeepF var doAfterArgs = new DoAfterArgs(EntityManager, user.Value, delay, ev, uid, uid, heldItem) { BreakOnDamage = true, - BreakOnTargetMove = true, - BreakOnUserMove = true, + BreakOnMove = true, MovementThreshold = 0.25f, NeedHand = true }; diff --git a/Content.Server/Nyanotrasen/Mail/MailCommands.cs b/Content.Server/Nyanotrasen/Mail/MailCommands.cs index fba8e4b6145..5af873f9e80 100644 --- a/Content.Server/Nyanotrasen/Mail/MailCommands.cs +++ b/Content.Server/Nyanotrasen/Mail/MailCommands.cs @@ -100,7 +100,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args) } foreach (var entity in targetContainer.ContainedEntities.ToArray()) - mailContents.Insert(entity); + _containerSystem.Insert(entity, mailContents); mailComponent.IsFragile = isFragile; mailComponent.IsPriority = isPriority; @@ -108,7 +108,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args) _mailSystem.SetupMail(mailUid, teleporterComponent, recipient.Value); var teleporterQueue = _containerSystem.EnsureContainer(teleporterComponent.Owner, "queued"); - teleporterQueue.Insert(mailUid); + _containerSystem.Insert(mailUid, teleporterQueue); shell.WriteLine(Loc.GetString("command-mailto-success", ("timeToTeleport", teleporterComponent.TeleportInterval.TotalSeconds - teleporterComponent.Accumulator))); } } diff --git a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs index 50e34a09b60..1d0f5a1f22a 100644 --- a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs +++ b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs @@ -69,7 +69,7 @@ private void OnSalvageClaimMessage(EntityUid uid, SalvageExpeditionConsoleCompon _labelSystem.Label(cdUid, GetFTLName(_prototypeManager.Index("names_borer"), missionparams.Seed)); _audio.PlayPvs(component.PrintSound, uid); - UpdateConsoles((station.Value, data)); + UpdateConsoles(data); } private void OnSalvageConsoleInit(Entity console, ref ComponentInit args) diff --git a/Content.Server/Salvage/SalvageSystem.Runner.cs b/Content.Server/Salvage/SalvageSystem.Runner.cs index e1bb2df32bb..15d6f21091b 100644 --- a/Content.Server/Salvage/SalvageSystem.Runner.cs +++ b/Content.Server/Salvage/SalvageSystem.Runner.cs @@ -7,6 +7,7 @@ using Content.Server.Shuttles.Systems; using Content.Server.Station.Components; using Content.Shared.Chat; +using Content.Shared.Coordinates; using Content.Shared.Humanoid; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; @@ -208,7 +209,7 @@ private void UpdateRunner() var location = Spawn(null, coords); var despawn = EnsureComp(location); despawn.Lifetime = 600; - _shuttle.FTLTravel(shuttleUid, shuttle, location, ftlTime); + _shuttle.FTLToCoordinates(shuttleUid, shuttle, location.ToCoordinates(), ftlTime); } break; diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.cs index b9f49e2fe1e..e57341e7b80 100644 --- a/Content.Server/Shipyard/Systems/ShipyardSystem.cs +++ b/Content.Server/Shipyard/Systems/ShipyardSystem.cs @@ -14,6 +14,7 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Numerics; +using Content.Shared.Coordinates; using Content.Shared.Shipyard.Events; using Content.Shared.Mobs.Components; using Robust.Shared.Containers; @@ -114,7 +115,7 @@ public bool TryPurchaseShuttle(EntityUid stationUid, string shuttlePath, [NotNul _sawmill.Info($"Shuttle {shuttlePath} was purchased at {ToPrettyString((EntityUid) stationUid)} for {price:f2}"); //can do TryFTLDock later instead if we need to keep the shipyard map paused - _shuttle.FTLTravel(shuttleGrid.Value, shuttle, targetGrid.Value, 0f, 15f, true); + _shuttle.FTLToCoordinates(shuttleGrid.Value, shuttle, targetGrid.Value.ToCoordinates(), 0f, 15f); return true; } diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index d7a1a9d395a..d7fd610cfba 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -144,16 +144,6 @@ private void OnBoundUIOpened(EntityUid uid, VendingMachineComponent component, B UpdateVendingMachineInterfaceState(uid, component, balance); } - private void OnBoundUIClosed(EntityUid uid, VendingMachineComponent component, BoundUIClosedEvent args) - { - // Only vendors that advertise will send message after dispensing - if (component.ShouldSayThankYou && TryComp(uid, out var advertise)) - { - _advertise.SayThankYou(uid, advertise); - component.ShouldSayThankYou = false; - } - } - private void UpdateVendingMachineInterfaceState(EntityUid uid, VendingMachineComponent component, int balance) { var state = new VendingMachineInterfaceState(GetAllInventory(uid, component), balance);