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

Admin log shuttle gibbing + Make shuttle gibbing and immovable rods drop organs and correctly put player in ghost (#27114)

Browse Source 
* Add admin log when someone gets gibbed by a shuttle

* Make shuttle gibbing work properly again

* Fix immovable rod gibbing, no longer puts you into nullspace

* Update Content.Server/ImmovableRod/ImmovableRodSystem.cs

* Update Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
no
2024-04-20 08:27:38 +02:00
committed by GitHub
parent f395c45dd2
commit 5c69031d11
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
View File

@@ -6,6 +6,7 @@ using Content.Server.Shuttles.Events;
using Content.Server.Station.Events; using Content.Server.Station.Events;
using Content.Shared.Body.Components; using Content.Shared.Body.Components;
using Content.Shared.Buckle.Components; using Content.Shared.Buckle.Components;
using Content.Shared.Database;
using Content.Shared.Ghost; using Content.Shared.Ghost;
using Content.Shared.Maps; using Content.Shared.Maps;
using Content.Shared.Parallax; using Content.Shared.Parallax;
@@ -867,6 +868,8 @@ public sealed partial class ShuttleSystem
if (_bodyQuery.TryGetComponent(ent, out var mob)) if (_bodyQuery.TryGetComponent(ent, out var mob))
{ {
_logger.Add(LogType.Gib, LogImpact.Extreme, $"{ToPrettyString(ent):player} got gibbed by the shuttle" +
$" {ToPrettyString(uid)} arriving from FTL at {xform.Coordinates:coordinates}");
var gibs = _bobby.GibBody(ent, body: mob); var gibs = _bobby.GibBody(ent, body: mob);
_immuneEnts.UnionWith(gibs); _immuneEnts.UnionWith(gibs);
continue; continue;

2
Content.Server/Shuttles/Systems/ShuttleSystem.cs
View File

@@ -1,3 +1,4 @@
using Content.Server.Administration.Logs;
using Content.Server.Body.Systems; using Content.Server.Body.Systems;
using Content.Server.Doors.Systems; using Content.Server.Doors.Systems;
using Content.Server.Parallax; using Content.Server.Parallax;
@@ -48,6 +49,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
[Dependency] private readonly ThrowingSystem _throwing = default!; [Dependency] private readonly ThrowingSystem _throwing = default!;
[Dependency] private readonly ThrusterSystem _thruster = default!; [Dependency] private readonly ThrusterSystem _thruster = default!;
[Dependency] private readonly UserInterfaceSystem _uiSystem = default!; [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
[Dependency] private readonly IAdminLogManager _logger = default!;
public const float TileMassMultiplier = 0.5f; public const float TileMassMultiplier = 0.5f;