From 7afce78ff539634959eccd13043b682cd4a71ada Mon Sep 17 00:00:00 2001 From: nikthechampiongr Date: Mon, 25 Mar 2024 17:58:21 +0200 Subject: [PATCH] Actually make the defaults sane which I forgor in the last commit --- Content.Server/Implants/SubdermalImplantSystem.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs index 9c2f180692d5af..db94edccb456cf 100644 --- a/Content.Server/Implants/SubdermalImplantSystem.cs +++ b/Content.Server/Implants/SubdermalImplantSystem.cs @@ -115,7 +115,7 @@ private void OnScramImplant(EntityUid uid, SubdermalImplantComponent component, var grids = _lookupSystem.GetEntitiesInRange(entityCoords, implant.TeleportRadius).ToList(); _random.Shuffle(grids); - var targetCoords = entityCoords; // If we somehow fail to find a suitable tile then we essentially we just don't teleport. + MapCoordinates? targetCoords = null; foreach (var grid in grids) { @@ -161,11 +161,13 @@ private void OnScramImplant(EntityUid uid, SubdermalImplantComponent component, break; } - _xform.SetWorldPosition(ent, targetCoords.Position); - _xform.AttachToGridOrMap(ent, xform); - _audio.PlayPvs(implant.TeleportSound, ent); - - args.Handled = true; + if (targetCoords != null) + { + _xform.SetWorldPosition(ent, targetCoords.Value.Position); + _xform.AttachToGridOrMap(ent, xform); + _audio.PlayPvs(implant.TeleportSound, ent); + args.Handled = true; + } } private void OnDnaScramblerImplant(EntityUid uid, SubdermalImplantComponent component, UseDnaScramblerImplantEvent args)