Begin to use text macros (#914)
This commit is contained in:
@@ -6,7 +6,8 @@
|
||||
using Robust.Shared.Interfaces.Map;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Localization;
|
||||
using Robust.Shared.Prototypes;
|
||||
using Robust.Shared.Localization.Macros;
|
||||
using Robust.Shared.Prototypes;
|
||||
|
||||
namespace Content.Shared
|
||||
{
|
||||
@@ -25,6 +26,9 @@
|
||||
{
|
||||
IoCManager.InjectDependencies(this);
|
||||
|
||||
var textMacroFactory = IoCManager.Resolve<ITextMacroFactory>();
|
||||
textMacroFactory.DoAutoRegistrations();
|
||||
|
||||
// Default to en-US.
|
||||
_localizationManager.LoadCulture(new CultureInfo(Culture));
|
||||
}
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
using System;
|
||||
using Content.Shared.Preferences;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.Localization.Macros;
|
||||
using Robust.Shared.Serialization;
|
||||
using Robust.Shared.ViewVariables;
|
||||
|
||||
namespace Content.Shared.GameObjects.Components.Mobs
|
||||
{
|
||||
public abstract class SharedHumanoidAppearanceComponent : Component
|
||||
public abstract class SharedHumanoidAppearanceComponent : Component, IGenderable
|
||||
{
|
||||
private HumanoidCharacterAppearance _appearance;
|
||||
private Sex _sex;
|
||||
@@ -36,6 +37,13 @@ namespace Content.Shared.GameObjects.Components.Mobs
|
||||
}
|
||||
}
|
||||
|
||||
public Gender Gender => Sex switch
|
||||
{
|
||||
Sex.Female => Gender.Female,
|
||||
Sex.Male => Gender.Male,
|
||||
_ => Gender.Epicene,
|
||||
};
|
||||
|
||||
public override ComponentState GetComponentState()
|
||||
{
|
||||
return new HumanoidAppearanceComponentState(Appearance, Sex);
|
||||
|
||||
Reference in New Issue
Block a user