Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "Update submodule to 172.0.0 (#21222)" (#21225)

Browse Source
This commit is contained in:
metalgearsloth
2023-10-24 21:55:20 +11:00
committed by GitHub
parent 517aea8bc3
commit a2bbda43cc
249 changed files with 1049 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Body/Commands/AddHandCommand.cs
View File

@@ -4,6 +4,7 @@ using Content.Server.Body.Systems;
using Content.Shared.Administration;
using Content.Shared.Body.Components;
using Content.Shared.Body.Part;
using Robust.Server.Player;
using Robust.Shared.Console;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
@@ -26,7 +27,7 @@ namespace Content.Server.Body.Commands
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var player = shell.Player;
var player = shell.Player as IPlayerSession;
EntityUid entity;
EntityUid hand;

4
Content.Server/Body/Commands/AttachBodyPartCommand.cs
View File

@@ -1,8 +1,10 @@
using System.Linq;
using Content.Server.Administration;
using Content.Server.Body.Systems;
using Content.Shared.Administration;
using Content.Shared.Body.Components;
using Content.Shared.Body.Part;
using Robust.Server.Player;
using Robust.Shared.Console;
namespace Content.Server.Body.Commands
@@ -18,7 +20,7 @@ namespace Content.Server.Body.Commands
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var player = shell.Player;
var player = shell.Player as IPlayerSession;
EntityUid bodyId;
EntityUid? partUid;

3
Content.Server/Body/Commands/DestroyMechanismCommand.cs
View File

@@ -2,6 +2,7 @@ using Content.Server.Administration;
using Content.Server.Body.Systems;
using Content.Shared.Administration;
using Content.Shared.Body.Components;
using Robust.Server.Player;
using Robust.Shared.Console;
using Robust.Shared.Random;
@@ -16,7 +17,7 @@ namespace Content.Server.Body.Commands
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var player = shell.Player;
var player = shell.Player as IPlayerSession;
if (player == null)
{
shell.WriteLine("Only a player can run this command.");

3
Content.Server/Body/Commands/RemoveHandCommand.cs
View File

@@ -4,6 +4,7 @@ using Content.Server.Body.Systems;
using Content.Shared.Administration;
using Content.Shared.Body.Components;
using Content.Shared.Body.Part;
using Robust.Server.Player;
using Robust.Shared.Console;
using Robust.Shared.Random;
@@ -21,7 +22,7 @@ namespace Content.Server.Body.Commands
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var player = shell.Player;
var player = shell.Player as IPlayerSession;
if (player == null)
{
shell.WriteLine("Only a player can run this command.");

2
Content.Server/Body/Systems/BodySystem.cs
View File

@@ -116,7 +116,7 @@ public sealed class BodySystem : SharedBodySystem
if (!Resolve(bodyId, ref body, false))
return new HashSet<EntityUid>();
if (TerminatingOrDeleted(bodyId) || EntityManager.IsQueuedForDeletion(bodyId))
if (LifeStage(bodyId) >= EntityLifeStage.Terminating || EntityManager.IsQueuedForDeletion(bodyId))
return new HashSet<EntityUid>();
var xform = Transform(bodyId);