diff --git a/Content.Client/Clickable/ClickableComponent.cs b/Content.Client/Clickable/ClickableComponent.cs index 56d562bd13..3a1f9be44f 100644 --- a/Content.Client/Clickable/ClickableComponent.cs +++ b/Content.Client/Clickable/ClickableComponent.cs @@ -35,7 +35,7 @@ namespace Content.Client.Clickable renderOrder = sprite.RenderOrder; var (spritePos, spriteRot) = transform.GetWorldPositionRotation(xformQuery); var spriteBB = sprite.CalculateRotatedBoundingBox(spritePos, spriteRot, eye.Rotation); - bottom = spriteBB.CalcBoundingBox().Bottom; + bottom = Matrix3.CreateRotation(eye.Rotation).TransformBox(spriteBB).Bottom; var invSpriteMatrix = Matrix3.Invert(sprite.GetLocalMatrix()); diff --git a/Content.Client/Gameplay/GameplayStateBase.cs b/Content.Client/Gameplay/GameplayStateBase.cs index e1ca614f91..555cde1a57 100644 --- a/Content.Client/Gameplay/GameplayStateBase.cs +++ b/Content.Client/Gameplay/GameplayStateBase.cs @@ -136,7 +136,7 @@ namespace Content.Client.Gameplay return cmp; } - cmp = y.bottom.CompareTo(x.bottom); + cmp = -y.bottom.CompareTo(x.bottom); if (cmp != 0) { diff --git a/Content.Server/Administration/Commands/ExplosionCommand.cs b/Content.Server/Administration/Commands/ExplosionCommand.cs index 449d534efd..9a509f7fa3 100644 --- a/Content.Server/Administration/Commands/ExplosionCommand.cs +++ b/Content.Server/Administration/Commands/ExplosionCommand.cs @@ -56,7 +56,7 @@ public sealed class ExplosionCommand : IConsoleCommand shell.WriteError($"Failed to parse intensity: {args[0]}"); return; } - + float slope = 5; if (args.Length > 1 && !float.TryParse(args[1], out slope)) { @@ -118,7 +118,7 @@ public sealed class ExplosionCommand : IConsoleCommand return; } } - else + else if (!protoMan.TryIndex(ExplosionSystem.DefaultExplosionPrototypeId, out type)) { // no prototype was specified, so lets default to whichever one was defined first type = protoMan.EnumeratePrototypes().FirstOrDefault(); diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/StationSystem.cs index 2eb8e8d54f..1828e53c6a 100644 --- a/Content.Server/Station/Systems/StationSystem.cs +++ b/Content.Server/Station/Systems/StationSystem.cs @@ -345,11 +345,10 @@ public sealed class StationSystem : EntitySystem /// The initialized station. public EntityUid InitializeNewStation(StationConfig? stationConfig, IEnumerable? gridIds, string? name = null) { - var station = Spawn(null, new MapCoordinates(0, 0, _gameTicker.DefaultMap)); + var station = Spawn(null, MapCoordinates.Nullspace); // TODO SERIALIZATION The station data needs to be saveable somehow, but when a map gets saved, this entity // won't be included because its in null-space. Also, what happens to shuttles on other maps? - _transform.DetachParentToNull(station, Transform(station)); var data = AddComp(station); var metaData = MetaData(station);