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

Багфиксы и всякое (#47)

Browse Source 
* - tweak: Tweak CPR speed.

* - fix: Cult action fix.

* Revert "Put entity resetting behind command flag (#24436)"

This reverts commit 5267d3c601.

* - fix: Mindshield fixes.

* - tweak: Give security security glasses.

* - fix: Fix warning.

* - fix: Fix ling TTS.

* - fix: Fix gun cycle.

* - fix: Mark cultist and lings as antags.

* - fix: Fix borg name.

* - fix: Fix carrying throw.

* - fix: Fix gun bolt with no mag.
This commit is contained in:
Aviu00
2024-02-13 01:22:36 +09:00
committed by GitHub
parent a68c1d13b7
commit 5b4164e118
27 changed files with 60 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/GameTicking/GameTicker.Spawning.cs
View File

@@ -20,6 +20,7 @@ using Content.Shared.Preferences;
using Content.Shared.Roles;
using Content.Shared.Roles.Jobs;
using Content.Shared._White;
using Content.Shared.NameIdentifier;
using JetBrains.Annotations;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
@@ -300,9 +301,11 @@ namespace Content.Server.GameTicking
if (jobId.Contains("Mime"))
if (newMind.Comp.MimeName != null)
_metaData.SetEntityName(mob, newMind.Comp.MimeName);
if (jobId.Contains("Cyborg"))
if (newMind.Comp.BorgName != null)
_metaData.SetEntityName(mob, newMind.Comp.BorgName);
if (jobId.Contains("Borg"))
if (newMind.Comp.BorgName != null && TryComp(mob, out NameIdentifierComponent? identifier))
{
_metaData.SetEntityName(mob, $"{newMind.Comp.BorgName} {identifier.FullIdentifier}");
}
_mind.TransferTo(newMind, mob);