Багфиксы и всякое (#47)
* - 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:
@@ -20,6 +20,7 @@ using Content.Shared.Roles.Jobs;
|
||||
using Content.Shared.Station;
|
||||
using Content.Shared.StatusIcon;
|
||||
using Content.Shared._White.CharacterExamine;
|
||||
using Content.Shared.NameIdentifier;
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Shared.Configuration;
|
||||
using Robust.Shared.Map;
|
||||
@@ -215,15 +216,18 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
|
||||
jobSpecial.AfterEquip(entity);
|
||||
}
|
||||
|
||||
if (prototype.ID.Contains("Cyborg"))
|
||||
if (prototype.ID.Contains("Borg"))
|
||||
{
|
||||
if (!TryComp<NameIdentifierComponent>(entity, out var identifier))
|
||||
return;
|
||||
|
||||
if (_randomizeCharacters || profile == null)
|
||||
{
|
||||
_metaSystem.SetEntityName(entity, HumanoidCharacterProfile.GetBorgName());
|
||||
_metaSystem.SetEntityName(entity, $"{HumanoidCharacterProfile.GetBorgName()} {identifier.FullIdentifier}");
|
||||
}
|
||||
else
|
||||
{
|
||||
_metaSystem.SetEntityName(entity, profile.BorgName);
|
||||
_metaSystem.SetEntityName(entity, $"{profile.BorgName} {identifier.FullIdentifier}");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user