juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace AttachToGridOrMap with DropNextTo (#27950)

Browse Source
This commit is contained in:
ShadowCommander
2024-05-12 07:30:17 -07:00
committed by GitHub
parent 1596e04d0f
commit 8938e1d8b2
3 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
View File

@@ -110,15 +110,8 @@ namespace Content.Server.Nutrition.EntitySystems
// try putting the slice into the container if the food being sliced is in a container!
// this lets you do things like slice a pizza up inside of a hot food cart without making a food-everywhere mess
if (_containerSystem.TryGetContainingContainer(uid, out var container) && _containerSystem.CanInsert(sliceUid, container))
{
_containerSystem.Insert(sliceUid, container);
}
else // puts it down "right-side up"
{
_xformSystem.AttachToGridOrMap(sliceUid);
_xformSystem.SetLocalRotation(sliceUid, 0);
}
_xformSystem.DropNextTo(sliceUid, (uid, transform));
_xformSystem.SetLocalRotation(sliceUid, 0);
return sliceUid;
}
@@ -143,15 +136,8 @@ namespace Content.Server.Nutrition.EntitySystems
var trashUid = Spawn(foodComp.Trash, _xformSystem.GetMapCoordinates(uid));
// try putting the trash in the food's container too, to be consistent with slice spawning?
if (_containerSystem.TryGetContainingContainer(uid, out var container) && _containerSystem.CanInsert(trashUid, container))
{
_containerSystem.Insert(trashUid, container);
}
else // puts it down "right-side up"
{
_xformSystem.AttachToGridOrMap(trashUid);
_xformSystem.SetLocalRotation(trashUid, 0);
}
_xformSystem.DropNextTo(trashUid, uid);
_xformSystem.SetLocalRotation(trashUid, 0);
QueueDel(uid);
}