tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inline Description

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 11:15:12 +01:00
parent 70bbd8c502
commit f06bfc22ce
9 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Atmos/Components/AtmosPlaqueComponent.cs
View File

@@ -55,7 +55,7 @@ namespace Content.Server.Atmos.Components
return;
}
Owner.Description = _type switch
var val = _type switch
{
PlaqueType.Zumos =>
"This plaque commemorates the rise of the Atmos ZUM division. May they carry the torch that the Atmos ZAS, LINDA and FEA divisions left behind.",
@@ -68,6 +68,7 @@ namespace Content.Server.Atmos.Components
PlaqueType.Unset => "Uhm",
_ => "Uhm",
};
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Uid).EntityDescription = val;
Owner.Name = _type switch
{

2
Content.Server/BarSign/Systems/BarSignSystem.cs
View File

@@ -90,7 +90,7 @@ namespace Content.Server.BarSign.Systems
component.Owner.Name = Loc.GetString("barsign-component-name");
}
component.Owner.Description = prototype.Description;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Owner.Uid).EntityDescription = prototype.Description;
}
}
}

3
Content.Server/Botany/Seed.cs
View File

@@ -342,7 +342,8 @@ namespace Content.Server.Botany
if (Mysterious)
{
entity.Name += "?";
entity.Description += " " + Loc.GetString("botany-mysterious-description-addon");
string val = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityDescription + (" " + Loc.GetString("botany-mysterious-description-addon"));
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityDescription = val;
}
}

3
Content.Server/Chemistry/Components/TransformableContainerComponent.cs
View File

@@ -2,6 +2,7 @@ using Content.Server.Chemistry.Components.SolutionManager;
using Content.Shared.Chemistry.Reagent;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Utility;
namespace Content.Server.Chemistry.Components
@@ -29,7 +30,7 @@ namespace Content.Server.Chemistry.Components
}
InitialName = Owner.Name;
InitialDescription = Owner.Description;
InitialDescription = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Uid).EntityDescription;
}
protected override void Startup()

4
Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs
View File

@@ -57,7 +57,7 @@ namespace Content.Server.Chemistry.EntitySystems
}
ownerEntity.Name = proto.Name + " glass";
ownerEntity.Description = proto.Description;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(ownerEntity.Uid).EntityDescription = proto.Description;
component.CurrentReagent = proto;
component.Transformed = true;
}
@@ -75,7 +75,7 @@ namespace Content.Server.Chemistry.EntitySystems
}
component.Owner.Name = component.InitialName;
component.Owner.Description = component.InitialDescription;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(component.Owner.Uid).EntityDescription = component.InitialDescription;
}
}
}

2
Content.Server/Cuffs/Components/CuffableComponent.cs
View File

@@ -268,7 +268,7 @@ namespace Content.Server.Cuffs.Components
cuff.Broken = true;
cuffsToRemove.Name = cuff.BrokenName;
cuffsToRemove.Description = cuff.BrokenDesc;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(cuffsToRemove.Uid).EntityDescription = cuff.BrokenDesc;
if (cuffsToRemove.TryGetComponent<SpriteComponent>(out var sprite) && cuff.BrokenState != null)
{

3
Content.Server/Light/Components/ExpendableLightComponent.cs
View File

@@ -5,6 +5,7 @@ using Content.Shared.Light.Component;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Player;
using Robust.Shared.ViewVariables;
@@ -155,7 +156,7 @@ namespace Content.Server.Light.Components
CurrentState = ExpendableLightState.Dead;
Owner.Name = SpentName;
Owner.Description = SpentDesc;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Uid).EntityDescription = SpentDesc;
UpdateSpriteAndSounds(Activated);
UpdateVisualizer();

3
Content.Server/Paper/PaperComponent.cs
View File

@@ -6,6 +6,7 @@ using Content.Shared.Paper;
using Content.Shared.Tag;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
@@ -95,7 +96,7 @@ namespace Content.Server.Paper
appearance.SetData(PaperVisuals.Status, PaperStatus.Written);
}
Owner.Description = "";
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Uid).EntityDescription = "";
UpdateUserInterface();
}

4
Content.Shared/Examine/ExamineSystemShared.cs
View File

@@ -212,9 +212,9 @@ namespace Content.Shared.Examine
var doNewline = false;
//Add an entity description if one is declared
if (!string.IsNullOrEmpty(entity.Description))
if (!string.IsNullOrEmpty(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityDescription))
{
message.AddText(entity.Description);
message.AddText(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityDescription);
doNewline = true;
}