From 9cc7771e2c045b47a3c49bb183015c4590fd1deb Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Tue, 12 Dec 2023 11:24:06 +0300 Subject: [PATCH] Fix upstream --- .../prototypes/entities/mobs/npcs/argocyte.ftl | 3 +-- Resources/Prototypes/Corvax/Maps/avrite.yml | 4 ---- Resources/Prototypes/Corvax/Maps/delta.yml | 4 ---- Resources/Prototypes/Corvax/Maps/gate.yml | 4 ---- Resources/Prototypes/Corvax/Maps/spectrum.yml | 14 +++++--------- 5 files changed, 6 insertions(+), 23 deletions(-) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/argocyte.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/argocyte.ftl index 638a64afbd9..d51912f1c92 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/argocyte.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/argocyte.ftl @@ -1,5 +1,4 @@ -ent-BaseMobArgocyte = { ent-['BaseSimpleMob', 'MobCombat'] } - +ent-BaseMobArgocyte = { ent-BaseSimpleMob } .desc = A dangerous alien found on the wrong side of planets, known for their propensity for munching on ruins. .suffix = AI ent-MobArgocyteSlurva = slurva diff --git a/Resources/Prototypes/Corvax/Maps/avrite.yml b/Resources/Prototypes/Corvax/Maps/avrite.yml index c8b4bc42527..e43aca8c3fe 100644 --- a/Resources/Prototypes/Corvax/Maps/avrite.yml +++ b/Resources/Prototypes/Corvax/Maps/avrite.yml @@ -56,7 +56,3 @@ Detective: [ 1, 1 ] Boxer: [ 2, 2] Paramedic: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/Corvax/Maps/delta.yml b/Resources/Prototypes/Corvax/Maps/delta.yml index eebf2ad710b..515c19d3deb 100644 --- a/Resources/Prototypes/Corvax/Maps/delta.yml +++ b/Resources/Prototypes/Corvax/Maps/delta.yml @@ -54,7 +54,3 @@ Psychologist: [ 1, 1 ] Detective: [ 1, 1 ] Paramedic: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/Corvax/Maps/gate.yml b/Resources/Prototypes/Corvax/Maps/gate.yml index afd05513367..3e873956fb8 100644 --- a/Resources/Prototypes/Corvax/Maps/gate.yml +++ b/Resources/Prototypes/Corvax/Maps/gate.yml @@ -33,13 +33,11 @@ Reporter: [ 2, 2 ] #engineering ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] AtmosphericTechnician: [ 3, 3 ] StationEngineer: [ 4, 4 ] TechnicalAssistant: [ 4, 4 ] #medical ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] Chemist: [ 2, 2 ] MedicalDoctor: [ 3, 3 ] Paramedic: [ 2, 2 ] @@ -47,14 +45,12 @@ Psychologist: [ 1, 1 ] #science ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] Scientist: [ 4, 4 ] ResearchAssistant: [ 4, 4 ] Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 6, 6 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] diff --git a/Resources/Prototypes/Corvax/Maps/spectrum.yml b/Resources/Prototypes/Corvax/Maps/spectrum.yml index e41ab15fd6d..be2eaade0b2 100644 --- a/Resources/Prototypes/Corvax/Maps/spectrum.yml +++ b/Resources/Prototypes/Corvax/Maps/spectrum.yml @@ -30,22 +30,18 @@ StationEngineer: [ 6, 6 ] #инженерка AtmosphericTechnician: [ 3, 3 ] TechnicalAssistant: [ 3, 3 ] - SeniorEngineer: [ 1, 1 ] MedicalDoctor: [ 4, 4 ] #мед MedicalIntern: [ 3, 3 ] Paramedic: [ 1, 1 ] Psychologist: [ 1, 1 ] Chemist: [ 3, 3 ] - SeniorPhysician: [ 1, 1 ] SecurityOfficer: [ 6, 6 ] #СБ - SecurityCadet: [ 3, 3 ] + SecurityCadet: [ 3, 3 ] Detective: [ 1, 1 ] - SeniorOfficer: [ 1, 1 ] Warden: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] #РНД - Scientist: [ 6, 6 ] + Scientist: [ 6, 6 ] #РНД ResearchAssistant: [ 3, 3 ] - Borg: [ 1, 1 ] + Borg: [ 1, 1 ] ServiceWorker: [ 4, 4 ] #Сервис Bartender: [ 2, 2 ] Botanist: [ 3, 3 ] @@ -56,8 +52,8 @@ Reporter: [ 2, 2 ] Zookeeper: [ 1, 1 ] Chaplain: [ 1, 1 ] - Librarian: [ 1, 1 ] + Librarian: [ 1, 1 ] Musician: [ 3, 3 ] Boxer: [ 2, 2] Passenger: [ -1, -1 ] #Разное - IAA: [ 1, 1 ] \ No newline at end of file + IAA: [ 1, 1 ]