juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync

Browse Source 
# Conflicts:
#	Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
This commit is contained in:
Ed
2025-04-15 00:44:29 +03:00
parent 52f31e4403 961d2cfdef
commit 5420469d62
463 changed files with 17534 additions and 10124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,6 +72,8 @@ namespace Content.Server.Ghost
private EntityQuery<GhostComponent> _ghostQuery;
private EntityQuery<PhysicsComponent> _physicsQuery;
private static readonly ProtoId<TagPrototype> AllowGhostShownByEventTag = "AllowGhostShownByEvent";
public override void Initialize()
{
base.Initialize();
@@ -408,7 +410,7 @@ namespace Content.Server.Ghost
var entityQuery = EntityQueryEnumerator<GhostComponent, VisibilityComponent>();
while (entityQuery.MoveNext(out var uid, out var _, out var vis))
{
if (!_tag.HasTag(uid, "AllowGhostShownByEvent"))
if (!_tag.HasTag(uid, AllowGhostShownByEventTag))
continue;
if (visible)