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

Eshe fixes (#388)

Browse Source 
* fix: antags must be alive

* fix: fix flare gun

* fix: fix rd suit size

* remove govnovoz
This commit is contained in:
ThereDrD0
2024-06-27 21:29:16 +03:00
committed by GitHub
parent 7048913336
commit 804ea205d6
5 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Ghost/GhostSystem.cs
View File

@@ -38,6 +38,7 @@ using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Systems;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Manager.Exceptions;
using Robust.Shared.Timing;
using InvisibilityComponent = Content.Shared._White.Administration.InvisibilityComponent;
@@ -455,8 +456,10 @@ namespace Content.Server.Ghost
{
var entity = mindContainer.Owner;
if (!(HasComp<HumanoidAppearanceComponent>(entity) || HasComp<GhostComponent>(entity)) ||
HasComp<GlobalAntagonistComponent>(entity))
if (!(HasComp<HumanoidAppearanceComponent>(entity) || HasComp<GhostComponent>(entity)))
continue;
if (HasComp<GlobalAntagonistComponent>(entity))
continue;
var playerDepartmentId = _prototypeManager.Index<DepartmentPrototype>("Specific").ID;
@@ -503,9 +506,12 @@ namespace Content.Server.Ghost
foreach (var antagonist in EntityQuery<GlobalAntagonistComponent>())
{
var entity = antagonist.Owner;
if (!_mobState.IsAlive(entity))
continue;
var prototype =
_prototypeManager.Index<AntagonistPrototype>(antagonist.AntagonistPrototype ??
"globalAntagonistUnknown");
_prototypeManager.Index<AntagonistPrototype>(antagonist.AntagonistPrototype ?? "globalAntagonistUnknown");
var warp = new GhostWarpGlobalAntagonist(
GetNetEntity(entity),