[Feat] Airlocks lights + texture replace + some translate fixes (#97)

* Airlocks lights * bookshelf fix * killsign translate * some jobs names changes * outerclothing * clothing all * tiles * decals * bubbles * uranium glass * SMES fix * generators resprite * redundant delete * RSI validator fix # Conflicts: # Content.Client/Doors/AirlockSystem.cs # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml # Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png # Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png # Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png # Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png # Resources/Textures/Effects/creampie.rsi/meta.json # Resources/Textures/Effects/speech.rsi/alien0.png # Resources/Textures/Effects/speech.rsi/alien1.png # Resources/Textures/Effects/speech.rsi/alien2.png # Resources/Textures/Effects/speech.rsi/alienroyal0.png # Resources/Textures/Effects/speech.rsi/alienroyal1.png # Resources/Textures/Effects/speech.rsi/alienroyal2.png # Resources/Textures/Effects/speech.rsi/blob0.png # Resources/Textures/Effects/speech.rsi/blob1.png # Resources/Textures/Effects/speech.rsi/blob2.png # Resources/Textures/Effects/speech.rsi/clock0.png # Resources/Textures/Effects/speech.rsi/clock1.png # Resources/Textures/Effects/speech.rsi/clock2.png # Resources/Textures/Effects/speech.rsi/default0.png # Resources/Textures/Effects/speech.rsi/default1.png # Resources/Textures/Effects/speech.rsi/default2.png # Resources/Textures/Effects/speech.rsi/guardian0.png # Resources/Textures/Effects/speech.rsi/guardian1.png # Resources/Textures/Effects/speech.rsi/guardian2.png # Resources/Textures/Effects/speech.rsi/holo0.png # Resources/Textures/Effects/speech.rsi/holo1.png # Resources/Textures/Effects/speech.rsi/holo2.png # Resources/Textures/Effects/speech.rsi/lawyer0.png # Resources/Textures/Effects/speech.rsi/lawyer1.png # Resources/Textures/Effects/speech.rsi/lawyer2.png # Resources/Textures/Effects/speech.rsi/machine0.png # Resources/Textures/Effects/speech.rsi/machine1.png # Resources/Textures/Effects/speech.rsi/machine2.png # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Effects/speech.rsi/moth0.png # Resources/Textures/Effects/speech.rsi/moth1.png # Resources/Textures/Effects/speech.rsi/moth2.png # Resources/Textures/Effects/speech.rsi/robot0.png # Resources/Textures/Effects/speech.rsi/robot1.png # Resources/Textures/Effects/speech.rsi/robot2.png # Resources/Textures/Effects/speech.rsi/slime0.png # Resources/Textures/Effects/speech.rsi/slime1.png # Resources/Textures/Effects/speech.rsi/slime2.png # Resources/Textures/Effects/speech.rsi/swarmer0.png # Resources/Textures/Effects/speech.rsi/swarmer1.png # Resources/Textures/Effects/speech.rsi/swarmer2.png # Resources/Textures/Effects/speech.rsi/syndibot0.png # Resources/Textures/Effects/speech.rsi/syndibot1.png # Resources/Textures/Effects/speech.rsi/syndibot2.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json # Resources/Textures/Tiles/white_diagonal_mini.png
2023-05-24 21:47:35 +03:00
parent 296e8885c1
commit 10609a2506
838 changed files with 925 additions and 300 deletions
--- a/Resources/Locale/ru-RU/job/job-names.ftl
+++ b/Resources/Locale/ru-RU/job/job-names.ftl
@@ -10,8 +10,8 @@ job-name-rd = научный руководитель
 job-name-psychologist = психолог
 job-name-intern = интерн
 job-name-doctor = врач
-job-name-paramedic = Paramedic
-job-name-cmo = главный врач
+job-name-paramedic = парамедик
+job-name-cmo = старший медицинский офицер
 job-name-chemist = химик
 job-name-technical-assistant = технический ассистент
 job-name-engineer = инженер
@@ -54,7 +54,7 @@ JobChaplain = священник
 JobChef = шеф-повар
 JobChemist = химик
 JobChiefEngineer = старший инженер
-JobChiefMedicalOfficer = главный врач
+JobChiefMedicalOfficer = старший медицинский офицер
 JobClown = клоун
 JobDetective = детектив
 JobERTEngineer = инженер ОБР
@@ -73,7 +73,7 @@ JobMedicalIntern = интерн
 JobMime = мим
 JobMusician = музыкант
 JobPassenger = ассистент
-JobParamedic = Paramedic
+JobParamedic = парамедик
 JobPsychologist = психолог
 JobQuartermaster = квартирмейстер
 JobReporter = репортёр
--- a/Resources/Locale/ru-RU/prototypes/access/accesses.ftl
+++ b/Resources/Locale/ru-RU/prototypes/access/accesses.ftl
@@ -11,7 +11,7 @@ id-card-access-level-engineering = Инженерный
 id-card-access-level-atmospherics = Атмосферный
 id-card-access-level-research-director = Научный руководитель
 id-card-access-level-research = Научный
-id-card-access-level-chief-medical-officer = Главный врач
+id-card-access-level-chief-medical-officer = Старший медицинский офицер
 id-card-access-level-medical = Медицинский
 id-card-access-level-chemistry = Химия
 id-card-access-level-paramedic = Парамедик
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/jobs.ftl
@@ -76,7 +76,7 @@ ent-SpawnPointStationEngineer = инженер
 ent-SpawnPointAtmos = атмосферный техник
    .desc = { ent-SpawnPointJobBase.desc }
    .suffix = { "" }
-ent-SpawnPointChiefMedicalOfficer = главный врач
+ent-SpawnPointChiefMedicalOfficer = старший медицинский офицер
    .desc = { ent-SpawnPointJobBase.desc }
    .suffix = { "" }
 ent-SpawnPointMedicalDoctor = врач
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl
@@ -64,7 +64,7 @@ ent-HydroponicsTrayMachineCircuitboard = гидропонная ванночка
 ent-SeedExtractorMachineCircuitboard = экстрактор семян (машинная плата)
    .desc = Печатная плата экстрактора семян.
    .suffix = { "" }
-ent-SMESMachineCircuitboard = СМЭС (машинная плата)
+ent-SMESMachineCircuitboard = СМЕС (машинная плата)
    .desc = { ent-BaseMachineCircuitboard.desc }
    .suffix = { "" }
 ent-SubstationMachineCircuitboard = подстанция (машинная плата)
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/smes.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/smes.ftl
@@ -1,5 +1,5 @@
 ent-BaseSMES = СМЕС
-    .desc = Сверхпроводящая Магнитная Энергонакопительная Станция (СМЭС) большой емкости.
+    .desc = Сверхпроводящая Магнитная Энергонакопительная Станция (СМЕС) большой емкости.
    .suffix = { "" }
 ent-SMESBasic = { ent-BaseSMES }
    .suffix = Базовая, 8МВт