From d0af9186b7753eef4c32b5ba677b640cf5046130 Mon Sep 17 00:00:00 2001 From: Farrellka-dev Date: Fri, 22 Nov 2024 14:22:29 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entities/clothing/outerclothing/hardsuits.ftl | 4 ---- Resources/Prototypes/Entities/Objects/Devices/pda.yml | 1 - .../Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml | 2 +- .../_LostParadise/Catalog/Fills/Lockers/security.yml | 1 - .../_LostParadise/Entities/Clothing/Belt/belts.yml | 2 ++ .../Entities/Clothing/OuterClothing/hardsuits.yml | 4 ++-- .../Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml | 6 +++--- 7 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl index 7de150f214a..abf033e66c7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl @@ -122,11 +122,7 @@ ent-ClothingOuterHardsuitDeathsquad = Тактический скафандр NT На нём виднеется аббревиатура "NTIA-DAP". Броня скафандра укреплена сверхпрочным сплавом, помимо этого он почти ничего не весит. ent-ClothingOuterHardsuitCBURN = Тактический скафандр NT-444-CBRN -"Jophiel" .desc = -<<<<<<< HEAD Тактический скафандр предназначенный для ОБР категории РХБЗЗ, имеет логотип НаноТрейзен и серийный номер. -======= - Тактический скафандр предназначенный для ОБР катергии CBURN, имеет логотип НаноТрейзен и серийный номер. ->>>>>>> master Броня скафандра укреплена простым, но прочным сплавом, помимо этого он почти ничего не весит. ent-ClothingOuterHardsuitClown = Пустотный скафандр клоуна .desc = Обычный пустотный скафандр, украшенный специальной расцветкой. diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 6897e7abf2c..60a0ff88f24 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1099,7 +1099,6 @@ - type: GasAnalyzer - type: Pda id: ERTEngineerIDCard - - type: GasAnalyzer - type: entity parent: ERTLeaderPDA diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml index d023a350572..a5027f41fe7 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -103,7 +103,7 @@ neck: ClothingNeckStoleChaplain gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterArmorBasicSlim - id: ERTEngineerPDA + id: ERTChaplainPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltStorageWaistbag socks: LPPClothingUnderSocksNorm diff --git a/Resources/Prototypes/_LostParadise/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_LostParadise/Catalog/Fills/Lockers/security.yml index b5e17dcd063..a009431bc7b 100644 --- a/Resources/Prototypes/_LostParadise/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/_LostParadise/Catalog/Fills/Lockers/security.yml @@ -8,7 +8,6 @@ - id: LPPClothingMilitaryWebbingSecEng - id: LPPClothingBackpackDuffelSecurityEngineer - id: ToolboxMechanicalFilled - - id: ClothingHandsGlovesCombat - id: LPPClothingOuterHardsuitSecurityEng - id: ClothingShoesBootsMag - id: OxygenTankFilled diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml index d038b90a85a..484acc7cca0 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Belt/belts.yml @@ -67,6 +67,8 @@ - id: Screwdriver - id: WelderIndustrial - id: Multitool + - id: SprayPainter + - id: trayScanner - type: ExplosionResistance damageCoefficient: 0.5 diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml index 7e783fce547..1a3459fddf6 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml @@ -210,7 +210,7 @@ Piercing: 0.6 Caustic: 0.8 Heat: 0.3 - Radiation: 0.1 + Radiation: 0.25 - type: ClothingSpeedModifier walkModifier: 0.65 sprintModifier: 0.65 @@ -379,7 +379,7 @@ - type: TemperatureProtection coefficient: 0.5 - type: ExplosionResistance - damageCoefficient: 0.2 + damageCoefficient: 0.1 - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitIICPyrotech - type: BiocodedClothing diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml index 8d4e8033af7..608fd5442ca 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml @@ -34,10 +34,10 @@ back: LPPClothingBackpackSecurityEngineer shoes: LPPClothingShoesBootsJackSecEnginer eyes: LPPClothingEyesHudSecEng - gloves: ClothingHandsGlovesColorYellow - head: ClothingHeadHatHardhatYellow + gloves: ClothingHandsGlovesCombat + head: ClothingHeadHatHardhatArmored id: LPPSecurityEngineerPDA - outerClothing: ClothingOuterVestHazard + outerClothing: ClothingOuterVestWeb ears: LPPClothingHeadsetSecurityEngineer belt: LPPClothingMilitaryWebbingSecEng socks: LPPClothingUnderSocksNorm