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

Rename DetachHands to AttachToGridOrMap (#1436)

Browse Source 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
This commit is contained in:
ShadowCommander
2020-07-25 16:43:40 -07:00
committed by GitHub
parent 4b4e83d2bf
commit dbfc030c5b
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs
View File

@@ -326,8 +326,8 @@ namespace Content.Server.GameObjects.Components.Buckle
if (Owner.Transform.Parent == BuckledTo.Owner.Transform) if (Owner.Transform.Parent == BuckledTo.Owner.Transform)
{ {
ContainerHelpers.AttachParentToContainerOrGrid(Owner.Transform);
Owner.Transform.WorldRotation = BuckledTo.Owner.Transform.WorldRotation; Owner.Transform.WorldRotation = BuckledTo.Owner.Transform.WorldRotation;
Owner.Transform.DetachParent();
} }
BuckledTo = null; BuckledTo = null;

2
Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs
View File

@@ -204,7 +204,7 @@ namespace Content.Server.GameObjects.Components.Movement
// Departure // Departure
// Do we need to rate-limit sounds to stop ear BLAST? // Do we need to rate-limit sounds to stop ear BLAST?
soundPlayer.PlayAtCoords(_departureSound, entity.Transform.GridPosition); soundPlayer.PlayAtCoords(_departureSound, entity.Transform.GridPosition);
entity.Transform.DetachParent(); entity.Transform.AttachToGridOrMap();
entity.Transform.GridPosition = position; entity.Transform.GridPosition = position;
soundPlayer.PlayAtCoords(_arrivalSound, entity.Transform.GridPosition); soundPlayer.PlayAtCoords(_arrivalSound, entity.Transform.GridPosition);
TryChangeState(PortalState.RecentlyTeleported); TryChangeState(PortalState.RecentlyTeleported);

2
Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs
View File

@@ -251,7 +251,7 @@ namespace Content.Server.GameObjects.Components.Movement
soundPlayer.PlayAtCoords(_departureSound, user.Transform.GridPosition); soundPlayer.PlayAtCoords(_departureSound, user.Transform.GridPosition);
// Arrival // Arrival
user.Transform.DetachParent(); user.Transform.AttachToGridOrMap();
user.Transform.WorldPosition = vector; user.Transform.WorldPosition = vector;
soundPlayer.PlayAtCoords(_arrivalSound, user.Transform.GridPosition); soundPlayer.PlayAtCoords(_arrivalSound, user.Transform.GridPosition);
} }

2
RobustToolbox

Submodule RobustToolbox updated: 40a8dae236...a3d250a5c4