Rename DetachHands to AttachToGridOrMap (#1436)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
This commit is contained in:
@@ -326,8 +326,8 @@ namespace Content.Server.GameObjects.Components.Buckle
|
||||
|
||||
if (Owner.Transform.Parent == BuckledTo.Owner.Transform)
|
||||
{
|
||||
ContainerHelpers.AttachParentToContainerOrGrid(Owner.Transform);
|
||||
Owner.Transform.WorldRotation = BuckledTo.Owner.Transform.WorldRotation;
|
||||
Owner.Transform.DetachParent();
|
||||
}
|
||||
|
||||
BuckledTo = null;
|
||||
|
||||
@@ -204,7 +204,7 @@ namespace Content.Server.GameObjects.Components.Movement
|
||||
// Departure
|
||||
// Do we need to rate-limit sounds to stop ear BLAST?
|
||||
soundPlayer.PlayAtCoords(_departureSound, entity.Transform.GridPosition);
|
||||
entity.Transform.DetachParent();
|
||||
entity.Transform.AttachToGridOrMap();
|
||||
entity.Transform.GridPosition = position;
|
||||
soundPlayer.PlayAtCoords(_arrivalSound, entity.Transform.GridPosition);
|
||||
TryChangeState(PortalState.RecentlyTeleported);
|
||||
|
||||
@@ -251,7 +251,7 @@ namespace Content.Server.GameObjects.Components.Movement
|
||||
soundPlayer.PlayAtCoords(_departureSound, user.Transform.GridPosition);
|
||||
|
||||
// Arrival
|
||||
user.Transform.DetachParent();
|
||||
user.Transform.AttachToGridOrMap();
|
||||
user.Transform.WorldPosition = vector;
|
||||
soundPlayer.PlayAtCoords(_arrivalSound, user.Transform.GridPosition);
|
||||
}
|
||||
|
||||
Submodule RobustToolbox updated: 40a8dae236...a3d250a5c4
Reference in New Issue
Block a user