From 133b2494eec8d0004e54d1bc81c30e766d963492 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Thu, 9 May 2024 21:39:40 -0400 Subject: [PATCH] Engine update 215.2.0 (#394) # Description This updates us to the current version of Robust Toolbox, while also fixing everyone's favorite maintainer burden system, the deep fryer. Which to absolutely nobody's surprise got broken by an engine update again. One of these days I should take a metaphorical hacksaw to the deep fryer code. --- .../Kitchen/EntitySystems/DeepFryerSystem.cs | 10 ++++------ Content.Server/Nyanotrasen/Mail/MailCommands.cs | 4 ++-- Content.Server/Nyanotrasen/Mail/MailSystem.cs | 2 +- RobustToolbox | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs index 69cf6a99391..aa6de572cee 100644 --- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs +++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs @@ -17,7 +17,6 @@ using Content.Server.Power.EntitySystems; using Content.Server.Temperature.Components; using Content.Server.Temperature.Systems; -using Content.Server.UserInterface; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.EntitySystems; @@ -44,7 +43,6 @@ using Content.Shared.Popups; using Content.Shared.Throwing; using Content.Shared.UserInterface; -using FastAccessors; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; @@ -242,7 +240,7 @@ private void BurnItem(EntityUid uid, DeepFryerComponent component, EntityUid ite MetaData(item).EntityPrototype?.ID != component.CharredPrototype) { var charred = Spawn(component.CharredPrototype, Transform(uid).Coordinates); - component.Storage.Insert(charred); + _containerSystem.Insert(charred, component.Storage); Del(item); } } @@ -453,7 +451,7 @@ private void OnThrowHitBy(EntityUid uid, DeepFryerComponent component, ThrowHitB if (!CanInsertItem(uid, component, args.Thrown) || _random.Prob(missChance) || - !component.Storage.Insert(args.Thrown)) + !_containerSystem.Insert(args.Thrown, component.Storage)) { _popupSystem.PopupEntity( Loc.GetString("deep-fryer-thrown-missed"), @@ -501,7 +499,7 @@ private void OnSolutionChange(EntityUid uid, DeepFryerComponent component, Solut private void OnRelayMovement(EntityUid uid, DeepFryerComponent component, ref ContainerRelayMovementEntityEvent args) { - if (!component.Storage.Remove(args.Entity, EntityManager, destination: Transform(uid).Coordinates)) + if (!_containerSystem.Remove(args.Entity, component.Storage, destination: Transform(uid).Coordinates)) return; _popupSystem.PopupEntity( @@ -524,7 +522,7 @@ private void OnRemoveItem(EntityUid uid, DeepFryerComponent component, DeepFryer if (removedItem.Valid) { //JJ Comment - This line should be unnecessary. Some issue is keeping the UI from updating when converting straight to a Burned Mess while the UI is still open. To replicate, put a Raw Meat in the fryer with no oil in it. Wait until it sputters with no effect. It should transform to Burned Mess, but doesn't. - if (!component.Storage.Remove(removedItem)) + if (!_containerSystem.Remove(removedItem, component.Storage)) return; var user = args.Session.AttachedEntity; 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/Nyanotrasen/Mail/MailSystem.cs b/Content.Server/Nyanotrasen/Mail/MailSystem.cs index 915f7399b0d..19f9b3e7b5e 100644 --- a/Content.Server/Nyanotrasen/Mail/MailSystem.cs +++ b/Content.Server/Nyanotrasen/Mail/MailSystem.cs @@ -445,7 +445,7 @@ public void SetupMail(EntityUid uid, MailTeleporterComponent component, MailReci foreach (var item in EntitySpawnCollection.GetSpawns(mailComp.Contents, _random)) { var entity = EntityManager.SpawnEntity(item, Transform(uid).Coordinates); - if (!container.Insert(entity)) + if (!_containerSystem.Insert(entity, container)) { _sawmill.Error($"Can't insert {ToPrettyString(entity)} into new mail delivery {ToPrettyString(uid)}! Deleting it."); QueueDel(entity); diff --git a/RobustToolbox b/RobustToolbox index d8b7bb528d3..25bbb21dc86 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit d8b7bb528d3b0a8b85cd46c01cb509fed8252ec4 +Subproject commit 25bbb21dc868b4e0b43b6d28e899710891b35868