From ee4ff9cfe872ea4cd3bafdc98f88ae6e17d343eb Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Fri, 3 Dec 2021 15:25:51 +0100 Subject: [PATCH] Inline Name --- .../UI/IdCardConsoleBoundUserInterface.cs | 2 +- .../EditSolutionsWindow.xaml.cs | 2 +- .../Animations/ReusableAnimations.cs | 5 +++-- Content.Client/Body/UI/BodyScannerDisplay.cs | 2 +- .../Components/CharacterInfoComponent.cs | 2 +- .../ContextMenu/UI/EntityMenuElement.cs | 4 ++-- .../ContextMenu/UI/EntityMenuPresenter.cs | 2 +- .../UI/EntityMenuPresenterGrouping.cs | 2 +- Content.Client/DragDrop/DragDropSystem.cs | 2 +- Content.Client/Examine/ExamineSystem.cs | 2 +- .../Instruments/UI/InstrumentMenu.xaml.cs | 2 +- .../Inventory/StrippableBoundUserInterface.cs | 3 ++- Content.Client/Items/UI/ItemStatusPanel.cs | 4 ++-- Content.Client/Kitchen/UI/GrinderMenu.xaml.cs | 2 +- .../Kitchen/UI/MicrowaveBoundUserInterface.cs | 2 +- .../Components/LightBehaviourComponent.cs | 2 +- .../UI/MedicalScannerBoundUserInterface.cs | 3 ++- .../UI/MedicalScannerWindow.xaml.cs | 2 +- .../Paper/UI/PaperBoundUserInterface.cs | 3 ++- .../Storage/ClientStorageComponent.cs | 4 ++-- .../VendingMachineBoundUserInterface.cs | 2 +- .../Tests/Body/LungTest.cs | 2 +- .../Components/IdCardConsoleComponent.cs | 7 ++++--- Content.Server/Access/Systems/IdCardSystem.cs | 16 ++++++++------- .../Actions/Actions/DebugTargetEntity.cs | 8 +++++--- .../Actions/Actions/DebugTargetPoint.cs | 4 +++- Content.Server/Actions/Actions/DebugToggle.cs | 6 ++++-- .../Actions/Actions/DisarmAction.cs | 6 +++--- .../Actions/ServerActionsComponent.cs | 10 +++++----- Content.Server/Administration/AdminSystem.cs | 2 +- .../Administration/Commands/AGhost.cs | 6 +++--- .../Administration/Commands/SetMindCommand.cs | 2 +- .../Commands/SetOutfitCommand.cs | 2 +- .../Logs/Converters/PlayerSessionConverter.cs | 4 +++- Content.Server/Alert/ServerAlertsComponent.cs | 3 ++- .../Components/BlockGameArcadeComponent.cs | 2 +- .../Atmos/Components/AtmosPlaqueComponent.cs | 3 ++- .../EntitySystems/GasPressurePumpSystem.cs | 2 +- .../EntitySystems/GasVolumePumpSystem.cs | 2 +- .../Trinary/EntitySystems/GasFilterSystem.cs | 2 +- .../Trinary/EntitySystems/GasMixerSystem.cs | 2 +- .../Unary/EntitySystems/GasCanisterSystem.cs | 2 +- .../BarSign/Systems/BarSignSystem.cs | 5 +++-- .../Body/Commands/AttachBodyPartCommand.cs | 6 +++--- .../Body/Components/MechanismComponent.cs | 4 ++-- .../Components/SurgeryToolComponent.cs | 2 +- .../Botany/Components/PlantHolderComponent.cs | 10 +++++----- .../Components/SeedExtractorComponent.cs | 2 +- Content.Server/Botany/Seed.cs | 6 ++++-- Content.Server/Buckle/Systems/StrapSystem.cs | 4 ++-- .../Cargo/Components/CargoTelepadComponent.cs | 3 ++- Content.Server/Chat/Managers/ChatManager.cs | 7 ++++--- .../Components/ChemMasterComponent.cs | 14 +++++++------ .../Components/ReagentDispenserComponent.cs | 4 ++-- .../TransformableContainerComponent.cs | 2 +- .../TransformableContainerSystem.cs | 5 +++-- .../Climbing/Components/ClimbableComponent.cs | 2 +- .../Cloning/Components/CloningPodComponent.cs | 2 +- Content.Server/Commands/CommandUtils.cs | 2 +- .../Construction/Conditions/AirlockBolted.cs | 4 ++-- .../Construction/Conditions/DoorWelded.cs | 4 ++-- .../Cuffs/Components/CuffableComponent.cs | 2 +- Content.Server/Damage/Commands/HurtCommand.cs | 6 +++--- .../Unit/EntitySystems/DisposalUnitSystem.cs | 2 +- .../Doors/Components/ServerDoorComponent.cs | 4 ++-- .../GameTicking/GameTicker.RoundFlow.cs | 10 +++++++++- .../GameTicking/GameTicker.Spawning.cs | 4 ++-- .../GameTicking/Presets/GamePreset.cs | 4 ++-- .../Presets/PresetTraitorDeathMatch.cs | 4 ++-- .../Ghost/Components/GhostRadioComponent.cs | 2 +- Content.Server/Ghost/GhostSystem.cs | 2 +- .../Hands/Components/HandsComponent.cs | 8 ++++---- Content.Server/Headset/HeadsetComponent.cs | 2 +- .../Interaction/InteractionSystem.cs | 6 +++--- .../Components/DebugEquipComponent.cs | 9 +++++---- .../Components/KitchenSpikeComponent.cs | 2 +- .../Labels/Label/HandLabelerSystem.cs | 7 ++++--- .../Components/ExpendableLightComponent.cs | 2 +- Content.Server/Lock/LockSystem.cs | 6 +++--- .../Medical/MedicalScannerSystem.cs | 2 +- .../Mind/Components/MindComponent.cs | 3 ++- .../Nutrition/EntitySystems/DrinkSystem.cs | 8 ++++---- .../Conditions/KillPersonCondition.cs | 20 ++++++++++++++++++- Content.Server/PAI/PAISystem.cs | 3 ++- .../Pointing/EntitySystems/PointingSystem.cs | 8 ++++---- .../Power/EntitySystems/BaseChargerSystem.cs | 4 ++-- Content.Server/PowerCell/PowerCellSystem.cs | 2 +- Content.Server/Sandbox/SandboxManager.cs | 2 +- .../Components/SecretStashComponent.cs | 2 +- Content.Server/Strip/StrippableComponent.cs | 7 ++++++- Content.Server/Stunnable/StunSystem.cs | 4 ++-- Content.Server/Toilet/ToiletComponent.cs | 8 ++++---- .../VendingMachineComponent.cs | 2 +- .../Weapon/Ranged/Barrels/BarrelSystem.cs | 8 ++++---- .../Actions/Behaviors/IActionBehavior.cs | 2 +- .../Behaviors/Item/IItemActionBehavior.cs | 4 ++-- .../Containers/ItemSlot/ItemSlotsSystem.cs | 8 ++++---- 97 files changed, 237 insertions(+), 177 deletions(-) diff --git a/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs b/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs index e9e8a01d97..23be7c6bbe 100644 --- a/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs +++ b/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs @@ -22,7 +22,7 @@ namespace Content.Client.Access.UI { base.Open(); - _window = new IdCardConsoleWindow(this, _prototypeManager) {Title = Owner.Owner.Name}; + _window = new IdCardConsoleWindow(this, _prototypeManager) {Title = IoCManager.Resolve().GetComponent(Owner.Owner.Uid).EntityName}; _window.OnClose += Close; _window.OpenCentered(); } diff --git a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs index ed0f86a274..cd10f1a7f1 100644 --- a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs +++ b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs @@ -47,7 +47,7 @@ namespace Content.Client.Administration.UI.ManageSolutions _target = target; var targetName = _entityManager.TryGetEntity(target, out var entity) - ? entity.Name + ? IoCManager.Resolve().GetComponent(entity.Uid).EntityName : string.Empty; Title = Loc.GetString("admin-solutions-window-title", ("targetName", targetName)); diff --git a/Content.Client/Animations/ReusableAnimations.cs b/Content.Client/Animations/ReusableAnimations.cs index 48b55416c9..9c558ff6e5 100644 --- a/Content.Client/Animations/ReusableAnimations.cs +++ b/Content.Client/Animations/ReusableAnimations.cs @@ -15,11 +15,12 @@ namespace Content.Client.Animations public static void AnimateEntityPickup(IEntity entity, EntityCoordinates initialPosition, Vector2 finalPosition) { var animatableClone = IoCManager.Resolve().SpawnEntity("clientsideclone", initialPosition); - animatableClone.Name = entity.Name; + string val = IoCManager.Resolve().GetComponent(entity.Uid).EntityName; + IoCManager.Resolve().GetComponent(animatableClone.Uid).EntityName = val; if (!IoCManager.Resolve().TryGetComponent(entity.Uid, out SpriteComponent? sprite0)) { - Logger.Error("Entity ({0}) couldn't be animated for pickup since it doesn't have a {1}!", entity.Name, nameof(SpriteComponent)); + Logger.Error("Entity ({0}) couldn't be animated for pickup since it doesn't have a {1}!", IoCManager.Resolve().GetComponent(entity.Uid).EntityName, nameof(SpriteComponent)); return; } var sprite = IoCManager.Resolve().GetComponent(animatableClone.Uid); diff --git a/Content.Client/Body/UI/BodyScannerDisplay.cs b/Content.Client/Body/UI/BodyScannerDisplay.cs index 2ae7f8048e..e6550050b0 100644 --- a/Content.Client/Body/UI/BodyScannerDisplay.cs +++ b/Content.Client/Body/UI/BodyScannerDisplay.cs @@ -147,7 +147,7 @@ namespace Content.Client.Body.UI private void UpdateBodyPartBox(SharedBodyPartComponent part, string slotName) { - BodyPartLabel.Text = $"{Loc.GetString(slotName)}: {Loc.GetString(part.Owner.Name)}"; + BodyPartLabel.Text = $"{Loc.GetString(slotName)}: {Loc.GetString(IoCManager.Resolve().GetComponent(part.Owner.Uid).EntityName)}"; // TODO BODY Part damage if (IoCManager.Resolve().TryGetComponent(part.Owner.Uid, out DamageableComponent? damageable)) diff --git a/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs b/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs index 9dd66273c4..32a82dc2e9 100644 --- a/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs +++ b/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs @@ -55,7 +55,7 @@ namespace Content.Client.CharacterInfo.Components _control.SpriteView.Sprite = spriteComponent; } - _control.NameLabel.Text = Owner.Name; + _control.NameLabel.Text = IoCManager.Resolve().GetComponent(Owner.Uid).EntityName; break; } } diff --git a/Content.Client/ContextMenu/UI/EntityMenuElement.cs b/Content.Client/ContextMenu/UI/EntityMenuElement.cs index 5942bf3afe..b912bbdc39 100644 --- a/Content.Client/ContextMenu/UI/EntityMenuElement.cs +++ b/Content.Client/ContextMenu/UI/EntityMenuElement.cs @@ -70,9 +70,9 @@ namespace Content.Client.ContextMenu.UI EntityIcon.Sprite = IoCManager.Resolve().GetComponentOrNull(entity.Uid); if (UserInterfaceManager.DebugMonitors.Visible) - Text = $"{entity!.Name} ({entity.Uid})"; + Text = $"{IoCManager.Resolve().GetComponent(entity!.Uid).EntityName} ({entity.Uid})"; else - Text = entity!.Name; + Text = IoCManager.Resolve().GetComponent(entity!.Uid).EntityName; } } } diff --git a/Content.Client/ContextMenu/UI/EntityMenuPresenter.cs b/Content.Client/ContextMenu/UI/EntityMenuPresenter.cs index e10980f170..635611fafb 100644 --- a/Content.Client/ContextMenu/UI/EntityMenuPresenter.cs +++ b/Content.Client/ContextMenu/UI/EntityMenuPresenter.cs @@ -250,7 +250,7 @@ namespace Content.Client.ContextMenu.UI // find the element associated with this entity if (!Elements.TryGetValue(entity, out var element)) { - Logger.Error($"Attempted to remove unknown entity from the entity menu: {entity.Name} ({entity.Uid})"); + Logger.Error($"Attempted to remove unknown entity from the entity menu: {IoCManager.Resolve().GetComponent(entity.Uid).EntityName} ({entity.Uid})"); return; } diff --git a/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs b/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs index 767cd55725..57c0c69691 100644 --- a/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs +++ b/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs @@ -22,7 +22,7 @@ namespace Content.Client.ContextMenu.UI { if (GroupingContextMenuType == 0) { - var newEntities = entities.GroupBy(e => e.Name + (IoCManager.Resolve().GetComponent(e.Uid).EntityPrototype?.ID ?? string.Empty)).ToList(); + var newEntities = entities.GroupBy(e => IoCManager.Resolve().GetComponent(e.Uid).EntityName + (IoCManager.Resolve().GetComponent(e.Uid).EntityPrototype?.ID ?? string.Empty)).ToList(); return newEntities.Select(grp => grp.ToList()).ToList(); } else diff --git a/Content.Client/DragDrop/DragDropSystem.cs b/Content.Client/DragDrop/DragDropSystem.cs index 960a18b2ad..73ecbbd5c5 100644 --- a/Content.Client/DragDrop/DragDropSystem.cs +++ b/Content.Client/DragDrop/DragDropSystem.cs @@ -207,7 +207,7 @@ namespace Content.Client.DragDrop } Logger.Warning("Unable to display drag shadow for {0} because it" + - " has no sprite component.", _dragDropHelper.Dragged.Name); + " has no sprite component.", IoCManager.Resolve().GetComponent(_dragDropHelper.Dragged.Uid).EntityName); return false; } diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs index f11268172c..53897fafd5 100644 --- a/Content.Client/Examine/ExamineSystem.cs +++ b/Content.Client/Examine/ExamineSystem.cs @@ -143,7 +143,7 @@ namespace Content.Client.Examine hBox.AddChild(new Label { - Text = entity.Name, + Text = IoCManager.Resolve().GetComponent(entity.Uid).EntityName, HorizontalExpand = true, }); diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs index 3ef9492cd3..da812a85ac 100644 --- a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs +++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs @@ -36,7 +36,7 @@ namespace Content.Client.Instruments.UI if (_owner.Instrument != null) { _owner.Instrument.OnMidiPlaybackEnded += InstrumentOnMidiPlaybackEnded; - Title = _owner.Instrument.Owner.Name; + Title = IoCManager.Resolve().GetComponent(_owner.Instrument.Owner.Uid).EntityName; LoopButton.Disabled = !_owner.Instrument.IsMidiOpen; LoopButton.Pressed = _owner.Instrument.LoopMidi; StopButton.Disabled = !_owner.Instrument.IsMidiOpen; diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs index 943e3cd16f..ad9c5d4341 100644 --- a/Content.Client/Inventory/StrippableBoundUserInterface.cs +++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs @@ -4,6 +4,7 @@ using Content.Shared.Strip.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.ViewVariables; using static Content.Shared.Inventory.EquipmentSlotDefines; @@ -28,7 +29,7 @@ namespace Content.Client.Inventory { base.Open(); - _strippingMenu = new StrippingMenu($"{Loc.GetString("strippable-bound-user-interface-stripping-menu-title",("ownerName", Owner.Owner.Name))}"); + _strippingMenu = new StrippingMenu($"{Loc.GetString("strippable-bound-user-interface-stripping-menu-title",("ownerName", Name: IoCManager.Resolve().GetComponent(Owner.Owner.Uid).EntityName))}"); _strippingMenu.OnClose += Close; _strippingMenu.OpenCentered(); diff --git a/Content.Client/Items/UI/ItemStatusPanel.cs b/Content.Client/Items/UI/ItemStatusPanel.cs index 8d1dcd0ba2..9cbfca32bc 100644 --- a/Content.Client/Items/UI/ItemStatusPanel.cs +++ b/Content.Client/Items/UI/ItemStatusPanel.cs @@ -159,11 +159,11 @@ namespace Content.Client.Items.UI if (IoCManager.Resolve().TryGetComponent(_entity.Uid, out HandVirtualItemComponent? virtualItem) && _entityManager.TryGetEntity(virtualItem.BlockingEntity, out var blockEnt)) { - _itemNameLabel.Text = blockEnt.Name; + _itemNameLabel.Text = IoCManager.Resolve().GetComponent(blockEnt.Uid).EntityName; } else { - _itemNameLabel.Text = _entity.Name; + _itemNameLabel.Text = IoCManager.Resolve().GetComponent(_entity.Uid).EntityName; } } diff --git a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs index ab2a006d36..85ffc3f3b8 100644 --- a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs +++ b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs @@ -101,7 +101,7 @@ namespace Content.Client.Kitchen.UI } var texture = IoCManager.Resolve().GetComponent(entity.Uid).Icon?.Default; - var solidItem = ChamberContentBox.BoxContents.AddItem(entity.Name, texture); + var solidItem = ChamberContentBox.BoxContents.AddItem(IoCManager.Resolve().GetComponent(entity.Uid).EntityName, texture); var solidIndex = ChamberContentBox.BoxContents.IndexOf(solidItem); _chamberVisualContents.Add(solidIndex, uid); } diff --git a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs index ad3b129daa..b8b71f1401 100644 --- a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs +++ b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs @@ -134,7 +134,7 @@ namespace Content.Client.Kitchen.UI continue; } - var solidItem = _menu.IngredientsList.AddItem(entity.Name, texture); + var solidItem = _menu.IngredientsList.AddItem(IoCManager.Resolve().GetComponent(entity.Uid).EntityName, texture); var solidIndex = _menu.IngredientsList.IndexOf(solidItem); _solids.Add(solidIndex, t); } diff --git a/Content.Client/Light/Components/LightBehaviourComponent.cs b/Content.Client/Light/Components/LightBehaviourComponent.cs index 62b0e4cea5..ad3de8fb74 100644 --- a/Content.Client/Light/Components/LightBehaviourComponent.cs +++ b/Content.Client/Light/Components/LightBehaviourComponent.cs @@ -452,7 +452,7 @@ namespace Content.Client.Light.Components } else { - Logger.Warning($"{Owner.Name} has a {nameof(LightBehaviourComponent)} but it has no {nameof(PointLightComponent)}! Check the prototype!"); + Logger.Warning($"{IoCManager.Resolve().GetComponent(Owner.Uid).EntityName} has a {nameof(LightBehaviourComponent)} but it has no {nameof(PointLightComponent)}! Check the prototype!"); } } diff --git a/Content.Client/MedicalScanner/UI/MedicalScannerBoundUserInterface.cs b/Content.Client/MedicalScanner/UI/MedicalScannerBoundUserInterface.cs index be5427899f..38669d2cf8 100644 --- a/Content.Client/MedicalScanner/UI/MedicalScannerBoundUserInterface.cs +++ b/Content.Client/MedicalScanner/UI/MedicalScannerBoundUserInterface.cs @@ -1,6 +1,7 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using static Content.Shared.MedicalScanner.SharedMedicalScannerComponent; namespace Content.Client.MedicalScanner.UI @@ -19,7 +20,7 @@ namespace Content.Client.MedicalScanner.UI base.Open(); _window = new MedicalScannerWindow { - Title = Owner.Owner.Name, + Title = IoCManager.Resolve().GetComponent(Owner.Owner.Uid).EntityName, }; _window.OnClose += Close; _window.ScanButton.OnPressed += _ => SendMessage(new UiButtonPressedMessage(UiButton.ScanDNA)); diff --git a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs index 5100367f35..c1cc2ced0c 100644 --- a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs +++ b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs @@ -37,7 +37,7 @@ namespace Content.Client.MedicalScanner.UI } else { - text.Append($"{Loc.GetString("medical-scanner-window-entity-health-text", ("entityName", entity.Name))}\n"); + text.Append($"{Loc.GetString("medical-scanner-window-entity-health-text", ("entityName", Name: IoCManager.Resolve().GetComponent(entity.Uid).EntityName))}\n"); var totalDamage = state.DamagePerType.Values.Sum(); diff --git a/Content.Client/Paper/UI/PaperBoundUserInterface.cs b/Content.Client/Paper/UI/PaperBoundUserInterface.cs index 64461658f2..67ed0345f9 100644 --- a/Content.Client/Paper/UI/PaperBoundUserInterface.cs +++ b/Content.Client/Paper/UI/PaperBoundUserInterface.cs @@ -2,6 +2,7 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using static Content.Shared.Paper.SharedPaperComponent; namespace Content.Client.Paper.UI @@ -20,7 +21,7 @@ namespace Content.Client.Paper.UI base.Open(); _window = new PaperWindow { - Title = Owner.Owner.Name, + Title = IoCManager.Resolve().GetComponent(Owner.Owner.Uid).EntityName, }; _window.OnClose += Close; _window.Input.OnTextEntered += Input_OnTextEntered; diff --git a/Content.Client/Storage/ClientStorageComponent.cs b/Content.Client/Storage/ClientStorageComponent.cs index b14f830fa2..b438666ace 100644 --- a/Content.Client/Storage/ClientStorageComponent.cs +++ b/Content.Client/Storage/ClientStorageComponent.cs @@ -46,7 +46,7 @@ namespace Content.Client.Storage { base.OnAdd(); - _window = new StorageWindow(this) {Title = Owner.Name}; + _window = new StorageWindow(this) {Title = IoCManager.Resolve().GetComponent(Owner.Uid).EntityName}; _window.EntityList.GenerateItem += GenerateButton; _window.EntityList.ItemPressed += Interact; } @@ -202,7 +202,7 @@ namespace Content.Client.Storage { HorizontalExpand = true, ClipText = true, - Text = entity.Name + Text = IoCManager.Resolve().GetComponent(entity.Uid).EntityName }, new Label { diff --git a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs index 156d2d09fe..292dd1dcd9 100644 --- a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs +++ b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs @@ -30,7 +30,7 @@ namespace Content.Client.VendingMachines VendingMachine = vendingMachine; - _menu = new VendingMachineMenu(this) {Title = Owner.Owner.Name}; + _menu = new VendingMachineMenu(this) {Title = IoCManager.Resolve().GetComponent(Owner.Owner.Uid).EntityName}; _menu.Populate(VendingMachine.Inventory); _menu.OnClose += Close; diff --git a/Content.IntegrationTests/Tests/Body/LungTest.cs b/Content.IntegrationTests/Tests/Body/LungTest.cs index 9c3444bc5c..b9e87e7bfc 100644 --- a/Content.IntegrationTests/Tests/Body/LungTest.cs +++ b/Content.IntegrationTests/Tests/Body/LungTest.cs @@ -184,7 +184,7 @@ namespace Content.IntegrationTests.Tests.Body await server.WaitRunTicks(increment); await server.WaitAssertion(() => { - Assert.False(respirator.Suffocating, $"Entity {human.Name} is suffocating on tick {tick}"); + Assert.False(respirator.Suffocating, $"Entity {IoCManager.Resolve().GetComponent(human.Uid).EntityName} is suffocating on tick {tick}"); }); } diff --git a/Content.Server/Access/Components/IdCardConsoleComponent.cs b/Content.Server/Access/Components/IdCardConsoleComponent.cs index 571ec75052..d3c5d5bc5a 100644 --- a/Content.Server/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Server/Access/Components/IdCardConsoleComponent.cs @@ -122,6 +122,7 @@ namespace Content.Server.Access.Components // this could be prettier if (targetIdEntity == null) { + IEntity? tempQualifier = PrivilegedIdSlot.Item; newState = new IdCardConsoleBoundUserInterfaceState( PrivilegedIdSlot.HasItem, PrivilegedIdIsAuthorized(), @@ -129,7 +130,7 @@ namespace Content.Server.Access.Components null, null, null, - PrivilegedIdSlot.Item?.Name ?? string.Empty, + (tempQualifier != null ? IoCManager.Resolve().GetComponent(tempQualifier.Uid).EntityName : null) ?? string.Empty, string.Empty); } else @@ -138,7 +139,7 @@ namespace Content.Server.Access.Components var targetAccessComponent = IoCManager.Resolve().GetComponent(targetIdEntity.Uid); var name = string.Empty; if(PrivilegedIdSlot.Item != null) - name = PrivilegedIdSlot.Item.Name; + name = IoCManager.Resolve().GetComponent(PrivilegedIdSlot.Item.Uid).EntityName; newState = new IdCardConsoleBoundUserInterfaceState( PrivilegedIdSlot.HasItem, PrivilegedIdIsAuthorized(), @@ -147,7 +148,7 @@ namespace Content.Server.Access.Components targetIdComponent.JobTitle, targetAccessComponent.Tags.ToArray(), name, - targetIdEntity.Name); + IoCManager.Resolve().GetComponent(targetIdEntity.Uid).EntityName); } UserInterface?.SetState(newState); } diff --git a/Content.Server/Access/Systems/IdCardSystem.cs b/Content.Server/Access/Systems/IdCardSystem.cs index e15b7aafe1..d0e81e4a28 100644 --- a/Content.Server/Access/Systems/IdCardSystem.cs +++ b/Content.Server/Access/Systems/IdCardSystem.cs @@ -8,6 +8,7 @@ using Content.Shared.Inventory; using Robust.Shared.GameObjects; using Robust.Shared.Localization; using System.Diagnostics.CodeAnalysis; +using Robust.Shared.IoC; namespace Content.Server.Access.Systems { @@ -21,7 +22,7 @@ namespace Content.Server.Access.Systems private void OnInit(EntityUid uid, IdCardComponent id, ComponentInit args) { - id.OriginalOwnerName ??= id.Owner.Name; + id.OriginalOwnerName ??= IoCManager.Resolve().GetComponent(id.Owner.Uid).EntityName; UpdateEntityName(uid, id); } @@ -66,19 +67,20 @@ namespace Content.Server.Access.Systems if (string.IsNullOrWhiteSpace(id.FullName) && string.IsNullOrWhiteSpace(id.JobTitle)) { - id.Owner.Name = id.OriginalOwnerName; + IoCManager.Resolve().GetComponent(id.Owner.Uid).EntityName = id.OriginalOwnerName; return; } var jobSuffix = string.IsNullOrWhiteSpace(id.JobTitle) ? string.Empty : $" ({id.JobTitle})"; - id.Owner.Name = string.IsNullOrWhiteSpace(id.FullName) + var val = string.IsNullOrWhiteSpace(id.FullName) ? Loc.GetString("access-id-card-component-owner-name-job-title-text", - ("originalOwnerName", id.OriginalOwnerName), - ("jobSuffix", jobSuffix)) + ("originalOwnerName", id.OriginalOwnerName), + ("jobSuffix", jobSuffix)) : Loc.GetString("access-id-card-component-owner-full-name-job-title-text", - ("fullName", id.FullName), - ("jobSuffix", jobSuffix)); + ("fullName", id.FullName), + ("jobSuffix", jobSuffix)); + IoCManager.Resolve().GetComponent(id.Owner.Uid).EntityName = val; } /// diff --git a/Content.Server/Actions/Actions/DebugTargetEntity.cs b/Content.Server/Actions/Actions/DebugTargetEntity.cs index c16b60e051..0b079018df 100644 --- a/Content.Server/Actions/Actions/DebugTargetEntity.cs +++ b/Content.Server/Actions/Actions/DebugTargetEntity.cs @@ -1,6 +1,8 @@ using Content.Server.Popups; using Content.Shared.Actions.Behaviors; using JetBrains.Annotations; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Server.Actions.Actions @@ -11,14 +13,14 @@ namespace Content.Server.Actions.Actions { public void DoTargetEntityAction(TargetEntityItemActionEventArgs args) { - args.Performer.PopupMessageEveryone(args.Item.Name + ": Clicked " + - args.Target.Name); + args.Performer.PopupMessageEveryone(IoCManager.Resolve().GetComponent(args.Item.Uid).EntityName + ": Clicked " + + IoCManager.Resolve().GetComponent(args.Target.Uid).EntityName); } public void DoTargetEntityAction(TargetEntityActionEventArgs args) { args.Performer.PopupMessageEveryone("Clicked " + - args.Target.Name); + IoCManager.Resolve().GetComponent(args.Target.Uid).EntityName); } } } diff --git a/Content.Server/Actions/Actions/DebugTargetPoint.cs b/Content.Server/Actions/Actions/DebugTargetPoint.cs index 18496f109a..6c9a01b822 100644 --- a/Content.Server/Actions/Actions/DebugTargetPoint.cs +++ b/Content.Server/Actions/Actions/DebugTargetPoint.cs @@ -1,6 +1,8 @@ using Content.Server.Popups; using Content.Shared.Actions.Behaviors; using JetBrains.Annotations; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Server.Actions.Actions @@ -11,7 +13,7 @@ namespace Content.Server.Actions.Actions { public void DoTargetPointAction(TargetPointItemActionEventArgs args) { - args.Performer.PopupMessageEveryone(args.Item.Name + ": Clicked local position " + + args.Performer.PopupMessageEveryone(IoCManager.Resolve().GetComponent(args.Item.Uid).EntityName + ": Clicked local position " + args.Target); } diff --git a/Content.Server/Actions/Actions/DebugToggle.cs b/Content.Server/Actions/Actions/DebugToggle.cs index 7b386601df..587c08c255 100644 --- a/Content.Server/Actions/Actions/DebugToggle.cs +++ b/Content.Server/Actions/Actions/DebugToggle.cs @@ -2,6 +2,8 @@ using Content.Shared.Actions.Behaviors; using Content.Shared.Actions.Behaviors.Item; using JetBrains.Annotations; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Server.Actions.Actions @@ -17,11 +19,11 @@ namespace Content.Server.Actions.Actions { if (args.ToggledOn) { - args.Performer.PopupMessageEveryone(args.Item.Name + ": " + MessageOn); + args.Performer.PopupMessageEveryone(IoCManager.Resolve().GetComponent(args.Item.Uid).EntityName + ": " + MessageOn); } else { - args.Performer.PopupMessageEveryone(args.Item.Name + ": " +MessageOff); + args.Performer.PopupMessageEveryone(IoCManager.Resolve().GetComponent(args.Item.Uid).EntityName + ": " +MessageOff); } return true; diff --git a/Content.Server/Actions/Actions/DisarmAction.cs b/Content.Server/Actions/Actions/DisarmAction.cs index fb236d4a38..b0982e62ea 100644 --- a/Content.Server/Actions/Actions/DisarmAction.cs +++ b/Content.Server/Actions/Actions/DisarmAction.cs @@ -84,10 +84,10 @@ namespace Content.Server.Actions.Actions SoundSystem.Play(Filter.Pvs(args.Performer), PunchMissSound.GetSound(), args.Performer, AudioHelpers.WithVariation(0.025f)); args.Performer.PopupMessageOtherClients(Loc.GetString("disarm-action-popup-message-other-clients", - ("performerName", args.Performer.Name), - ("targetName", args.Target.Name))); + ("performerName", Name: IoCManager.Resolve().GetComponent(args.Performer.Uid).EntityName), + ("targetName", Name: IoCManager.Resolve().GetComponent(args.Target.Uid).EntityName))); args.Performer.PopupMessageCursor(Loc.GetString("disarm-action-popup-message-cursor", - ("targetName", args.Target.Name))); + ("targetName", Name: IoCManager.Resolve().GetComponent(args.Target.Uid).EntityName))); system.SendLunge(angle, args.Performer); return; } diff --git a/Content.Server/Actions/ServerActionsComponent.cs b/Content.Server/Actions/ServerActionsComponent.cs index 40c1693086..fd2a7698f0 100644 --- a/Content.Server/Actions/ServerActionsComponent.cs +++ b/Content.Server/Actions/ServerActionsComponent.cs @@ -63,7 +63,7 @@ namespace Content.Server.Actions if (!attempt.TryGetActionState(this, out var actionState) || !actionState.Enabled) { Logger.DebugS("action", "user {0} attempted to use" + - " action {1} which is not granted to them", player.Name, + " action {1} which is not granted to them", IoCManager.Resolve().GetComponent(player.Uid).EntityName, attempt); return; } @@ -71,7 +71,7 @@ namespace Content.Server.Actions if (actionState.IsOnCooldown(GameTiming)) { Logger.DebugS("action", "user {0} attempted to use" + - " action {1} which is on cooldown", player.Name, + " action {1} which is on cooldown", IoCManager.Resolve().GetComponent(player.Uid).EntityName, attempt); return; } @@ -86,7 +86,7 @@ namespace Content.Server.Actions if (toggleMsg.ToggleOn == actionState.ToggledOn) { Logger.DebugS("action", "user {0} attempted to" + - " toggle action {1} to {2}, but it is already toggled {2}", player.Name, + " toggle action {1} to {2}, but it is already toggled {2}", IoCManager.Resolve().GetComponent(player.Uid).EntityName, attempt.Action.Name, toggleMsg.ToggleOn); return; } @@ -113,7 +113,7 @@ namespace Content.Server.Actions { Logger.DebugS("action", "user {0} attempted to" + " perform target entity action {1} but could not find entity with " + - "provided uid {2}", player.Name, attempt.Action.Name, + "provided uid {2}", IoCManager.Resolve().GetComponent(player.Uid).EntityName, attempt.Action.Name, targetEntityMsg.Target); return; } @@ -204,7 +204,7 @@ namespace Content.Server.Actions { Logger.DebugS("action", "user {0} attempted to" + " perform target action further than allowed range", - player.Name); + IoCManager.Resolve().GetComponent(player.Uid).EntityName); return false; } diff --git a/Content.Server/Administration/AdminSystem.cs b/Content.Server/Administration/AdminSystem.cs index ea91439670..9281f649e8 100644 --- a/Content.Server/Administration/AdminSystem.cs +++ b/Content.Server/Administration/AdminSystem.cs @@ -126,7 +126,7 @@ namespace Content.Server.Administration var username = string.Empty; if(session.AttachedEntity != null) - username = session.AttachedEntity.Name; + username = IoCManager.Resolve().GetComponent(session.AttachedEntity.Uid).EntityName; var antag = session.ContentData()?.Mind?.AllRoles.Any(r => r.Antagonist) ?? false; var uid = session.AttachedEntity?.Uid ?? EntityUid.Invalid; diff --git a/Content.Server/Administration/Commands/AGhost.cs b/Content.Server/Administration/Commands/AGhost.cs index 822183d943..e339b82b25 100644 --- a/Content.Server/Administration/Commands/AGhost.cs +++ b/Content.Server/Administration/Commands/AGhost.cs @@ -50,15 +50,15 @@ namespace Content.Server.Administration.Commands { // TODO: Remove duplication between all this and "GamePreset.OnGhostAttempt()"... if(!string.IsNullOrWhiteSpace(mind.CharacterName)) - ghost.Name = mind.CharacterName; + IoCManager.Resolve().GetComponent(ghost.Uid).EntityName = mind.CharacterName; else if (!string.IsNullOrWhiteSpace(mind.Session?.Name)) - ghost.Name = mind.Session.Name; + IoCManager.Resolve().GetComponent(ghost.Uid).EntityName = mind.Session.Name; mind.Visit(ghost); } else { - ghost.Name = player.Name; + IoCManager.Resolve().GetComponent(ghost.Uid).EntityName = player.Name; mind.TransferTo(ghost.Uid); } diff --git a/Content.Server/Administration/Commands/SetMindCommand.cs b/Content.Server/Administration/Commands/SetMindCommand.cs index 11d7150767..9ad393cd9c 100644 --- a/Content.Server/Administration/Commands/SetMindCommand.cs +++ b/Content.Server/Administration/Commands/SetMindCommand.cs @@ -69,7 +69,7 @@ namespace Content.Server.Administration.Commands { mind = new Mind.Mind(session.UserId) { - CharacterName = target.Name + CharacterName = IoCManager.Resolve().GetComponent(target.Uid).EntityName }; mind.ChangeOwningPlayer(session.UserId); } diff --git a/Content.Server/Administration/Commands/SetOutfitCommand.cs b/Content.Server/Administration/Commands/SetOutfitCommand.cs index cdefb02589..405bbb10cb 100644 --- a/Content.Server/Administration/Commands/SetOutfitCommand.cs +++ b/Content.Server/Administration/Commands/SetOutfitCommand.cs @@ -103,7 +103,7 @@ namespace Content.Server.Administration.Commands IoCManager.Resolve().TryGetComponent(equipmentEntity.Uid, out var pdaComponent) && pdaComponent.ContainedID != null) { - pdaComponent.ContainedID.FullName = target.Name; + pdaComponent.ContainedID.FullName = IoCManager.Resolve().GetComponent(target.Uid).EntityName; } inventoryComponent.Equip(slot, IoCManager.Resolve().GetComponent(equipmentEntity.Uid), false); diff --git a/Content.Server/Administration/Logs/Converters/PlayerSessionConverter.cs b/Content.Server/Administration/Logs/Converters/PlayerSessionConverter.cs index 275dbc617c..6255615d6e 100644 --- a/Content.Server/Administration/Logs/Converters/PlayerSessionConverter.cs +++ b/Content.Server/Administration/Logs/Converters/PlayerSessionConverter.cs @@ -1,5 +1,7 @@ using System.Text.Json; using Robust.Server.Player; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; namespace Content.Server.Administration.Logs.Converters; @@ -13,7 +15,7 @@ public class PlayerSessionConverter : AdminLogConverter if (value.Player.AttachedEntity != null) { writer.WriteNumber("id", (int) value.Player.AttachedEntity.Uid); - writer.WriteString("name", value.Player.AttachedEntity.Name); + writer.WriteString("name", IoCManager.Resolve().GetComponent(value.Player.AttachedEntity.Uid).EntityName); } writer.WriteString("player", value.Player.UserId.UserId); diff --git a/Content.Server/Alert/ServerAlertsComponent.cs b/Content.Server/Alert/ServerAlertsComponent.cs index f619292635..eeffc32af9 100644 --- a/Content.Server/Alert/ServerAlertsComponent.cs +++ b/Content.Server/Alert/ServerAlertsComponent.cs @@ -2,6 +2,7 @@ using Content.Server.Gravity.EntitySystems; using Content.Shared.Alert; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Network; using Robust.Shared.Players; @@ -66,7 +67,7 @@ namespace Content.Server.Alert { Logger.DebugS("alert", "user {0} attempted to" + " click alert {1} which is not currently showing for them", - player.Name, msg.Type); + IoCManager.Resolve().GetComponent(player.Uid).EntityName, msg.Type); break; } diff --git a/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs b/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs index 310d2fa14a..ab56fc9157 100644 --- a/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs +++ b/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs @@ -668,7 +668,7 @@ namespace Content.Server.Arcade.Components { var blockGameSystem = EntitySystem.Get(); - _highScorePlacement = blockGameSystem.RegisterHighScore(_component._player.AttachedEntity.Name, Points); + _highScorePlacement = blockGameSystem.RegisterHighScore(IoCManager.Resolve().GetComponent(_component._player.AttachedEntity.Uid).EntityName, Points); SendHighscoreUpdate(); } _component.UserInterface?.SendMessage(new BlockGameMessages.BlockGameGameOverScreenMessage(Points, _highScorePlacement?.LocalPlacement, _highScorePlacement?.GlobalPlacement)); diff --git a/Content.Server/Atmos/Components/AtmosPlaqueComponent.cs b/Content.Server/Atmos/Components/AtmosPlaqueComponent.cs index 83b2951a4c..310c6f7a4e 100644 --- a/Content.Server/Atmos/Components/AtmosPlaqueComponent.cs +++ b/Content.Server/Atmos/Components/AtmosPlaqueComponent.cs @@ -70,7 +70,7 @@ namespace Content.Server.Atmos.Components }; IoCManager.Resolve().GetComponent(Owner.Uid).EntityDescription = val; - Owner.Name = _type switch + var val1 = _type switch { PlaqueType.Zumos => "ZUM Atmospherics Division plaque", @@ -83,6 +83,7 @@ namespace Content.Server.Atmos.Components PlaqueType.Unset => "Uhm", _ => "Uhm", }; + IoCManager.Resolve().GetComponent(Owner.Uid).EntityName = val1; if (IoCManager.Resolve().TryGetComponent(Owner.Uid, out AppearanceComponent? appearance)) { diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs index 43f4cffcd4..89a6fb0c21 100644 --- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs +++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs @@ -127,7 +127,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems return; _userInterfaceSystem.TrySetUiState(uid, GasPressurePumpUiKey.Key, - new GasPressurePumpBoundUserInterfaceState(pump.Owner.Name, pump.TargetPressure, pump.Enabled)); + new GasPressurePumpBoundUserInterfaceState(IoCManager.Resolve().GetComponent(pump.Owner.Uid).EntityName, pump.TargetPressure, pump.Enabled)); } } } diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs index ab05f12529..46fdb8ff84 100644 --- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs +++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs @@ -132,7 +132,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems return; _userInterfaceSystem.TrySetUiState(uid, GasVolumePumpUiKey.Key, - new GasVolumePumpBoundUserInterfaceState(pump.Owner.Name, pump.TransferRate, pump.Enabled)); + new GasVolumePumpBoundUserInterfaceState(IoCManager.Resolve().GetComponent(pump.Owner.Uid).EntityName, pump.TransferRate, pump.Enabled)); } } } diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs index 178b99611e..3b2017e0f1 100644 --- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs +++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs @@ -104,7 +104,7 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems return; _userInterfaceSystem.TrySetUiState(uid, GasFilterUiKey.Key, - new GasFilterBoundUserInterfaceState(filter.Owner.Name, filter.TransferRate, filter.Enabled, filter.FilteredGas)); + new GasFilterBoundUserInterfaceState(IoCManager.Resolve().GetComponent(filter.Owner.Uid).EntityName, filter.TransferRate, filter.Enabled, filter.FilteredGas)); } private void OnToggleStatusMessage(EntityUid uid, GasFilterComponent filter, GasFilterToggleStatusMessage args) diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs index 1f0414b29d..c8a3fb062e 100644 --- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs +++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs @@ -128,7 +128,7 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems return; _userInterfaceSystem.TrySetUiState(uid, GasMixerUiKey.Key, - new GasMixerBoundUserInterfaceState(mixer.Owner.Name, mixer.TargetPressure, mixer.Enabled, mixer.InletOneConcentration)); + new GasMixerBoundUserInterfaceState(IoCManager.Resolve().GetComponent(mixer.Owner.Uid).EntityName, mixer.TargetPressure, mixer.Enabled, mixer.InletOneConcentration)); } private void OnToggleStatusMessage(EntityUid uid, GasMixerComponent mixer, GasMixerToggleStatusMessage args) diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs index f02b288c8c..ec3fa4ecc3 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs @@ -117,7 +117,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems } _userInterfaceSystem.TrySetUiState(uid, GasCanisterUiKey.Key, - new GasCanisterBoundUserInterfaceState(canister.Owner.Name, + new GasCanisterBoundUserInterfaceState(IoCManager.Resolve().GetComponent(canister.Owner.Uid).EntityName, canister.Air.Pressure, portStatus, tankLabel, tankPressure, canister.ReleasePressure, canister.ReleaseValve, canister.MinReleasePressure, canister.MaxReleasePressure)); } diff --git a/Content.Server/BarSign/Systems/BarSignSystem.cs b/Content.Server/BarSign/Systems/BarSignSystem.cs index 98df6c1978..cf833cc2ec 100644 --- a/Content.Server/BarSign/Systems/BarSignSystem.cs +++ b/Content.Server/BarSign/Systems/BarSignSystem.cs @@ -83,11 +83,12 @@ namespace Content.Server.BarSign.Systems if (!string.IsNullOrEmpty(prototype.Name)) { - component.Owner.Name = prototype.Name; + IoCManager.Resolve().GetComponent(component.Owner.Uid).EntityName = prototype.Name; } else { - component.Owner.Name = Loc.GetString("barsign-component-name"); + string val = Loc.GetString("barsign-component-name"); + IoCManager.Resolve().GetComponent(component.Owner.Uid).EntityName = val; } IoCManager.Resolve().GetComponent(component.Owner.Uid).EntityDescription = prototype.Description; diff --git a/Content.Server/Body/Commands/AttachBodyPartCommand.cs b/Content.Server/Body/Commands/AttachBodyPartCommand.cs index bb6f88cb03..9b926b1c50 100644 --- a/Content.Server/Body/Commands/AttachBodyPartCommand.cs +++ b/Content.Server/Body/Commands/AttachBodyPartCommand.cs @@ -75,7 +75,7 @@ namespace Content.Server.Body.Commands if (!IoCManager.Resolve().TryGetComponent(entity.Uid, out SharedBodyComponent? body)) { - shell.WriteLine($"Entity {entity.Name} with uid {entity.Uid} does not have a {nameof(SharedBodyComponent)} component."); + shell.WriteLine($"Entity {IoCManager.Resolve().GetComponent(entity.Uid).EntityName} with uid {entity.Uid} does not have a {nameof(SharedBodyComponent)} component."); return; } @@ -87,13 +87,13 @@ namespace Content.Server.Body.Commands if (!IoCManager.Resolve().TryGetComponent(partEntity.Uid, out SharedBodyPartComponent? part)) { - shell.WriteLine($"Entity {partEntity.Name} with uid {args[0]} does not have a {nameof(SharedBodyPartComponent)} component."); + shell.WriteLine($"Entity {IoCManager.Resolve().GetComponent(partEntity.Uid).EntityName} with uid {args[0]} does not have a {nameof(SharedBodyPartComponent)} component."); return; } if (body.HasPart(part)) { - shell.WriteLine($"Body part {partEntity.Name} with uid {partEntity.Uid} is already attached to entity {entity.Name} with uid {entity.Uid}"); + shell.WriteLine($"Body part {IoCManager.Resolve().GetComponent(partEntity.Uid).EntityName} with uid {partEntity.Uid} is already attached to entity {IoCManager.Resolve().GetComponent(entity.Uid).EntityName} with uid {entity.Uid}"); return; } diff --git a/Content.Server/Body/Components/MechanismComponent.cs b/Content.Server/Body/Components/MechanismComponent.cs index 589aab450d..0d018c9748 100644 --- a/Content.Server/Body/Components/MechanismComponent.cs +++ b/Content.Server/Body/Components/MechanismComponent.cs @@ -87,7 +87,7 @@ namespace Content.Server.Body.Components else // If surgery cannot be performed, show message saying so. { eventArgs.Target?.PopupMessage(eventArgs.User, - Loc.GetString("mechanism-component-no-way-to-install-message", ("partName", Owner.Name))); + Loc.GetString("mechanism-component-no-way-to-install-message", ("partName", Name: IoCManager.Resolve().GetComponent(Owner.Uid).EntityName))); } } @@ -113,7 +113,7 @@ namespace Content.Server.Body.Components if (!OptionsCache.TryGetValue(key, out var targetObject)) { BodyCache.Owner.PopupMessage(PerformerCache, - Loc.GetString("mechanism-component-no-useful-way-to-use-message",("partName", Owner.Name))); + Loc.GetString("mechanism-component-no-useful-way-to-use-message",("partName", Name: IoCManager.Resolve().GetComponent(Owner.Uid).EntityName))); return; } diff --git a/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs b/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs index 4007508af8..441bf6ca3b 100644 --- a/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs +++ b/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs @@ -109,7 +109,7 @@ namespace Content.Server.Body.Surgery.Components } // Log error if the surgery fails somehow. - Logger.Debug($"Error when trying to perform surgery on ${nameof(SharedBodyPartComponent)} {eventArgs.User.Name}"); + Logger.Debug($"Error when trying to perform surgery on ${nameof(SharedBodyPartComponent)} {IoCManager.Resolve().GetComponent(eventArgs.User.Uid).EntityName}"); throw new InvalidOperationException(); } diff --git a/Content.Server/Botany/Components/PlantHolderComponent.cs b/Content.Server/Botany/Components/PlantHolderComponent.cs index 6866f01747..410298d39c 100644 --- a/Content.Server/Botany/Components/PlantHolderComponent.cs +++ b/Content.Server/Botany/Components/PlantHolderComponent.cs @@ -684,7 +684,7 @@ namespace Content.Server.Botany.Components } user.PopupMessageCursor(Loc.GetString("plant-holder-component-already-seeded-message", - ("name", Owner.Name))); + ("name", Name: IoCManager.Resolve().GetComponent(Owner.Uid).EntityName))); return false; } @@ -693,9 +693,9 @@ namespace Content.Server.Botany.Components if (WeedLevel > 0) { user.PopupMessageCursor(Loc.GetString("plant-holder-component-remove-weeds-message", - ("name", Owner.Name))); + ("name", Name: IoCManager.Resolve().GetComponent(Owner.Uid).EntityName))); user.PopupMessageOtherClients(Loc.GetString("plant-holder-component-remove-weeds-others-message", - ("otherName", user.Name))); + ("otherName", Name: IoCManager.Resolve().GetComponent(user.Uid).EntityName))); WeedLevel = 0; UpdateSprite(); } @@ -712,9 +712,9 @@ namespace Content.Server.Botany.Components if (Seed != null) { user.PopupMessageCursor(Loc.GetString("plant-holder-component-remove-plant-message", - ("name", Owner.Name))); + ("name", Name: IoCManager.Resolve().GetComponent(Owner.Uid).EntityName))); user.PopupMessageOtherClients(Loc.GetString("plant-holder-component-remove-plant-others-message", - ("name", user.Name))); + ("name", Name: IoCManager.Resolve().GetComponent(user.Uid).EntityName))); RemovePlant(); } else diff --git a/Content.Server/Botany/Components/SeedExtractorComponent.cs b/Content.Server/Botany/Components/SeedExtractorComponent.cs index 39efb4ee91..99490371d7 100644 --- a/Content.Server/Botany/Components/SeedExtractorComponent.cs +++ b/Content.Server/Botany/Components/SeedExtractorComponent.cs @@ -29,7 +29,7 @@ namespace Content.Server.Botany.Components if (IoCManager.Resolve().TryGetComponent(eventArgs.Using.Uid, out ProduceComponent? produce) && produce.Seed != null) { - eventArgs.User.PopupMessageCursor(Loc.GetString("seed-extractor-component-interact-message",("name", eventArgs.Using.Name))); + eventArgs.User.PopupMessageCursor(Loc.GetString("seed-extractor-component-interact-message",("name", Name: IoCManager.Resolve().GetComponent(eventArgs.Using.Uid).EntityName))); IoCManager.Resolve().QueueDeleteEntity(eventArgs.Using.Uid); diff --git a/Content.Server/Botany/Seed.cs b/Content.Server/Botany/Seed.cs index 1699a0b2bd..40fbbd60a2 100644 --- a/Content.Server/Botany/Seed.cs +++ b/Content.Server/Botany/Seed.cs @@ -263,7 +263,8 @@ namespace Content.Server.Botany sprite.LayerSetSprite(0, new SpriteSpecifier.Rsi(PlantRsi, "seed")); } - seed.Name = Loc.GetString("botany-seed-packet-name", ("seedName", SeedName), ("seedNoun", SeedNoun)); + string val = Loc.GetString("botany-seed-packet-name", ("seedName", SeedName), ("seedNoun", SeedNoun)); + IoCManager.Resolve().GetComponent(seed.Uid).EntityName = val; return seed; } @@ -341,7 +342,8 @@ namespace Content.Server.Botany if (Mysterious) { - entity.Name += "?"; + string val1 = IoCManager.Resolve().GetComponent(entity.Uid).EntityName + "?"; + IoCManager.Resolve().GetComponent(entity.Uid).EntityName = val1; string val = IoCManager.Resolve().GetComponent(entity.Uid).EntityDescription + (" " + Loc.GetString("botany-mysterious-description-addon")); IoCManager.Resolve().GetComponent(entity.Uid).EntityDescription = val; } diff --git a/Content.Server/Buckle/Systems/StrapSystem.cs b/Content.Server/Buckle/Systems/StrapSystem.cs index 9c40cf7013..15bb6bfc70 100644 --- a/Content.Server/Buckle/Systems/StrapSystem.cs +++ b/Content.Server/Buckle/Systems/StrapSystem.cs @@ -50,7 +50,7 @@ namespace Content.Server.Buckle.Systems if (entity == args.User) verb.Text = Loc.GetString("verb-self-target-pronoun"); else - verb.Text = entity.Name; + verb.Text = IoCManager.Resolve().GetComponent(entity.Uid).EntityName; // In the event that you have more than once entity with the same name strapped to the same object, // these two verbs will be identical according to Verb.CompareTo, and only one with actually be added to @@ -88,7 +88,7 @@ namespace Content.Server.Buckle.Systems Verb verb = new(); verb.Act = () => usingBuckle.TryBuckle(args.User, args.Target); verb.Category = VerbCategory.Buckle; - verb.Text = args.Using.Name; + verb.Text = IoCManager.Resolve().GetComponent(args.Using.Uid).EntityName; // If the used entity is a person being pulled, prioritize this verb. Conversely, if it is // just a held object, the user is probably just trying to sit down. diff --git a/Content.Server/Cargo/Components/CargoTelepadComponent.cs b/Content.Server/Cargo/Components/CargoTelepadComponent.cs index 00095c8764..1b214baec9 100644 --- a/Content.Server/Cargo/Components/CargoTelepadComponent.cs +++ b/Content.Server/Cargo/Components/CargoTelepadComponent.cs @@ -129,7 +129,8 @@ namespace Content.Server.Cargo.Components return; // fill in the order data - printed.Name = Loc.GetString("cargo-console-paper-print-name", ("orderNumber", data.OrderNumber)); + string val = Loc.GetString("cargo-console-paper-print-name", ("orderNumber", data.OrderNumber)); + IoCManager.Resolve().GetComponent(printed.Uid).EntityName = val; paper.SetContent(Loc.GetString( "cargo-console-paper-print-text", ("orderNumber", data.OrderNumber), diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index 02d85b605f..cdff688731 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -194,7 +194,7 @@ namespace Content.Server.Chat.Managers var msg = _netManager.CreateNetMessage(); msg.Channel = ChatChannel.Local; msg.Message = message; - msg.MessageWrap = Loc.GetString("chat-manager-entity-say-wrap-message",("entityName", source.Name)); + msg.MessageWrap = Loc.GetString("chat-manager-entity-say-wrap-message",("entityName", Name: IoCManager.Resolve().GetComponent(source.Uid).EntityName)); msg.SenderEntity = source.Uid; msg.HideChat = hideChat; _netManager.ServerSendToMany(msg, clients); @@ -231,7 +231,7 @@ namespace Content.Server.Chat.Managers var msg = _netManager.CreateNetMessage(); msg.Channel = ChatChannel.Emotes; msg.Message = action; - msg.MessageWrap = Loc.GetString("chat-manager-entity-me-wrap-message", ("entityName",source.Name)); + msg.MessageWrap = Loc.GetString("chat-manager-entity-me-wrap-message", ("entityName",Name: IoCManager.Resolve().GetComponent(source.Uid).EntityName)); msg.SenderEntity = source.Uid; _netManager.ServerSendToMany(msg, clients); } @@ -296,9 +296,10 @@ namespace Content.Server.Chat.Managers var msg = _netManager.CreateNetMessage(); msg.Channel = ChatChannel.Dead; msg.Message = message; + IEntity? tempQualifier = player.AttachedEntity; msg.MessageWrap = Loc.GetString("chat-manager-send-dead-chat-wrap-message", ("deadChannelName", Loc.GetString("chat-manager-dead-channel-name")), - ("playerName", player.AttachedEntity?.Name ?? "???")); + ("playerName", (tempQualifier != null ? IoCManager.Resolve().GetComponent(tempQualifier.Uid).EntityName : null) ?? "???")); msg.SenderEntity = player.AttachedEntityUid.GetValueOrDefault(); _netManager.ServerSendToMany(msg, clients.ToList()); } diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs index 97873bdc6d..7762f715a3 100644 --- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs +++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs @@ -187,13 +187,13 @@ namespace Content.Server.Chemistry.Components !EntitySystem.Get().TryGetSolution(beaker.Uid, fits.Solution, out var beakerSolution)) { return new ChemMasterBoundUserInterfaceState(Powered, false, FixedPoint2.New(0), FixedPoint2.New(0), - "", _label, Owner.Name, new List(), BufferSolution.Contents, _bufferModeTransfer, + "", _label, IoCManager.Resolve().GetComponent(Owner.Uid).EntityName, new List(), BufferSolution.Contents, _bufferModeTransfer, BufferSolution.TotalVolume, _pillType); } return new ChemMasterBoundUserInterfaceState(Powered, true, beakerSolution.CurrentVolume, beakerSolution.MaxVolume, - beaker.Name, _label, Owner.Name, beakerSolution.Contents, BufferSolution.Contents, _bufferModeTransfer, + IoCManager.Resolve().GetComponent(beaker.Uid).EntityName, _label, IoCManager.Resolve().GetComponent(Owner.Uid).EntityName, beakerSolution.Contents, BufferSolution.Contents, _bufferModeTransfer, BufferSolution.TotalVolume, _pillType); } @@ -306,8 +306,9 @@ namespace Content.Server.Chemistry.Components //Adding label LabelComponent labelComponent = bottle.EnsureComponent(); - labelComponent.OriginalName = bottle.Name; - bottle.Name += $" ({label})"; + labelComponent.OriginalName = IoCManager.Resolve().GetComponent(bottle.Uid).EntityName; + string val = IoCManager.Resolve().GetComponent(bottle.Uid).EntityName + $" ({label})"; + IoCManager.Resolve().GetComponent(bottle.Uid).EntityName = val; labelComponent.CurrentLabel = label; var bufferSolution = BufferSolution.SplitSolution(actualVolume); @@ -348,8 +349,9 @@ namespace Content.Server.Chemistry.Components //Adding label LabelComponent labelComponent = pill.EnsureComponent(); - labelComponent.OriginalName = pill.Name; - pill.Name += $" ({label})"; + labelComponent.OriginalName = IoCManager.Resolve().GetComponent(pill.Uid).EntityName; + string val = IoCManager.Resolve().GetComponent(pill.Uid).EntityName + $" ({label})"; + IoCManager.Resolve().GetComponent(pill.Uid).EntityName = val; labelComponent.CurrentLabel = label; var bufferSolution = BufferSolution.SplitSolution(actualVolume); diff --git a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs index d31d3a9532..03b4c1f724 100644 --- a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs +++ b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs @@ -230,12 +230,12 @@ namespace Content.Server.Chemistry.Components { return new ReagentDispenserBoundUserInterfaceState(Powered, false, FixedPoint2.New(0), FixedPoint2.New(0), - string.Empty, Inventory, Owner.Name, null, _dispenseAmount); + string.Empty, Inventory, IoCManager.Resolve().GetComponent(Owner.Uid).EntityName, null, _dispenseAmount); } return new ReagentDispenserBoundUserInterfaceState(Powered, true, solution.CurrentVolume, solution.MaxVolume, - beaker.Name, Inventory, Owner.Name, solution.Contents.ToList(), _dispenseAmount); + IoCManager.Resolve().GetComponent(beaker.Uid).EntityName, Inventory, IoCManager.Resolve().GetComponent(Owner.Uid).EntityName, solution.Contents.ToList(), _dispenseAmount); } public void UpdateUserInterface() diff --git a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs index f2d61feb6f..58d352b1ec 100644 --- a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs +++ b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs @@ -29,7 +29,7 @@ namespace Content.Server.Chemistry.Components InitialSprite = new SpriteSpecifier.Rsi(new ResourcePath(sprite.BaseRSIPath), "icon"); } - InitialName = Owner.Name; + InitialName = IoCManager.Resolve().GetComponent(Owner.Uid).EntityName; InitialDescription = IoCManager.Resolve().GetComponent(Owner.Uid).EntityDescription; } diff --git a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs b/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs index 20f4ad5b37..36c141df2d 100644 --- a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs @@ -56,7 +56,8 @@ namespace Content.Server.Chemistry.EntitySystems sprite?.LayerSetSprite(0, spriteSpec); } - ownerEntity.Name = proto.Name + " glass"; + string val = proto.Name + " glass"; + IoCManager.Resolve().GetComponent(ownerEntity.Uid).EntityName = val; IoCManager.Resolve().GetComponent(ownerEntity.Uid).EntityDescription = proto.Description; component.CurrentReagent = proto; component.Transformed = true; @@ -74,7 +75,7 @@ namespace Content.Server.Chemistry.EntitySystems sprite.LayerSetSprite(0, component.InitialSprite); } - component.Owner.Name = component.InitialName; + IoCManager.Resolve().GetComponent(component.Owner.Uid).EntityName = component.InitialName; IoCManager.Resolve().GetComponent(component.Owner.Uid).EntityDescription = component.InitialDescription; } } diff --git a/Content.Server/Climbing/Components/ClimbableComponent.cs b/Content.Server/Climbing/Components/ClimbableComponent.cs index 2c03b463c9..b3e6679747 100644 --- a/Content.Server/Climbing/Components/ClimbableComponent.cs +++ b/Content.Server/Climbing/Components/ClimbableComponent.cs @@ -36,7 +36,7 @@ namespace Content.Server.Climbing.Components if (!Owner.EnsureComponent(out PhysicsComponent _)) { - Logger.Warning($"Entity {Owner.Name} at {IoCManager.Resolve().GetComponent(Owner.Uid).MapPosition} didn't have a {nameof(PhysicsComponent)}"); + Logger.Warning($"Entity {IoCManager.Resolve().GetComponent(Owner.Uid).EntityName} at {IoCManager.Resolve().GetComponent(Owner.Uid).MapPosition} didn't have a {nameof(PhysicsComponent)}"); } } diff --git a/Content.Server/Cloning/Components/CloningPodComponent.cs b/Content.Server/Cloning/Components/CloningPodComponent.cs index f206f333d6..027f821524 100644 --- a/Content.Server/Cloning/Components/CloningPodComponent.cs +++ b/Content.Server/Cloning/Components/CloningPodComponent.cs @@ -139,7 +139,7 @@ namespace Content.Server.Cloning.Components EntitySystem.Get().UpdateFromProfile(mob.Uid, dna.Profile); - mob.Name = dna.Profile.Name; + IoCManager.Resolve().GetComponent(mob.Uid).EntityName = dna.Profile.Name; var cloneMindReturn = IoCManager.Resolve().AddComponent(mob); cloneMindReturn.Mind = mind; diff --git a/Content.Server/Commands/CommandUtils.cs b/Content.Server/Commands/CommandUtils.cs index 10aaf535f8..a37c94407c 100644 --- a/Content.Server/Commands/CommandUtils.cs +++ b/Content.Server/Commands/CommandUtils.cs @@ -65,7 +65,7 @@ namespace Content.Server.Commands IoCManager.Resolve().GetComponent(ent.Uid).LocalPosition.X.ToString(CultureInfo.InvariantCulture)); ruleString = ruleString.Replace("$LY", IoCManager.Resolve().GetComponent(ent.Uid).LocalPosition.Y.ToString(CultureInfo.InvariantCulture)); - ruleString = ruleString.Replace("$NAME", ent.Name); + ruleString = ruleString.Replace("$NAME", IoCManager.Resolve().GetComponent(ent.Uid).EntityName); if (shell.Player is IPlayerSession player) { diff --git a/Content.Server/Construction/Conditions/AirlockBolted.cs b/Content.Server/Construction/Conditions/AirlockBolted.cs index e43c6291cf..b9f7b81658 100644 --- a/Content.Server/Construction/Conditions/AirlockBolted.cs +++ b/Content.Server/Construction/Conditions/AirlockBolted.cs @@ -36,9 +36,9 @@ namespace Content.Server.Construction.Conditions if (airlock.BoltsDown != Value) { if (Value == true) - args.PushMarkup(Loc.GetString("construction-examine-condition-airlock-bolt", ("entityName", entity.Name)) + "\n"); + args.PushMarkup(Loc.GetString("construction-examine-condition-airlock-bolt", ("entityName", Name: IoCManager.Resolve().GetComponent(entity.Uid).EntityName)) + "\n"); else - args.PushMarkup(Loc.GetString("construction-examine-condition-airlock-unbolt", ("entityName", entity.Name)) + "\n"); + args.PushMarkup(Loc.GetString("construction-examine-condition-airlock-unbolt", ("entityName", Name: IoCManager.Resolve().GetComponent(entity.Uid).EntityName)) + "\n"); return true; } diff --git a/Content.Server/Construction/Conditions/DoorWelded.cs b/Content.Server/Construction/Conditions/DoorWelded.cs index 72b4f1200f..c382f8bdc5 100644 --- a/Content.Server/Construction/Conditions/DoorWelded.cs +++ b/Content.Server/Construction/Conditions/DoorWelded.cs @@ -34,9 +34,9 @@ namespace Content.Server.Construction.Conditions if (door.IsWeldedShut != Welded) { if (Welded == true) - args.PushMarkup(Loc.GetString("construction-examine-condition-door-weld", ("entityName", entity.Name)) + "\n"); + args.PushMarkup(Loc.GetString("construction-examine-condition-door-weld", ("entityName", Name: IoCManager.Resolve().GetComponent(entity.Uid).EntityName)) + "\n"); else - args.PushMarkup(Loc.GetString("construction-examine-condition-door-unweld", ("entityName", entity.Name)) + "\n"); + args.PushMarkup(Loc.GetString("construction-examine-condition-door-unweld", ("entityName", Name: IoCManager.Resolve().GetComponent(entity.Uid).EntityName)) + "\n"); return true; } diff --git a/Content.Server/Cuffs/Components/CuffableComponent.cs b/Content.Server/Cuffs/Components/CuffableComponent.cs index 9dca5809ec..cec5bf60fd 100644 --- a/Content.Server/Cuffs/Components/CuffableComponent.cs +++ b/Content.Server/Cuffs/Components/CuffableComponent.cs @@ -267,7 +267,7 @@ namespace Content.Server.Cuffs.Components { cuff.Broken = true; - cuffsToRemove.Name = cuff.BrokenName; + IoCManager.Resolve().GetComponent(cuffsToRemove.Uid).EntityName = cuff.BrokenName; IoCManager.Resolve().GetComponent(cuffsToRemove.Uid).EntityDescription = cuff.BrokenDesc; if (IoCManager.Resolve().TryGetComponent(cuffsToRemove.Uid, out var sprite) && cuff.BrokenState != null) diff --git a/Content.Server/Damage/Commands/HurtCommand.cs b/Content.Server/Damage/Commands/HurtCommand.cs index ee2ba9124a..c3eda3b14d 100644 --- a/Content.Server/Damage/Commands/HurtCommand.cs +++ b/Content.Server/Damage/Commands/HurtCommand.cs @@ -106,7 +106,7 @@ namespace Content.Server.Damage.Commands var damage = new DamageSpecifier(damageGroup, amount); EntitySystem.Get().TryChangeDamage(entity.Uid, damage, ignoreResistances); - shell.WriteLine($"Damaged entity {entity.Name} with id {entity.Uid} for {amount} {damageGroup} damage{(ignoreResistances ? ", ignoring resistances." : ".")}"); + shell.WriteLine($"Damaged entity {IoCManager.Resolve().GetComponent(entity.Uid).EntityName} with id {entity.Uid} for {amount} {damageGroup} damage{(ignoreResistances ? ", ignoring resistances." : ".")}"); }; return true; @@ -119,7 +119,7 @@ namespace Content.Server.Damage.Commands var damage = new DamageSpecifier(damageType, amount); EntitySystem.Get().TryChangeDamage(entity.Uid, damage, ignoreResistances); - shell.WriteLine($"Damaged entity {entity.Name} with id {entity.Uid} for {amount} {damageType} damage{(ignoreResistances ? ", ignoring resistances." : ".")}"); + shell.WriteLine($"Damaged entity {IoCManager.Resolve().GetComponent(entity.Uid).EntityName} with id {entity.Uid} for {amount} {damageType} damage{(ignoreResistances ? ", ignoring resistances." : ".")}"); }; return true; @@ -199,7 +199,7 @@ namespace Content.Server.Damage.Commands if (!IoCManager.Resolve().TryGetComponent(entity.Uid, out DamageableComponent? damageable)) { - shell.WriteLine($"Entity {entity.Name} with id {entity.Uid} does not have a {nameof(DamageableComponent)}."); + shell.WriteLine($"Entity {IoCManager.Resolve().GetComponent(entity.Uid).EntityName} with id {entity.Uid} does not have a {nameof(DamageableComponent)}."); return; } diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs index dbedcfe51a..a25528c69c 100644 --- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs +++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs @@ -483,7 +483,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems public void UpdateInterface(DisposalUnitComponent component, bool powered) { var stateString = Loc.GetString($"{component.State}"); - var state = new SharedDisposalUnitComponent.DisposalUnitBoundUserInterfaceState(component.Owner.Name, stateString, EstimatedFullPressure(component), powered, component.Engaged); + var state = new SharedDisposalUnitComponent.DisposalUnitBoundUserInterfaceState(IoCManager.Resolve().GetComponent(component.Owner.Uid).EntityName, stateString, EstimatedFullPressure(component), powered, component.Engaged); component.UserInterface?.SetState(state); } diff --git a/Content.Server/Doors/Components/ServerDoorComponent.cs b/Content.Server/Doors/Components/ServerDoorComponent.cs index a06f0eb2dd..6b26307541 100644 --- a/Content.Server/Doors/Components/ServerDoorComponent.cs +++ b/Content.Server/Doors/Components/ServerDoorComponent.cs @@ -220,7 +220,7 @@ namespace Content.Server.Doors.Components { if (!CanWeldShut) { - Logger.Warning("{0} prototype loaded with incompatible flags: 'welded' is true, but door cannot be welded.", Owner.Name); + Logger.Warning("{0} prototype loaded with incompatible flags: 'welded' is true, but door cannot be welded.", IoCManager.Resolve().GetComponent(Owner.Uid).EntityName); return; } SetAppearance(DoorVisualState.Welded); @@ -243,7 +243,7 @@ namespace Content.Server.Doors.Components { if (IsWeldedShut) { - Logger.Warning("{0} prototype loaded with incompatible flags: 'welded' and 'startOpen' are both true.", Owner.Name); + Logger.Warning("{0} prototype loaded with incompatible flags: 'welded' and 'startOpen' are both true.", IoCManager.Resolve().GetComponent(Owner.Uid).EntityName); return; } QuickOpen(false); diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs index e8bac90211..864b83a318 100644 --- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs +++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs @@ -274,13 +274,21 @@ namespace Content.Server.GameTicking } // Finish var antag = mind.AllRoles.Any(role => role.Antagonist); + + var playerIcName = string.Empty; + + if (mind.CharacterName != null) + playerIcName = mind.CharacterName; + else if (mind.CurrentEntity != null) + playerIcName = IoCManager.Resolve().GetComponent(mind.CurrentEntity.Uid).EntityName; + var playerEndRoundInfo = new RoundEndMessageEvent.RoundEndPlayerInfo() { // Note that contentPlayerData?.Name sticks around after the player is disconnected. // This is as opposed to ply?.Name which doesn't. PlayerOOCName = contentPlayerData?.Name ?? "(IMPOSSIBLE: REGISTERED MIND WITH NO OWNER)", // Character name takes precedence over current entity name - PlayerICName = mind.CharacterName ?? mind.CurrentEntity?.Name, + PlayerICName = playerIcName, Role = antag ? mind.AllRoles.First(role => role.Antagonist).Name : mind.AllRoles.FirstOrDefault()?.Name ?? Loc.GetString("game-ticker-unknown-role"), diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs index 812acfd148..48f31e3ed4 100644 --- a/Content.Server/GameTicking/GameTicker.Spawning.cs +++ b/Content.Server/GameTicking/GameTicker.Spawning.cs @@ -190,7 +190,7 @@ namespace Content.Server.GameTicking newMind.AddRole(new ObserverRole(newMind)); var mob = SpawnObserverMob(); - mob.Name = name; + IoCManager.Resolve().GetComponent(mob.Uid).EntityName = name; var ghost = IoCManager.Resolve().GetComponent(mob.Uid); EntitySystem.Get().SetCanReturnToBody(ghost, false); newMind.TransferTo(mob.Uid); @@ -214,7 +214,7 @@ namespace Content.Server.GameTicking if (profile != null) { EntitySystem.Get().UpdateFromProfile(entity.Uid, profile); - entity.Name = profile.Name; + IoCManager.Resolve().GetComponent(entity.Uid).EntityName = profile.Name; } return entity; diff --git a/Content.Server/GameTicking/Presets/GamePreset.cs b/Content.Server/GameTicking/Presets/GamePreset.cs index 8985ecba42..a265046cd8 100644 --- a/Content.Server/GameTicking/Presets/GamePreset.cs +++ b/Content.Server/GameTicking/Presets/GamePreset.cs @@ -78,9 +78,9 @@ namespace Content.Server.GameTicking.Presets // If all else fails, it'll default to the default entity prototype name, "observer". // However, that should rarely happen. if(!string.IsNullOrWhiteSpace(mind.CharacterName)) - ghost.Name = mind.CharacterName; + IoCManager.Resolve().GetComponent(ghost.Uid).EntityName = mind.CharacterName; else if (!string.IsNullOrWhiteSpace(mind.Session?.Name)) - ghost.Name = mind.Session.Name; + IoCManager.Resolve().GetComponent(ghost.Uid).EntityName = mind.Session.Name; var ghostComponent = IoCManager.Resolve().GetComponent(ghost.Uid); diff --git a/Content.Server/GameTicking/Presets/PresetTraitorDeathMatch.cs b/Content.Server/GameTicking/Presets/PresetTraitorDeathMatch.cs index 6ec6ed4454..3884765920 100644 --- a/Content.Server/GameTicking/Presets/PresetTraitorDeathMatch.cs +++ b/Content.Server/GameTicking/Presets/PresetTraitorDeathMatch.cs @@ -111,12 +111,12 @@ namespace Content.Server.GameTicking.Presets _entityManager.EntitySysManager.GetEntitySystem() .AddUplink(mind.OwnedEntity, uplinkAccount, newPDA); - _allOriginalNames[uplinkAccount] = mind.OwnedEntity.Name; + _allOriginalNames[uplinkAccount] = IoCManager.Resolve().GetComponent(mind.OwnedEntity.Uid).EntityName; // The PDA needs to be marked with the correct owner. var pda = IoCManager.Resolve().GetComponent(newPDA.Uid); _entityManager.EntitySysManager.GetEntitySystem() - .SetOwner(pda, mind.OwnedEntity.Name); + .SetOwner(pda, IoCManager.Resolve().GetComponent(mind.OwnedEntity.Uid).EntityName); IoCManager.Resolve().AddComponent(newPDA).UserId = mind.UserId; } diff --git a/Content.Server/Ghost/Components/GhostRadioComponent.cs b/Content.Server/Ghost/Components/GhostRadioComponent.cs index 7929e5e116..5badaacf32 100644 --- a/Content.Server/Ghost/Components/GhostRadioComponent.cs +++ b/Content.Server/Ghost/Components/GhostRadioComponent.cs @@ -36,7 +36,7 @@ namespace Content.Server.Ghost.Components msg.Channel = ChatChannel.Radio; msg.Message = message; //Square brackets are added here to avoid issues with escaping - msg.MessageWrap = Loc.GetString("chat-radio-message-wrap", ("channel", $"\\[{channel}\\]"), ("name", speaker.Name)); + msg.MessageWrap = Loc.GetString("chat-radio-message-wrap", ("channel", $"\\[{channel}\\]"), ("name", Name: IoCManager.Resolve().GetComponent(speaker.Uid).EntityName)); _netManager.ServerSendMessage(msg, playerChannel); } diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs index cb62be1013..93456133f2 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -222,7 +222,7 @@ namespace Content.Server.Ghost { if (player.AttachedEntity != null) { - players.Add(player.AttachedEntity.Uid, player.AttachedEntity.Name); + players.Add(player.AttachedEntity.Uid, IoCManager.Resolve().GetComponent(player.AttachedEntity.Uid).EntityName); } } diff --git a/Content.Server/Hands/Components/HandsComponent.cs b/Content.Server/Hands/Components/HandsComponent.cs index 266580dfcc..81280eef98 100644 --- a/Content.Server/Hands/Components/HandsComponent.cs +++ b/Content.Server/Hands/Components/HandsComponent.cs @@ -106,13 +106,13 @@ namespace Content.Server.Hands.Components { if (ActiveHand != null && Drop(ActiveHand, false)) { - source.PopupMessageOtherClients(Loc.GetString("hands-component-disarm-success-others-message", ("disarmer", source.Name), ("disarmed", target.Name))); - source.PopupMessageCursor(Loc.GetString("hands-component-disarm-success-message", ("disarmed", target.Name))); + source.PopupMessageOtherClients(Loc.GetString("hands-component-disarm-success-others-message", ("disarmer", Name: IoCManager.Resolve().GetComponent(source.Uid).EntityName), ("disarmed", Name: IoCManager.Resolve().GetComponent(target.Uid).EntityName))); + source.PopupMessageCursor(Loc.GetString("hands-component-disarm-success-message", ("disarmed", Name: IoCManager.Resolve().GetComponent(target.Uid).EntityName))); } else { - source.PopupMessageOtherClients(Loc.GetString("hands-component-shove-success-others-message", ("shover", source.Name), ("shoved", target.Name))); - source.PopupMessageCursor(Loc.GetString("hands-component-shove-success-message", ("shoved", target.Name))); + source.PopupMessageOtherClients(Loc.GetString("hands-component-shove-success-others-message", ("shover", Name: IoCManager.Resolve().GetComponent(source.Uid).EntityName), ("shoved", Name: IoCManager.Resolve().GetComponent(target.Uid).EntityName))); + source.PopupMessageCursor(Loc.GetString("hands-component-shove-success-message", ("shoved", Name: IoCManager.Resolve().GetComponent(target.Uid).EntityName))); } } } diff --git a/Content.Server/Headset/HeadsetComponent.cs b/Content.Server/Headset/HeadsetComponent.cs index a9c6cd7e54..b0e8fdbea7 100644 --- a/Content.Server/Headset/HeadsetComponent.cs +++ b/Content.Server/Headset/HeadsetComponent.cs @@ -69,7 +69,7 @@ namespace Content.Server.Headset msg.Channel = ChatChannel.Radio; msg.Message = message; //Square brackets are added here to avoid issues with escaping - msg.MessageWrap = Loc.GetString("chat-radio-message-wrap", ("channel", $"\\[{channel}\\]"), ("name", source.Name)); + msg.MessageWrap = Loc.GetString("chat-radio-message-wrap", ("channel", $"\\[{channel}\\]"), ("name", Name: IoCManager.Resolve().GetComponent(source.Uid).EntityName)); _netManager.ServerSendMessage(msg, playerChannel); } } diff --git a/Content.Server/Interaction/InteractionSystem.cs b/Content.Server/Interaction/InteractionSystem.cs index 64ee823260..e970edabbc 100644 --- a/Content.Server/Interaction/InteractionSystem.cs +++ b/Content.Server/Interaction/InteractionSystem.cs @@ -329,7 +329,7 @@ namespace Content.Server.Interaction if (target != null && !user.IsInSameOrParentContainer(target) && !CanAccessViaStorage(user.Uid, target.Uid)) { Logger.WarningS("system.interaction", - $"User entity named {user.Name} clicked on object {target.Name} that isn't the parent, child, or in the same container"); + $"User entity named {IoCManager.Resolve().GetComponent(user.Uid).EntityName} clicked on object {IoCManager.Resolve().GetComponent(target.Uid).EntityName} that isn't the parent, child, or in the same container"); return; } @@ -377,7 +377,7 @@ namespace Content.Server.Interaction if (coordinates.GetMapId(_entityManager) != IoCManager.Resolve().GetComponent(user.Uid).MapID) { Logger.WarningS("system.interaction", - $"User entity named {user.Name} clicked on a map they aren't located on"); + $"User entity named {IoCManager.Resolve().GetComponent(user.Uid).EntityName} clicked on a map they aren't located on"); return false; } @@ -471,7 +471,7 @@ namespace Content.Server.Interaction if (targetEnt != null && !user.IsInSameOrParentContainer(targetEnt) && !CanAccessViaStorage(user.Uid, targetEnt.Uid)) { Logger.WarningS("system.interaction", - $"User entity named {user.Name} clicked on object {targetEnt.Name} that isn't the parent, child, or in the same container"); + $"User entity named {IoCManager.Resolve().GetComponent(user.Uid).EntityName} clicked on object {IoCManager.Resolve().GetComponent(targetEnt.Uid).EntityName} that isn't the parent, child, or in the same container"); return; } diff --git a/Content.Server/Inventory/Components/DebugEquipComponent.cs b/Content.Server/Inventory/Components/DebugEquipComponent.cs index e5c375cf3c..ee7a0277d1 100644 --- a/Content.Server/Inventory/Components/DebugEquipComponent.cs +++ b/Content.Server/Inventory/Components/DebugEquipComponent.cs @@ -2,6 +2,7 @@ using Content.Shared.Inventory; using Content.Shared.Popups; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; namespace Content.Server.Inventory.Components { @@ -16,22 +17,22 @@ namespace Content.Server.Inventory.Components void IEquipped.Equipped(EquippedEventArgs eventArgs) { - eventArgs.User.PopupMessage("equipped " + Owner.Name); + eventArgs.User.PopupMessage("equipped " + IoCManager.Resolve().GetComponent(Owner.Uid).EntityName); } void IEquippedHand.EquippedHand(EquippedHandEventArgs eventArgs) { - eventArgs.User.PopupMessage("equipped hand " + Owner.Name); + eventArgs.User.PopupMessage("equipped hand " + IoCManager.Resolve().GetComponent(Owner.Uid).EntityName); } void IUnequipped.Unequipped(UnequippedEventArgs eventArgs) { - eventArgs.User.PopupMessage("unequipped " + Owner.Name); + eventArgs.User.PopupMessage("unequipped " + IoCManager.Resolve().GetComponent(Owner.Uid).EntityName); } void IUnequippedHand.UnequippedHand(UnequippedHandEventArgs eventArgs) { - eventArgs.User.PopupMessage("unequipped hand" + Owner.Name); + eventArgs.User.PopupMessage("unequipped hand" + IoCManager.Resolve().GetComponent(Owner.Uid).EntityName); } } } diff --git a/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs b/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs index 0180fbae29..e977aaa4c1 100644 --- a/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs +++ b/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs @@ -41,7 +41,7 @@ namespace Content.Server.Kitchen.Components if (!string.IsNullOrEmpty(_meatPrototype)) { var meat = IoCManager.Resolve().SpawnEntity(_meatPrototype, IoCManager.Resolve().GetComponent(Owner.Uid).Coordinates); - meat.Name = _meatName; + IoCManager.Resolve().GetComponent(meat.Uid).EntityName = _meatName; } if (_meatParts != 0) diff --git a/Content.Server/Labels/Label/HandLabelerSystem.cs b/Content.Server/Labels/Label/HandLabelerSystem.cs index bba3fdefb3..a0e9f3db62 100644 --- a/Content.Server/Labels/Label/HandLabelerSystem.cs +++ b/Content.Server/Labels/Label/HandLabelerSystem.cs @@ -53,7 +53,7 @@ namespace Content.Server.Labels LabelComponent label = target.EnsureComponent(); if (label.OriginalName != null) - target.Name = label.OriginalName; + IoCManager.Resolve().GetComponent(target.Uid).EntityName = label.OriginalName; label.OriginalName = null; if (handLabeler.AssignedLabel == string.Empty) @@ -63,8 +63,9 @@ namespace Content.Server.Labels return; } - label.OriginalName = target.Name; - target.Name += $" ({handLabeler.AssignedLabel})"; + label.OriginalName = IoCManager.Resolve().GetComponent(target.Uid).EntityName; + string val = IoCManager.Resolve().GetComponent(target.Uid).EntityName + $" ({handLabeler.AssignedLabel})"; + IoCManager.Resolve().GetComponent(target.Uid).EntityName = val; label.CurrentLabel = handLabeler.AssignedLabel; result = Loc.GetString("hand-labeler-successfully-applied"); } diff --git a/Content.Server/Light/Components/ExpendableLightComponent.cs b/Content.Server/Light/Components/ExpendableLightComponent.cs index c914090b46..42561642e3 100644 --- a/Content.Server/Light/Components/ExpendableLightComponent.cs +++ b/Content.Server/Light/Components/ExpendableLightComponent.cs @@ -155,7 +155,7 @@ namespace Content.Server.Light.Components case ExpendableLightState.Fading: CurrentState = ExpendableLightState.Dead; - Owner.Name = SpentName; + IoCManager.Resolve().GetComponent(Owner.Uid).EntityName = SpentName; IoCManager.Resolve().GetComponent(Owner.Uid).EntityDescription = SpentDesc; UpdateSpriteAndSounds(Activated); diff --git a/Content.Server/Lock/LockSystem.cs b/Content.Server/Lock/LockSystem.cs index 37ff61597a..5b3be3d8bd 100644 --- a/Content.Server/Lock/LockSystem.cs +++ b/Content.Server/Lock/LockSystem.cs @@ -64,7 +64,7 @@ namespace Content.Server.Lock args.PushText(Loc.GetString(lockComp.Locked ? "lock-comp-on-examined-is-locked" : "lock-comp-on-examined-is-unlocked", - ("entityName", lockComp.Owner.Name))); + ("entityName", Name: IoCManager.Resolve().GetComponent(lockComp.Owner.Uid).EntityName))); } public bool TryLock(EntityUid uid, IEntity user, LockComponent? lockComp = null) @@ -78,7 +78,7 @@ namespace Content.Server.Lock if (!HasUserAccess(uid, user, quiet: false)) return false; - lockComp.Owner.PopupMessage(user, Loc.GetString("lock-comp-do-lock-success", ("entityName",lockComp.Owner.Name))); + lockComp.Owner.PopupMessage(user, Loc.GetString("lock-comp-do-lock-success", ("entityName",Name: IoCManager.Resolve().GetComponent(lockComp.Owner.Uid).EntityName))); lockComp.Locked = true; if(lockComp.LockSound != null) @@ -107,7 +107,7 @@ namespace Content.Server.Lock if (!HasUserAccess(uid, user, quiet: false)) return false; - lockComp.Owner.PopupMessage(user, Loc.GetString("lock-comp-do-unlock-success", ("entityName", lockComp.Owner.Name))); + lockComp.Owner.PopupMessage(user, Loc.GetString("lock-comp-do-unlock-success", ("entityName", Name: IoCManager.Resolve().GetComponent(lockComp.Owner.Uid).EntityName))); lockComp.Locked = false; if(lockComp.UnlockSound != null) diff --git a/Content.Server/Medical/MedicalScannerSystem.cs b/Content.Server/Medical/MedicalScannerSystem.cs index 06cd9eaa12..be17118dcc 100644 --- a/Content.Server/Medical/MedicalScannerSystem.cs +++ b/Content.Server/Medical/MedicalScannerSystem.cs @@ -38,7 +38,7 @@ namespace Content.Server.Medical Verb verb = new(); verb.Act = () => component.InsertBody(args.Using); verb.Category = VerbCategory.Insert; - verb.Text = args.Using.Name; + verb.Text = IoCManager.Resolve().GetComponent(args.Using.Uid).EntityName; args.Verbs.Add(verb); } diff --git a/Content.Server/Mind/Components/MindComponent.cs b/Content.Server/Mind/Components/MindComponent.cs index 4a6a470a75..cfe016197b 100644 --- a/Content.Server/Mind/Components/MindComponent.cs +++ b/Content.Server/Mind/Components/MindComponent.cs @@ -115,7 +115,8 @@ namespace Content.Server.Mind.Components if (Mind != null) { - ghost.Name = Mind.CharacterName ?? string.Empty; + string? val = Mind.CharacterName ?? string.Empty; + IoCManager.Resolve().GetComponent(ghost.Uid).EntityName = val; Mind.TransferTo(ghost.Uid); } }); diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs index cc5af10676..7a668b2f81 100644 --- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs @@ -241,7 +241,7 @@ namespace Content.Server.Nutrition.EntitySystems if (!drink.Opened) { _popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-not-open", - ("owner", drink.Owner.Name)), uid, Filter.Entities(userUid)); + ("owner", Name: IoCManager.Resolve().GetComponent(drink.Owner.Uid).EntityName)), uid, Filter.Entities(userUid)); return true; } @@ -252,7 +252,7 @@ namespace Content.Server.Nutrition.EntitySystems drinkSolution.DrainAvailable <= 0) { _popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-is-empty", - ("entity", drink.Owner.Name)), uid, Filter.Entities(userUid)); + ("entity", Name: IoCManager.Resolve().GetComponent(drink.Owner.Uid).EntityName)), uid, Filter.Entities(userUid)); return true; } @@ -324,7 +324,7 @@ namespace Content.Server.Nutrition.EntitySystems if (!drink.Opened) { _popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-not-open", - ("owner", drink.Owner.Name)), uid, Filter.Entities(userUid)); + ("owner", Name: IoCManager.Resolve().GetComponent(drink.Owner.Uid).EntityName)), uid, Filter.Entities(userUid)); return true; } @@ -332,7 +332,7 @@ namespace Content.Server.Nutrition.EntitySystems drinkSolution.DrainAvailable <= 0) { _popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-is-empty", - ("entity", drink.Owner.Name)), uid, Filter.Entities(userUid)); + ("entity", Name: IoCManager.Resolve().GetComponent(drink.Owner.Uid).EntityName)), uid, Filter.Entities(userUid)); return true; } diff --git a/Content.Server/Objectives/Conditions/KillPersonCondition.cs b/Content.Server/Objectives/Conditions/KillPersonCondition.cs index cbae4d8119..8047742ca8 100644 --- a/Content.Server/Objectives/Conditions/KillPersonCondition.cs +++ b/Content.Server/Objectives/Conditions/KillPersonCondition.cs @@ -1,4 +1,6 @@ using Content.Server.Objectives.Interfaces; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Utility; @@ -9,7 +11,23 @@ namespace Content.Server.Objectives.Conditions protected Mind.Mind? Target; public abstract IObjectiveCondition GetAssigned(Mind.Mind mind); - public string Title => Loc.GetString("objective-condition-kill-person-title", ("targetName", Target?.CharacterName ?? Target?.OwnedEntity?.Name ?? string.Empty)); + public string Title + { + get + { + var targetName = string.Empty; + + if (Target == null) + return Loc.GetString("objective-condition-kill-person-title", ("targetName", targetName)); + + if(Target.CharacterName != null) + targetName = Target.CharacterName; + else if (Target.OwnedEntity != null) + targetName = IoCManager.Resolve().GetComponent(Target.OwnedEntity.Uid).EntityName; + + return Loc.GetString("objective-condition-kill-person-title", ("targetName", targetName)); + } + } public string Description => Loc.GetString("objective-condition-kill-person-description"); diff --git a/Content.Server/PAI/PAISystem.cs b/Content.Server/PAI/PAISystem.cs index b7429ba162..eaead6ee84 100644 --- a/Content.Server/PAI/PAISystem.cs +++ b/Content.Server/PAI/PAISystem.cs @@ -73,7 +73,8 @@ namespace Content.Server.PAI } // Ownership tag - component.Owner.Name = Loc.GetString("pai-system-pai-name", ("owner", args.User)); + string val = Loc.GetString("pai-system-pai-name", ("owner", args.User)); + IoCManager.Resolve().GetComponent(component.Owner.Uid).EntityName = val; var ghostFinder = EntityManager.EnsureComponent(uid); diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs index d8e30ca153..898c48964e 100644 --- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs +++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs @@ -153,10 +153,10 @@ namespace Content.Server.Pointing.EntitySystems : Loc.GetString("pointing-system-point-at-other", ("other", pointed)); viewerMessage = player == pointed - ? Loc.GetString("pointing-system-point-at-self-others", ("otherName", player.Name), ("other", player)) - : Loc.GetString("pointing-system-point-at-other-others", ("otherName", player.Name), ("other", pointed)); + ? Loc.GetString("pointing-system-point-at-self-others", ("otherName", Name: IoCManager.Resolve().GetComponent(player.Uid).EntityName), ("other", player)) + : Loc.GetString("pointing-system-point-at-other-others", ("otherName", Name: IoCManager.Resolve().GetComponent(player.Uid).EntityName), ("other", pointed)); - viewerPointedAtMessage = Loc.GetString("pointing-system-point-at-you-other", ("otherName", player.Name)); + viewerPointedAtMessage = Loc.GetString("pointing-system-point-at-you-other", ("otherName", Name: IoCManager.Resolve().GetComponent(player.Uid).EntityName)); } else { @@ -171,7 +171,7 @@ namespace Content.Server.Pointing.EntitySystems selfMessage = Loc.GetString("pointing-system-point-at-tile", ("tileName", tileDef.DisplayName)); - viewerMessage = Loc.GetString("pointing-system-other-point-at-tile", ("otherName", player.Name), ("tileName", tileDef.DisplayName)); + viewerMessage = Loc.GetString("pointing-system-other-point-at-tile", ("otherName", Name: IoCManager.Resolve().GetComponent(player.Uid).EntityName), ("tileName", tileDef.DisplayName)); } _pointers[session!] = _gameTiming.CurTime; diff --git a/Content.Server/Power/EntitySystems/BaseChargerSystem.cs b/Content.Server/Power/EntitySystems/BaseChargerSystem.cs index 649c5ca71c..6d15ca890e 100644 --- a/Content.Server/Power/EntitySystems/BaseChargerSystem.cs +++ b/Content.Server/Power/EntitySystems/BaseChargerSystem.cs @@ -43,7 +43,7 @@ namespace Content.Server.Power.EntitySystems return; Verb verb = new(); - verb.Text = component.Container.ContainedEntity!.Name; + verb.Text = IoCManager.Resolve().GetComponent(component.Container.ContainedEntity!.Uid).EntityName; verb.Category = VerbCategory.Eject; verb.Act = () => component.RemoveItem(args.User); args.Verbs.Add(verb); @@ -60,7 +60,7 @@ namespace Content.Server.Power.EntitySystems return; Verb verb = new(); - verb.Text = args.Using.Name; + verb.Text = IoCManager.Resolve().GetComponent(args.Using.Uid).EntityName; verb.Category = VerbCategory.Insert; verb.Act = () => component.TryInsertItem(args.Using); args.Verbs.Add(verb); diff --git a/Content.Server/PowerCell/PowerCellSystem.cs b/Content.Server/PowerCell/PowerCellSystem.cs index b193ade3ca..d5dbc0c86f 100644 --- a/Content.Server/PowerCell/PowerCellSystem.cs +++ b/Content.Server/PowerCell/PowerCellSystem.cs @@ -52,7 +52,7 @@ namespace Content.Server.PowerCell return; Verb verb = new(); - verb.Text = args.Using.Name; + verb.Text = IoCManager.Resolve().GetComponent(args.Using.Uid).EntityName; verb.Category = VerbCategory.Insert; verb.Act = () => component.InsertCell(args.Using); args.Verbs.Add(verb); diff --git a/Content.Server/Sandbox/SandboxManager.cs b/Content.Server/Sandbox/SandboxManager.cs index 3825323e0b..6025742e26 100644 --- a/Content.Server/Sandbox/SandboxManager.cs +++ b/Content.Server/Sandbox/SandboxManager.cs @@ -173,7 +173,7 @@ namespace Content.Server.Sandbox var card = _entityManager.SpawnEntity("CaptainIDCard", IoCManager.Resolve().GetComponent(player.AttachedEntity.Uid).Coordinates); UpgradeId(card); - IoCManager.Resolve().GetComponent(card.Uid).FullName = player.AttachedEntity.Name; + IoCManager.Resolve().GetComponent(card.Uid).FullName = IoCManager.Resolve().GetComponent(player.AttachedEntity.Uid).EntityName; return card; } } diff --git a/Content.Server/Storage/Components/SecretStashComponent.cs b/Content.Server/Storage/Components/SecretStashComponent.cs index fa6af7a848..eb736bbf79 100644 --- a/Content.Server/Storage/Components/SecretStashComponent.cs +++ b/Content.Server/Storage/Components/SecretStashComponent.cs @@ -28,7 +28,7 @@ namespace Content.Server.Storage.Components [ViewVariables] private ContainerSlot _itemContainer = default!; - public string SecretPartName => _secretPartNameOverride ?? Loc.GetString("comp-secret-stash-secret-part-name", ("name", Owner.Name)); + public string SecretPartName => _secretPartNameOverride ?? Loc.GetString("comp-secret-stash-secret-part-name", ("name", IoCManager.Resolve().GetComponent(Owner.Uid).EntityName)); protected override void Initialize() { diff --git a/Content.Server/Strip/StrippableComponent.cs b/Content.Server/Strip/StrippableComponent.cs index ff462456ff..929fbb5ef6 100644 --- a/Content.Server/Strip/StrippableComponent.cs +++ b/Content.Server/Strip/StrippableComponent.cs @@ -114,7 +114,12 @@ namespace Content.Server.Strip foreach (var slot in inventory.Slots) { - dictionary[slot] = inventory.GetSlotItem(slot)?.Owner.Name ?? "None"; + var name = "None"; + + if (inventory.GetSlotItem(slot) is { } item) + name = item.Owner.Name; + + dictionary[slot] = name; } return dictionary; diff --git a/Content.Server/Stunnable/StunSystem.cs b/Content.Server/Stunnable/StunSystem.cs index cfc214f0e2..b91cc24d5c 100644 --- a/Content.Server/Stunnable/StunSystem.cs +++ b/Content.Server/Stunnable/StunSystem.cs @@ -48,8 +48,8 @@ namespace Content.Server.Stunnable if (target != null) { // TODO: Use PopupSystem - source.PopupMessageOtherClients(Loc.GetString("stunned-component-disarm-success-others", ("source", source.Name), ("target", target.Name))); - source.PopupMessageCursor(Loc.GetString("stunned-component-disarm-success", ("target", target.Name))); + source.PopupMessageOtherClients(Loc.GetString("stunned-component-disarm-success-others", ("source", Name: IoCManager.Resolve().GetComponent(source.Uid).EntityName), ("target", Name: IoCManager.Resolve().GetComponent(target.Uid).EntityName))); + source.PopupMessageCursor(Loc.GetString("stunned-component-disarm-success", ("target", Name: IoCManager.Resolve().GetComponent(target.Uid).EntityName))); } } diff --git a/Content.Server/Toilet/ToiletComponent.cs b/Content.Server/Toilet/ToiletComponent.cs index 76431a8697..d566271e3f 100644 --- a/Content.Server/Toilet/ToiletComponent.cs +++ b/Content.Server/Toilet/ToiletComponent.cs @@ -156,20 +156,20 @@ namespace Content.Server.Toilet if (IoCManager.Resolve().TryGetComponent(victim.Uid, out var body) && body.HasPartOfType(BodyPartType.Head)) { - var othersMessage = Loc.GetString("toilet-component-suicide-head-message-others", ("victim",victim.Name),("owner", Owner.Name)); + var othersMessage = Loc.GetString("toilet-component-suicide-head-message-others", ("victim",Name: IoCManager.Resolve().GetComponent(victim.Uid).EntityName),("owner", Name: IoCManager.Resolve().GetComponent(Owner.Uid).EntityName)); victim.PopupMessageOtherClients(othersMessage); - var selfMessage = Loc.GetString("toilet-component-suicide-head-message", ("owner", Owner.Name)); + var selfMessage = Loc.GetString("toilet-component-suicide-head-message", ("owner", Name: IoCManager.Resolve().GetComponent(Owner.Uid).EntityName)); victim.PopupMessage(selfMessage); return SuicideKind.Asphyxiation; } else { - var othersMessage = Loc.GetString("toilet-component-suicide-message-others",("victim", victim.Name),("owner", Owner.Name)); + var othersMessage = Loc.GetString("toilet-component-suicide-message-others",("victim", Name: IoCManager.Resolve().GetComponent(victim.Uid).EntityName),("owner", Name: IoCManager.Resolve().GetComponent(Owner.Uid).EntityName)); victim.PopupMessageOtherClients(othersMessage); - var selfMessage = Loc.GetString("toilet-component-suicide-message", ("owner",Owner.Name)); + var selfMessage = Loc.GetString("toilet-component-suicide-message", ("owner",Name: IoCManager.Resolve().GetComponent(Owner.Uid).EntityName)); victim.PopupMessage(selfMessage); return SuicideKind.Blunt; diff --git a/Content.Server/VendingMachines/VendingMachineComponent.cs b/Content.Server/VendingMachines/VendingMachineComponent.cs index 6a977fcf80..f753531ff1 100644 --- a/Content.Server/VendingMachines/VendingMachineComponent.cs +++ b/Content.Server/VendingMachines/VendingMachineComponent.cs @@ -82,7 +82,7 @@ namespace Content.Server.VendingMachines return; } - Owner.Name = packPrototype.Name; + IoCManager.Resolve().GetComponent(Owner.Uid).EntityName = packPrototype.Name; _animationDuration = TimeSpan.FromSeconds(packPrototype.AnimationDuration); _spriteName = packPrototype.SpriteName; if (!string.IsNullOrEmpty(_spriteName)) diff --git a/Content.Server/Weapon/Ranged/Barrels/BarrelSystem.cs b/Content.Server/Weapon/Ranged/Barrels/BarrelSystem.cs index 7c95bc382c..436f2fbd60 100644 --- a/Content.Server/Weapon/Ranged/Barrels/BarrelSystem.cs +++ b/Content.Server/Weapon/Ranged/Barrels/BarrelSystem.cs @@ -75,7 +75,7 @@ namespace Content.Server.Weapon.Ranged.Barrels return; Verb verb = new(); - verb.Text = component.PowerCell.Owner.Name; + verb.Text = IoCManager.Resolve().GetComponent(component.PowerCell.Owner.Uid).EntityName; verb.Category = VerbCategory.Eject; verb.Act = () => component.TryEjectCell(args.User); args.Verbs.Add(verb); @@ -92,7 +92,7 @@ namespace Content.Server.Weapon.Ranged.Barrels return; Verb verb = new(); - verb.Text = args.Using.Name; + verb.Text = IoCManager.Resolve().GetComponent(args.Using.Uid).EntityName; verb.Category = VerbCategory.Insert; verb.Act = () => component.TryInsertPowerCell(args.Using); args.Verbs.Add(verb); @@ -111,7 +111,7 @@ namespace Content.Server.Weapon.Ranged.Barrels return; Verb verb = new(); - verb.Text = component.MagazineContainer.ContainedEntity!.Name; + verb.Text = IoCManager.Resolve().GetComponent(component.MagazineContainer.ContainedEntity!.Uid).EntityName; verb.Category = VerbCategory.Eject; verb.Act = () => component.RemoveMagazine(args.User); args.Verbs.Add(verb); @@ -140,7 +140,7 @@ namespace Content.Server.Weapon.Ranged.Barrels // Insert mag verb Verb insert = new(); - insert.Text = args.Using.Name; + insert.Text = IoCManager.Resolve().GetComponent(args.Using.Uid).EntityName; insert.Category = VerbCategory.Insert; insert.Act = () => component.InsertMagazine(args.User, args.Using); args.Verbs.Add(insert); diff --git a/Content.Shared/Actions/Behaviors/IActionBehavior.cs b/Content.Shared/Actions/Behaviors/IActionBehavior.cs index 83d8638b64..1d808e8ab8 100644 --- a/Content.Shared/Actions/Behaviors/IActionBehavior.cs +++ b/Content.Shared/Actions/Behaviors/IActionBehavior.cs @@ -37,7 +37,7 @@ namespace Content.Shared.Actions.Behaviors ActionType = actionType; if (!IoCManager.Resolve().TryGetComponent(Performer.Uid, out PerformerActions)) { - throw new InvalidOperationException($"performer {performer.Name} tried to perform action {actionType} " + + throw new InvalidOperationException($"performer {IoCManager.Resolve().GetComponent(performer.Uid).EntityName} tried to perform action {actionType} " + $" but the performer had no actions component," + " which should never occur"); } diff --git a/Content.Shared/Actions/Behaviors/Item/IItemActionBehavior.cs b/Content.Shared/Actions/Behaviors/Item/IItemActionBehavior.cs index ce7fff3f22..df1b741abf 100644 --- a/Content.Shared/Actions/Behaviors/Item/IItemActionBehavior.cs +++ b/Content.Shared/Actions/Behaviors/Item/IItemActionBehavior.cs @@ -43,8 +43,8 @@ namespace Content.Shared.Actions.Behaviors.Item Item = item; if (!IoCManager.Resolve().TryGetComponent(Item.Uid, out ItemActions)) { - throw new InvalidOperationException($"performer {performer.Name} tried to perform item action {actionType} " + - $" for item {Item.Name} but the item had no ItemActionsComponent," + + throw new InvalidOperationException($"performer {IoCManager.Resolve().GetComponent(performer.Uid).EntityName} tried to perform item action {actionType} " + + $" for item {IoCManager.Resolve().GetComponent(Item.Uid).EntityName} but the item had no ItemActionsComponent," + " which should never occur"); } } diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs index c73cd8b605..d61cb8bc58 100644 --- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs @@ -81,7 +81,7 @@ namespace Content.Shared.Containers.ItemSlots var itemSlots = EntityManager.EnsureComponent(uid); slot.ContainerSlot = ContainerHelpers.EnsureContainer(itemSlots.Owner, id); if (itemSlots.Slots.ContainsKey(id)) - Logger.Error($"Duplicate item slot key. Entity: {itemSlots.Owner.Name} ({uid}), key: {id}"); + Logger.Error($"Duplicate item slot key. Entity: {IoCManager.Resolve().GetComponent(itemSlots.Owner.Uid).EntityName} ({uid}), key: {id}"); itemSlots.Slots[id] = slot; } @@ -344,7 +344,7 @@ namespace Content.Shared.Containers.ItemSlots var verbSubject = slot.Name != string.Empty ? Loc.GetString(slot.Name) - : slot.Item!.Name ?? string.Empty; + : IoCManager.Resolve().GetComponent(slot.Item!.Uid).EntityName ?? string.Empty; Verb verb = new(); verb.Act = () => TryEjectToHands(uid, slot, args.User.Uid); @@ -379,7 +379,7 @@ namespace Content.Shared.Containers.ItemSlots var verbSubject = slot.Name != string.Empty ? Loc.GetString(slot.Name) - : slot.Item!.Name ?? string.Empty; + : IoCManager.Resolve().GetComponent(slot.Item!.Uid).EntityName ?? string.Empty; Verb takeVerb = new(); takeVerb.Act = () => TryEjectToHands(uid, slot, args.User.Uid); @@ -405,7 +405,7 @@ namespace Content.Shared.Containers.ItemSlots var verbSubject = slot.Name != string.Empty ? Loc.GetString(slot.Name) - : args.Using.Name ?? string.Empty; + : IoCManager.Resolve().GetComponent(args.Using.Uid).EntityName ?? string.Empty; Verb insertVerb = new(); insertVerb.Act = () => Insert(uid, slot, args.Using);