tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix chat bubbles (#25643)" (#25645)

Browse Source 
* Revert "Fix chat bubbles (#25643)"

This reverts commit 23d2c4d924.

* Revert "Fixes obsolete Transform warnings in Content. (#25256)"

This reverts commit f284b43ff6.
This commit is contained in:
metalgearsloth
2024-02-28 00:51:20 +11:00
committed by GitHub
parent d204896bf5
commit a9502be29e
154 changed files with 435 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Nutrition/EntitySystems/FoodSystem.cs
View File

@@ -54,7 +54,6 @@ public sealed class FoodSystem : EntitySystem
[Dependency] private readonly StackSystem _stack = default!;
[Dependency] private readonly StomachSystem _stomach = default!;
[Dependency] private readonly UtensilSystem _utensil = default!;
[Dependency] private readonly SharedTransformSystem _xformSystem = default!;
public const float MaxFeedDistance = 1.0f;
@@ -150,7 +149,7 @@ public sealed class FoodSystem : EntitySystem
return (false, true);
// TODO make do-afters account for fixtures in the range check.
if (!_xformSystem.GetMapCoordinates(user).InRange(_xformSystem.GetMapCoordinates(target), MaxFeedDistance))
if (!Transform(user).MapPosition.InRange(Transform(target).MapPosition, MaxFeedDistance))
{
var message = Loc.GetString("interaction-system-user-interaction-cannot-reach");
_popup.PopupEntity(message, user, user);
@@ -326,7 +325,7 @@ public sealed class FoodSystem : EntitySystem
}
//We're empty. Become trash.
var position = _xformSystem.GetMapCoordinates(food);
var position = Transform(food).MapPosition;
var finisher = Spawn(component.Trash, position);
// If the user is holding the item