Skip to content

Commit

Permalink
Engine update 215.2.0 (#394)
Browse files Browse the repository at this point in the history
# 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.
  • Loading branch information
VMSolidus authored May 10, 2024
1 parent 0a40e42 commit 133b249
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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"),
Expand Down Expand Up @@ -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(
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Content.Server/Nyanotrasen/Mail/MailCommands.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ 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;

_mailSystem.SetupMail(mailUid, teleporterComponent, recipient.Value);

var teleporterQueue = _containerSystem.EnsureContainer<Container>(teleporterComponent.Owner, "queued");
teleporterQueue.Insert(mailUid);
_containerSystem.Insert(mailUid, teleporterQueue);
shell.WriteLine(Loc.GetString("command-mailto-success", ("timeToTeleport", teleporterComponent.TeleportInterval.TotalSeconds - teleporterComponent.Accumulator)));
}
}
Expand Down
2 changes: 1 addition & 1 deletion Content.Server/Nyanotrasen/Mail/MailSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion RobustToolbox
Submodule RobustToolbox updated 135 files

0 comments on commit 133b249

Please sign in to comment.