diff --git a/Resources/Prototypes/Corvax/Datasets/Names/military.yml b/Resources/Prototypes/Corvax/Datasets/Names/military.yml index 8fe40c95767..a26be9a50dd 100644 --- a/Resources/Prototypes/Corvax/Datasets/Names/military.yml +++ b/Resources/Prototypes/Corvax/Datasets/Names/military.yml @@ -1,21 +1,3 @@ -- type: dataset - id: NamesFirstMilitaryLeaderCorvax - values: - - Коммандер - - Полковник - - Подполковник - - Майор - - Лейтенант - -- type: dataset - id: NamesFirstMilitaryCorvax - values: - - Прапорщик - - Старшина - - Сержант - - Капрал - - Ефрейтор - - type: dataset id: NamesLastERTCallsign values: diff --git a/Resources/Prototypes/Datasets/Names/military.yml b/Resources/Prototypes/Datasets/Names/military.yml index 5d5df6dacb4..c82c9a8e036 100644 --- a/Resources/Prototypes/Datasets/Names/military.yml +++ b/Resources/Prototypes/Datasets/Names/military.yml @@ -1,15 +1,18 @@ - type: dataset id: NamesFirstMilitaryLeader values: - - Colonel - - Commander - - Lieutenant - - Major + - Коммандер + - Полковник + - Подполковник + - Майор + - Лейтенант - type: dataset id: NamesFirstMilitary values: - - Corporal - - Sergeant - - Specialist - \ No newline at end of file + - Прапорщик + - Старшина + - Сержант + - Капрал + - Ефрейтор + diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 4686b988970..2e2991cd996 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -13,7 +13,7 @@ - type: RandomMetadata nameSegments: - NamesFirstMilitaryLeader - - names_last + - names_last_male # Corvax-Localization - type: RandomHumanoidSpawner settings: DeathSquad @@ -31,7 +31,7 @@ - type: RandomMetadata nameSegments: - NamesFirstMilitaryLeader - - names_last + - names_last_male # Corvax-Localization ## ERT Leader @@ -46,7 +46,7 @@ state: ertleader - type: RandomMetadata nameSegments: - - NamesFirstMilitaryLeaderCorvax # Corvax-Localization + - NamesFirstMilitaryLeader - NamesLastERTCallsign # Corvax-Localization - type: RandomHumanoidSpawner settings: ERTLeader @@ -64,7 +64,7 @@ prototypes: [ ERTLeaderGear ] - type: RandomMetadata nameSegments: - - NamesFirstMilitaryLeaderCorvax # Corvax-Localization + - NamesFirstMilitaryLeader - NamesLastERTCallsign # Corvax-Localization - type: entity @@ -124,7 +124,7 @@ state: ertjanitor - type: RandomMetadata nameSegments: - - NamesFirstMilitaryCorvax # Corvax-Localization + - NamesFirstMilitary - NamesLastERTCallsign # Corvax-Localization - type: RandomHumanoidSpawner settings: ERTJanitor @@ -140,7 +140,7 @@ - type: GhostTakeoverAvailable - type: RandomMetadata nameSegments: - - NamesFirstMilitaryCorvax # Corvax-Localization + - NamesFirstMilitary - NamesLastERTCallsign # Corvax-Localization - type: Loadout prototypes: [ ERTJanitorGear ] @@ -182,7 +182,7 @@ state: ertengineer - type: RandomMetadata nameSegments: - - NamesFirstMilitaryCorvax # Corvax-Localization + - NamesFirstMilitary - NamesLastERTCallsign # Corvax-Localization - type: RandomHumanoidSpawner settings: ERTEngineer @@ -198,7 +198,7 @@ - type: GhostTakeoverAvailable - type: RandomMetadata nameSegments: - - NamesFirstMilitaryCorvax # Corvax-Localization + - NamesFirstMilitary - NamesLastERTCallsign # Corvax-Localization - type: Loadout prototypes: [ ERTEngineerGear ] @@ -240,7 +240,7 @@ state: ertsecurity - type: RandomMetadata nameSegments: - - NamesFirstMilitaryCorvax # Corvax-Localization + - NamesFirstMilitary - NamesLastERTCallsign # Corvax-Localization - type: RandomHumanoidSpawner settings: ERTSecurity @@ -258,7 +258,7 @@ - type: GhostTakeoverAvailable - type: RandomMetadata nameSegments: - - NamesFirstMilitaryCorvax # Corvax-Localization + - NamesFirstMilitary - NamesLastERTCallsign # Corvax-Localization - type: Loadout prototypes: [ ERTSecurityGear ] @@ -320,7 +320,7 @@ state: ertmedical - type: RandomMetadata nameSegments: - - NamesFirstMilitaryCorvax # Corvax-Localization + - NamesFirstMilitary - NamesLastERTCallsign # Corvax-Localization - type: RandomHumanoidSpawner settings: ERTMedical @@ -336,7 +336,7 @@ - type: GhostTakeoverAvailable - type: RandomMetadata nameSegments: - - NamesFirstMilitaryCorvax # Corvax-Localization + - NamesFirstMilitary - NamesLastERTCallsign # Corvax-Localization - type: Loadout prototypes: [ ERTMedicalGear ] @@ -392,7 +392,7 @@ - type: GhostTakeoverAvailable - type: RandomMetadata nameSegments: - - NamesFirstMilitaryCorvax # Corvax-Localization + - NamesFirstMilitary - NamesLastERTCallsign # Corvax-Localization ## Central Command