diff --git a/Content.Server/GameObjects/Components/AI/AiFactionTagComponent.cs b/Content.Server/GameObjects/Components/AI/AiFactionTagComponent.cs index 78902e8404..146a7d52ed 100644 --- a/Content.Server/GameObjects/Components/AI/AiFactionTagComponent.cs +++ b/Content.Server/GameObjects/Components/AI/AiFactionTagComponent.cs @@ -15,7 +15,7 @@ namespace Content.Server.GameObjects.Components.AI public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); - + serializer.DataReadWriteFunction( "factions", new List(), @@ -40,10 +40,10 @@ namespace Content.Server.GameObjects.Components.AI public enum Faction { None = 0, - NanoTransen = 1 << 0, + NanoTrasen = 1 << 0, SimpleHostile = 1 << 1, SimpleNeutral = 1 << 2, Syndicate = 1 << 3, Xeno = 1 << 4, } -} \ No newline at end of file +} diff --git a/Content.Server/GameObjects/EntitySystems/AI/AiFactionTagSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/AiFactionTagSystem.cs index 6d84b34939..dc83c30d67 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/AiFactionTagSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/AiFactionTagSystem.cs @@ -19,19 +19,19 @@ namespace Content.Server.GameObjects.EntitySystems.AI private readonly Dictionary _hostileFactions = new() { - {Faction.NanoTransen, + {Faction.NanoTrasen, Faction.SimpleHostile | Faction.Syndicate | Faction.Xeno}, {Faction.SimpleHostile, - Faction.NanoTransen | Faction.Syndicate + Faction.NanoTrasen | Faction.Syndicate }, // What makes a man turn neutral? {Faction.SimpleNeutral, Faction.None }, {Faction.Syndicate, - Faction.NanoTransen | Faction.SimpleHostile | Faction.Xeno}, + Faction.NanoTrasen | Faction.SimpleHostile | Faction.Xeno}, {Faction.Xeno, - Faction.NanoTransen | Faction.Syndicate}, + Faction.NanoTrasen | Faction.Syndicate}, }; public Faction GetFactions(IEntity entity) => diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index b5f1e674d4..9c76c76c2a 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -6,7 +6,7 @@ - type: technology name: "basic research technology" id: BasicResearch - description: Nanotransen basic research technologies. + description: Nanotrasen basic research technologies. icon: Constructible/Power/server.rsi/server-on.png requiredPoints: 250 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml index 75c07bbcb8..9282d2f284 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml @@ -12,7 +12,7 @@ startingGear: AssistantGear - type: AiFactionTag factions: - - NanoTransen + - NanoTrasen - type: entity save: false diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index f6a5733558..671a69b4db 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -19,4 +19,4 @@ - type: HumanInventoryController - type: AiFactionTag factions: - - NanoTransen + - NanoTrasen diff --git a/SpaceStation14.sln.DotSettings b/SpaceStation14.sln.DotSettings index 7c1e5ada75..29ca78c389 100644 --- a/SpaceStation14.sln.DotSettings +++ b/SpaceStation14.sln.DotSettings @@ -153,7 +153,7 @@ True True True - True + True True True True