From bc4bc39dc9616930c8f0efb1dbe4e14114d0e371 Mon Sep 17 00:00:00 2001 From: teasum Date: Sat, 1 Aug 2026 19:24:26 +0300 Subject: [PATCH 1/7] added engineer tactical gloves prototypes --- .../_Forge/Entities/Clothing/Hands/gloves.yml | 49 +++++++++++++++++++ .../Entities/Objects/Tools/tactical_tools.yml | 49 +++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml diff --git a/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml index 570b77cd799..ea25b594fba 100644 --- a/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml @@ -112,3 +112,52 @@ - type: Clothing sprite: Forge/Clothing/Hands/Gloves/tti_gloves.rsi - type: Insulated + +- type: entity + parent: ClothingHandsGlovesCombat + id: ClothingHandsGlovesTacticalCombatEngineer + name: Тактические инженерные перчатки + description: Эти тактические перчатки защищены от огня и электричества и снабжены базовым набором инструментов. + components: + - type: Sprite + sprite: _Mono/Clothing/Hands/Gloves/tactical_combat_any.rsi + color: "#9c9200" + - type: Clothing + sprite: _Mono/Clothing/Hands/Gloves/tactical_combat_any.rsi + clothingVisuals: + gloves: + - state: equipped-HAND + color: "#9c9200" + - type: Item + inhandVisuals: + left: + - state: inhand-left + color: "#9c9200" + right: + - state: inhand-right + color: "#9c9200" + - type: ModsuitGauntletTools + usePrototypeMenuIcons: true + enabledSlots: + - Urk + - Omnitool + - Welder + - NaniteApplicator + - Auxiliary + - Piping + urkProto: CrowbarPocketTacticalTool + omnitoolProto: WrenchTacticalTool + welderProto: ScrewdriveracticalTool + naniteApplicatorProto: WirecutterTacticalTool + auxiliaryProto: WelderTacticalTool + pipingProto: Multitool + - type: ActionGrant + actions: + - ActionModsuitGauntletToolsMenu + - type: ItemActionGrant + actions: + - ActionModsuitGauntletToolsMenu + activeIfWorn: true + - type: StaticPrice + price: 8500 + vendPrice: 10000 diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml b/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml new file mode 100644 index 00000000000..d62535a0a8e --- /dev/null +++ b/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml @@ -0,0 +1,49 @@ +- type: entity + id: CrowbarPocketTacticalTool + parent: CrowbarPocket + name: Встроенный лом + description: Встроенный в перчатки лом. Немного хуже обычного лома. + categories: [ HideSpawnMenu ] + components: + - type: Tool + speedModifier: 0.5 + +- type: entity + id: WrenchTacticalTool + parent: Wrench + name: Встроенный гаечный ключ + description: Встроенный в перчатки гаечный ключ. Немного хуже обычного гаечного ключа. + categories: [ HideSpawnMenu ] + components: + - type: Tool + speedModifier: 0.5 + +- type: entity + id: ScrewdriveracticalTool + parent: Screwdriver + name: Встроенная отвертка + description: Встроенный в перчатки отвертка. Немного хуже обычной отвертки. + categories: [ HideSpawnMenu ] + components: + - type: Tool + speedModifier: 0.5 + +- type: entity + id: WirecutterTacticalTool + parent: Wirecutter + name: Встроенные кусачки + description: Встроенный в перчатки кусачки. Немного хуже обычных кусачек. + categories: [ HideSpawnMenu ] + components: + - type: Tool + speedModifier: 0.5 + +- type: entity + id: WelderTacticalTool + parent: Welder + name: Встроенная сварка + description: Встроенный в перчатки сварка. Немного хуже обычной сварки. + categories: [ HideSpawnMenu ] + components: + - type: Tool + speedModifier: 0.5 From d7170e2d4687e42be9a42d4866eac940bab7fe84 Mon Sep 17 00:00:00 2001 From: teasum Date: Sat, 1 Aug 2026 22:20:50 +0300 Subject: [PATCH 2/7] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D1=87=D0=B8=20=D0=B2=20=D0=BB=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0=D1=83=D1=82=20=D0=B8=20=D0=B2=20=D0=B0=D0=B2=D1=82=D0=BE?= =?UTF-8?q?=D0=BC=D0=B0=D1=82=20=D0=BA=20=D0=B4=D1=80=D1=83=D0=B3=D0=B8?= =?UTF-8?q?=D0=BC=20=D1=82=D0=B0=D0=BA=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA?= =?UTF-8?q?=D0=B8=D0=BC=20=D0=BF=D0=B5=D1=80=D1=87=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml | 6 +++--- .../_Forge/Entities/Objects/Tools/tactical_tools.yml | 9 ++++++++- .../VendingMachines/Inventories/clothings_PMC.yml | 1 + Resources/Prototypes/_Mono/Loadouts/Mercenary/gloves.yml | 8 ++++++++ Resources/Prototypes/_Mono/Loadouts/Mercenary/groups.yml | 1 + 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml index ea25b594fba..883e62cfc70 100644 --- a/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml @@ -147,7 +147,7 @@ - Piping urkProto: CrowbarPocketTacticalTool omnitoolProto: WrenchTacticalTool - welderProto: ScrewdriveracticalTool + welderProto: ScrewdriverTacticalTool naniteApplicatorProto: WirecutterTacticalTool auxiliaryProto: WelderTacticalTool pipingProto: Multitool @@ -159,5 +159,5 @@ - ActionModsuitGauntletToolsMenu activeIfWorn: true - type: StaticPrice - price: 8500 - vendPrice: 10000 + price: 10000 + vendPrice: 15000 diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml b/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml index d62535a0a8e..98c35229164 100644 --- a/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml +++ b/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml @@ -19,7 +19,7 @@ speedModifier: 0.5 - type: entity - id: ScrewdriveracticalTool + id: ScrewdriverTacticalTool parent: Screwdriver name: Встроенная отвертка description: Встроенный в перчатки отвертка. Немного хуже обычной отвертки. @@ -47,3 +47,10 @@ components: - type: Tool speedModifier: 0.5 + - type: SolutionContainerManager + solutions: + Welder: + reagents: + - ReagentId: WeldingFuel + Quantity: 50 + maxVol: 50 diff --git a/Resources/Prototypes/_Mono/Catalogs/VendingMachines/Inventories/clothings_PMC.yml b/Resources/Prototypes/_Mono/Catalogs/VendingMachines/Inventories/clothings_PMC.yml index db15d720e37..1425a893edf 100644 --- a/Resources/Prototypes/_Mono/Catalogs/VendingMachines/Inventories/clothings_PMC.yml +++ b/Resources/Prototypes/_Mono/Catalogs/VendingMachines/Inventories/clothings_PMC.yml @@ -107,6 +107,7 @@ ClothingHandsGlovesTacticalCombatOlive: 4294967295 # Infinite ClothingHandsGlovesTacticalCombatCoyoteBrown: 4294967295 # Infinite ClothingHandsGlovesTacticalCombatWhite: 4294967295 # Infinite + ClothingHandsGlovesTacticalCombatEngineer: 4294967295 # Infinite #Forge-Change # region Helmets ClothingHeadBPHelmetLight: 4294967295 # Infinite ClothingHeadHelmetMercenary: 4294967295 # Infinite diff --git a/Resources/Prototypes/_Mono/Loadouts/Mercenary/gloves.yml b/Resources/Prototypes/_Mono/Loadouts/Mercenary/gloves.yml index 00eaa6542fd..2dccf6a5bf4 100644 --- a/Resources/Prototypes/_Mono/Loadouts/Mercenary/gloves.yml +++ b/Resources/Prototypes/_Mono/Loadouts/Mercenary/gloves.yml @@ -27,3 +27,11 @@ id: MercenaryClothingHandsGlovesTacticalCombatWhite equipment: gloves: ClothingHandsGlovesTacticalCombatWhite + +#Forge-Change-Start +- type: loadout + id: MercenaryClothingHandsGlovesTacticalCombatEngineer + price: 15000 + equipment: + gloves: ClothingHandsGlovesTacticalCombatEngineer +#Forge-Change-End diff --git a/Resources/Prototypes/_Mono/Loadouts/Mercenary/groups.yml b/Resources/Prototypes/_Mono/Loadouts/Mercenary/groups.yml index 6f67d733b9e..0de8a072b54 100644 --- a/Resources/Prototypes/_Mono/Loadouts/Mercenary/groups.yml +++ b/Resources/Prototypes/_Mono/Loadouts/Mercenary/groups.yml @@ -81,6 +81,7 @@ - MercenaryClothingHandsGlovesTacticalCombatOlive - MercenaryClothingHandsGlovesTacticalCombatCoyoteBrown - MercenaryClothingHandsGlovesTacticalCombatWhite + - MercenaryClothingHandsGlovesTacticalCombatEngineer #Forge-Change - type: loadoutGroup id: MonoMercenaryBackpack # ONLY TO BE USED AS A SUBGROUP FOR _NF MERCENARY GROUPS From deaa8d65c28331d1c6fd5435d5c9ff3e5fafa8d5 Mon Sep 17 00:00:00 2001 From: teasum Date: Sat, 1 Aug 2026 22:27:04 +0300 Subject: [PATCH 3/7] =?UTF-8?q?=D0=BE=D1=82=D0=B1=D0=B0=D0=BB=D0=B0=D0=BD?= =?UTF-8?q?=D1=81=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D1=81=D0=BA=D0=BE?= =?UTF-8?q?=D1=80=D0=BE=D1=81=D1=82=D1=8C=20=D0=B8=D0=BD=D1=81=D1=82=D1=80?= =?UTF-8?q?=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Objects/Tools/tactical_tools.yml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml b/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml index 98c35229164..9a1b378a717 100644 --- a/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml +++ b/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml @@ -2,55 +2,55 @@ id: CrowbarPocketTacticalTool parent: CrowbarPocket name: Встроенный лом - description: Встроенный в перчатки лом. Немного хуже обычного лома. + description: Встроенный в перчатки лом. Намного хуже обычного лома. categories: [ HideSpawnMenu ] components: - type: Tool - speedModifier: 0.5 + speedModifier: 0.2 - type: entity id: WrenchTacticalTool parent: Wrench name: Встроенный гаечный ключ - description: Встроенный в перчатки гаечный ключ. Немного хуже обычного гаечного ключа. + description: Встроенный в перчатки гаечный ключ. Намного хуже обычного гаечного ключа. categories: [ HideSpawnMenu ] components: - type: Tool - speedModifier: 0.5 + speedModifier: 0.2 - type: entity id: ScrewdriverTacticalTool parent: Screwdriver name: Встроенная отвертка - description: Встроенный в перчатки отвертка. Немного хуже обычной отвертки. + description: Встроенный в перчатки отвертка. Намного хуже обычной отвертки. categories: [ HideSpawnMenu ] components: - type: Tool - speedModifier: 0.5 + speedModifier: 0.2 - type: entity id: WirecutterTacticalTool parent: Wirecutter name: Встроенные кусачки - description: Встроенный в перчатки кусачки. Немного хуже обычных кусачек. + description: Встроенный в перчатки кусачки. Намного хуже обычных кусачек. categories: [ HideSpawnMenu ] components: - type: Tool - speedModifier: 0.5 + speedModifier: 0.2 - type: entity id: WelderTacticalTool parent: Welder name: Встроенная сварка - description: Встроенный в перчатки сварка. Немного хуже обычной сварки. + description: Встроенный в перчатки сварка. Намного хуже обычной сварки. categories: [ HideSpawnMenu ] components: - type: Tool - speedModifier: 0.5 + speedModifier: 0.2 - type: SolutionContainerManager solutions: Welder: reagents: - ReagentId: WeldingFuel - Quantity: 50 - maxVol: 50 + Quantity: 25 + maxVol: 25 From 6824903e31b2fbf8b310ab244a134efc76328efa Mon Sep 17 00:00:00 2001 From: teasum Date: Sun, 2 Aug 2026 00:30:53 +0300 Subject: [PATCH 4/7] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B4=D0=B2=D0=B8=D0=BD=D1=83=D1=82=D1=8B?= =?UTF-8?q?=D0=B5=20=D0=BF=D0=B5=D1=80=D1=87=D0=B0=D1=82=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B8=20=D1=80=D0=B5=D1=86=D0=B5=D0=BF=D1=82=20=D0=B1=D0=B0?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D1=8B=D0=BC=20=D0=B8=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B4=D0=B2=D0=B8=D0=BD=D1=83=D1=82=D1=8B=D0=BC,=20=D0=B8?= =?UTF-8?q?=D0=B7=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B4=D0=B2=D0=B8=D0=BD=D1=83=D1=82=D1=8B=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Research/industrial.yml | 1 + .../_Forge/Entities/Clothing/Hands/gloves.yml | 54 +++++++++++++++++-- .../blueprints/blueprints_engineering.yml | 1 + .../Entities/Objects/Tools/tactical_tools.yml | 51 ++++++++++++++++-- .../Recipes/Lathes/engineering_tools.yml | 22 ++++++++ .../Packs/Deprecated/engineering_techfab.yml | 2 + .../Packs/Deprecated/mercenary_techfab.yml | 2 + 7 files changed, 123 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index d0502fcc572..299f8915779 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -226,6 +226,7 @@ # Mono edit end - ForgeBlueprintAdvancedTools # Forge-change - ForgeBlueprintAdvancedShipRepairTools # Forge-change + - ClothingHandsGlovesTacticalCombatEngineerAdvanced #Forge-Change technologyPrerequisites: - SuperParts position: -1, 18 diff --git a/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml index 883e62cfc70..6a8a752a8e2 100644 --- a/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml @@ -117,25 +117,25 @@ parent: ClothingHandsGlovesCombat id: ClothingHandsGlovesTacticalCombatEngineer name: Тактические инженерные перчатки - description: Эти тактические перчатки защищены от огня и электричества и снабжены базовым набором инструментов. + description: Тактические перчатки с защитой от огня и ударов. Содержат встроенный базовый набор инструментов. Однако из-за несовершенства технологий инструменты имеют крайне низкое качество. components: - type: Sprite sprite: _Mono/Clothing/Hands/Gloves/tactical_combat_any.rsi - color: "#9c9200" + color: "#d1c300" - type: Clothing sprite: _Mono/Clothing/Hands/Gloves/tactical_combat_any.rsi clothingVisuals: gloves: - state: equipped-HAND - color: "#9c9200" + color: "#d1c300" - type: Item inhandVisuals: left: - state: inhand-left - color: "#9c9200" + color: "#d1c300" right: - state: inhand-right - color: "#9c9200" + color: "#d1c300" - type: ModsuitGauntletTools usePrototypeMenuIcons: true enabledSlots: @@ -161,3 +161,47 @@ - type: StaticPrice price: 10000 vendPrice: 15000 + +- type: entity + parent: ClothingHandsGlovesCombat + id: ClothingHandsGlovesTacticalCombatEngineerAdvanced + name: Продвинутые тактические инженерные перчатки + description: Улучшенная версия инженерных тактических перчаток. Благодаря технологиям блюспейса теперь снабжены продвинутым набором инструментов. + components: + - type: Sprite + sprite: _Mono/Clothing/Hands/Gloves/tactical_combat_any.rsi + color: "#ffb30f" + - type: Clothing + sprite: _Mono/Clothing/Hands/Gloves/tactical_combat_any.rsi + clothingVisuals: + gloves: + - state: equipped-HAND + color: "#ffb30f" + - type: Item + inhandVisuals: + left: + - state: inhand-left + color: "#ffb30f" + right: + - state: inhand-right + color: "#ffb30f" + - type: ModsuitGauntletTools + usePrototypeMenuIcons: true + enabledSlots: + - Urk + - Omnitool + - Welder + - NaniteApplicator + - Auxiliary + urkProto: JawsOfLifeTacticalTool + omnitoolProto: PowerDrillTacticalTool + welderProto: WelderExperimentalTacticalTool + naniteApplicatorProto: NaniteApplicatorExperimentalTacticalTool + auxiliaryProto: Multitool + - type: ActionGrant + actions: + - ActionModsuitGauntletToolsMenu + - type: ItemActionGrant + actions: + - ActionModsuitGauntletToolsMenu + activeIfWorn: true diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Tools/blueprints/blueprints_engineering.yml b/Resources/Prototypes/_Forge/Entities/Objects/Tools/blueprints/blueprints_engineering.yml index 097d0c7918d..c1c492b2c24 100644 --- a/Resources/Prototypes/_Forge/Entities/Objects/Tools/blueprints/blueprints_engineering.yml +++ b/Resources/Prototypes/_Forge/Entities/Objects/Tools/blueprints/blueprints_engineering.yml @@ -20,6 +20,7 @@ - WelderExperimental - PowerDrill - JawsOfLife + - ClothingHandsGlovesTacticalCombatEngineerAdvanced #Forge-Change - type: entity parent: NFBaseBlueprintEngineering diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml b/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml index 9a1b378a717..ccdfa7e50e1 100644 --- a/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml +++ b/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml @@ -6,7 +6,7 @@ categories: [ HideSpawnMenu ] components: - type: Tool - speedModifier: 0.2 + speedModifier: 0.2 #1 original - type: entity id: WrenchTacticalTool @@ -16,7 +16,7 @@ categories: [ HideSpawnMenu ] components: - type: Tool - speedModifier: 0.2 + speedModifier: 0.2 #1 original - type: entity id: ScrewdriverTacticalTool @@ -26,7 +26,7 @@ categories: [ HideSpawnMenu ] components: - type: Tool - speedModifier: 0.2 + speedModifier: 0.2 #1 original - type: entity id: WirecutterTacticalTool @@ -36,7 +36,7 @@ categories: [ HideSpawnMenu ] components: - type: Tool - speedModifier: 0.2 + speedModifier: 0.2 #1 original - type: entity id: WelderTacticalTool @@ -46,7 +46,7 @@ categories: [ HideSpawnMenu ] components: - type: Tool - speedModifier: 0.2 + speedModifier: 0.2 #1 original - type: SolutionContainerManager solutions: Welder: @@ -54,3 +54,44 @@ - ReagentId: WeldingFuel Quantity: 25 maxVol: 25 + +#advanced +- type: entity + id: JawsOfLifeTacticalTool + parent: JawsOfLife + name: Встроенные челюсти жизни + description: Встроенные в перчатки челюсти жизни. Практически неотличимы от ориганала. + categories: [ HideSpawnMenu ] + components: + - type: Tool + speedModifier: 1.4 #1.5 original + +- type: entity + id: PowerDrillTacticalTool + parent: PowerDrill + name: Встроенная электродрель + description: Встроенная в перчатки электродрель. Практически неотличима от ориганала. + categories: [ HideSpawnMenu ] + components: + - type: Tool + speedModifier: 1.4 #1.5 original + +- type: entity + id: WelderExperimentalTacticalTool + parent: WelderExperimental + name: Встроенная эксперментальная сварка + description: Встроенная в перчатки эксперементальная сварка. Практически неотличима от ориганала. + categories: [ HideSpawnMenu ] + components: + - type: Tool + speedModifier: 1.2 #1.3 original + +- type: entity + id: NaniteApplicatorExperimentalTacticalTool + parent: NaniteApplicatorExperimental + name: Встроенный эксперементальный нанитный репликатор. + description: Встроенный в перчатки эксперементальный нанитный репликатор. Практически неотличим от ориганала. + categories: [ HideSpawnMenu ] + components: + - type: Tool + speedModifier: 0.9 #1 original diff --git a/Resources/Prototypes/_Forge/Recipes/Lathes/engineering_tools.yml b/Resources/Prototypes/_Forge/Recipes/Lathes/engineering_tools.yml index 16629e7d4db..e41f8d493a0 100644 --- a/Resources/Prototypes/_Forge/Recipes/Lathes/engineering_tools.yml +++ b/Resources/Prototypes/_Forge/Recipes/Lathes/engineering_tools.yml @@ -15,3 +15,25 @@ Steel: 500 Glass: 200 Plastic: 100 + +- type: latheRecipe + id: ClothingHandsGlovesTacticalCombatEngineerAdvanced + result: ClothingHandsGlovesTacticalCombatEngineerAdvanced + completetime: 6 + materials: + Steel: 3000 + Glass: 3000 + Plasma: 2000 + Gold: 1200 + Silver: 1000 + Bluespace: 200 + +- type: latheRecipe + id: ClothingHandsGlovesTacticalCombatEngineer + result: ClothingHandsGlovesTacticalCombatEngineer + completetime: 6 + materials: + Steel: 1500 + Glass: 1000 + Gold: 500 + Silver: 500 diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/engineering_techfab.yml b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/engineering_techfab.yml index 299fba67c75..5810d33b1c1 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/engineering_techfab.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/engineering_techfab.yml @@ -17,6 +17,7 @@ - HandLabeler - Signaller - ClothingMaskWeldingGas + - ClothingHandsGlovesTacticalCombatEngineer #Forge-Change ## Basic storage - ToolboxArtisticNF - ToolboxElectricalNF @@ -138,6 +139,7 @@ - RCD # Mono start - RCDAmmo - RPD # Forge-Change + - ClothingHandsGlovesTacticalCombatEngineerAdvanced #Forge-Change - ShipRepairDevice - ShipRepairDeviceAmmo #Mono end - SignallerAdvanced diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml index 36b5b2d611b..c1f89c7335d 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml @@ -14,6 +14,7 @@ - HandLabeler - Signaller - ClothingMaskWeldingGas + - ClothingHandsGlovesTacticalCombatEngineer #Forge-Change ## Basic storage - ToolboxArtisticNF - ToolboxElectricalNF @@ -108,6 +109,7 @@ - TrayGoggles # Mono - JetpackVoid - PowerCellHigh + - ClothingHandsGlovesTacticalCombatEngineerAdvanced #Forge-Change # - PowerCellHyperNF - PowerCellCombat # Mono edit - PowerCellMicroreactor From 9aa2a0a344d768969df93a3000b3afcfa6000538 Mon Sep 17 00:00:00 2001 From: teasum Date: Sun, 2 Aug 2026 10:55:51 +0300 Subject: [PATCH 5/7] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D1=81=D0=B2=D0=BE=D1=8E=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA?= =?UTF-8?q?=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Forge/Actions/tactical_engineer_glove_tools.yml | 9 +++++++++ .../_Forge/Entities/Clothing/Hands/gloves.yml | 10 +++++----- 2 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 Resources/Prototypes/_Forge/Actions/tactical_engineer_glove_tools.yml diff --git a/Resources/Prototypes/_Forge/Actions/tactical_engineer_glove_tools.yml b/Resources/Prototypes/_Forge/Actions/tactical_engineer_glove_tools.yml new file mode 100644 index 00000000000..36a0ca25cba --- /dev/null +++ b/Resources/Prototypes/_Forge/Actions/tactical_engineer_glove_tools.yml @@ -0,0 +1,9 @@ +- type: entity + id: ActionTacticalEngineerGloveToolsMenu + name: Встроенные в перчатку инструменты + description: Открывает радиальное меню для выдачи инструментов + components: + - type: InstantAction + clientExclusive: true + icon: { sprite: _NF/Objects/Tools/wrench.rsi, state: icon } + event: !type:OpenModsuitGauntletToolsMenuActionEvent {} diff --git a/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml index 6a8a752a8e2..99a29bea68f 100644 --- a/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml @@ -153,13 +153,13 @@ pipingProto: Multitool - type: ActionGrant actions: - - ActionModsuitGauntletToolsMenu + - ActionTacticalEngineerGloveToolsMenu - type: ItemActionGrant actions: - - ActionModsuitGauntletToolsMenu + - ActionTacticalEngineerGloveToolsMenu activeIfWorn: true - type: StaticPrice - price: 10000 + price: 12000 vendPrice: 15000 - type: entity @@ -200,8 +200,8 @@ auxiliaryProto: Multitool - type: ActionGrant actions: - - ActionModsuitGauntletToolsMenu + - ActionTacticalEngineerGloveToolsMenu - type: ItemActionGrant actions: - - ActionModsuitGauntletToolsMenu + - ActionTacticalEngineerGloveToolsMenu activeIfWorn: true From 3a87fc2306a57de44476b58a3b59b0da3c3078de Mon Sep 17 00:00:00 2001 From: teasum Date: Sun, 2 Aug 2026 12:34:39 +0300 Subject: [PATCH 6/7] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=20=D0=B8=20=D0=B8?= =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D0=BA=D0=B8=20=D0=BC=D0=B5=D0=BD=D1=8E=D1=88?= =?UTF-8?q?=D0=BA=D0=B5,=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B8=D0=B7?= =?UTF-8?q?=20=20=D1=87=D0=B5=D1=80=D1=82=D0=B5=D0=B6=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actions/tactical_engineer_glove_tools.ftl | 4 ++ .../_Forge/entities/clothing/gloves.ftl | 6 ++- .../entities/objects/tools/tactical_tools.ftl | 18 ++++++++ .../Actions/tactical_engineer_glove_tools.yml | 14 ++++++- .../_Forge/Entities/Clothing/Hands/gloves.yml | 12 +++--- .../blueprints/blueprints_engineering.yml | 2 +- .../Entities/Objects/Tools/tactical_tools.yml | 42 +++++++++---------- 7 files changed, 67 insertions(+), 31 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/actions/tactical_engineer_glove_tools.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/tools/tactical_tools.ftl diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/actions/tactical_engineer_glove_tools.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/actions/tactical_engineer_glove_tools.ftl new file mode 100644 index 00000000000..193d2709752 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/actions/tactical_engineer_glove_tools.ftl @@ -0,0 +1,4 @@ +ent-ActionTacticalEngineerGloveToolsMenu = Встроенные в перчатку инструменты + .desc = Открывает радиальное меню для выдачи инструментов +ent-ActionTacticalEngineerGloveAdvancedToolsMenu = Встроенные в перчатку инструменты + .desc = Открывает радиальное меню для выдачи инструментов diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/gloves.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/gloves.ftl index 0d0517881b5..d07d9bcfcdf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/gloves.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/clothing/gloves.ftl @@ -1,2 +1,6 @@ ent-ClothingHandsGlovesCombatTrauma = тактические перчатки TTI - .desc = Стерильные тактические перчатки с плотными защитными вставками и датчиками на подушечках пальцев. Совмещаются с униформой действующих хирургов травматологии и уходят к предплечью, скрываясь тканями одежды. Датчики способны передавать дополнительную информацию на инфовизор, считывая сокращение сердца и дыхание пациента. \ No newline at end of file + .desc = Стерильные тактические перчатки с плотными защитными вставками и датчиками на подушечках пальцев. Совмещаются с униформой действующих хирургов травматологии и уходят к предплечью, скрываясь тканями одежды. Датчики способны передавать дополнительную информацию на инфовизор, считывая сокращение сердца и дыхание пациента. +ent-ClothingHandsGlovesTacticalCombatEngineer = тактические инженерные перчатки + .desc = Тактические перчатки с защитой от огня и ударов током. Содержат встроенный базовый набор инструментов. Однако из-за несовершенства технологий инструменты имеют крайне низкое качество. +ent-ClothingHandsGlovesTacticalCombatEngineerAdvanced = Продвинутые тактические инженерные перчатки + .desc = Улучшенная версия инженерных тактических перчаток. Благодаря технологиям блюспейса теперь снабжены продвинутым набором инструментов. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/tools/tactical_tools.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/tools/tactical_tools.ftl new file mode 100644 index 00000000000..cd5a629b365 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Forge/entities/objects/tools/tactical_tools.ftl @@ -0,0 +1,18 @@ +ent-CrowbarPocketTacticalTool = Встроенный лом + .desc = Встроенный в перчатки лом. Намного хуже обычного лома. +ent-WrenchTacticalTool = Встроенный гаечный ключ + .desc = Встроенный в перчатки гаечный ключ. Намного хуже обычного гаечного ключа. +ent-ScrewdriverTacticalTool = Встроенная отвертка + .desc = Встроенный в перчатки отвертка. Намного хуже обычной отвертки. +ent-WirecutterTacticalTool = Встроенные кусачки + .desc = Встроенный в перчатки кусачки. Намного хуже обычных кусачек +ent-WelderTacticalTool = Встроенная сварка + .desc = Встроенный в перчатки сварка. Намного хуже обычной сварки. +ent-JawsOfLifeTacticalTool = Встроенные челюсти жизни + .desc = Встроенные в перчатки челюсти жизни. Практически неотличимы от ориганала. +ent-PowerDrillTacticalTool = Встроенная электродрель + .desc = Встроенная в перчатки электродрель. Практически неотличима от ориганала. +ent-WelderExperimentalTacticalTool = Встроенная эксперментальная сварка + .desc = Встроенная в перчатки эксперементальная сварка. Практически неотличима от ориганала. +ent-NaniteApplicatorExperimentalTacticalTool = Встроенный эксперементальный нанитный репликатор. + .desc = Встроенный в перчатки эксперементальный нанитный репликатор. Практически неотличим от ориганала. diff --git a/Resources/Prototypes/_Forge/Actions/tactical_engineer_glove_tools.yml b/Resources/Prototypes/_Forge/Actions/tactical_engineer_glove_tools.yml index 36a0ca25cba..9bdbe074a31 100644 --- a/Resources/Prototypes/_Forge/Actions/tactical_engineer_glove_tools.yml +++ b/Resources/Prototypes/_Forge/Actions/tactical_engineer_glove_tools.yml @@ -1,9 +1,19 @@ - type: entity id: ActionTacticalEngineerGloveToolsMenu - name: Встроенные в перчатку инструменты - description: Открывает радиальное меню для выдачи инструментов + name: Integrated gloves tools + description: Open the radial menu to deploy integrated tools. components: - type: InstantAction clientExclusive: true icon: { sprite: _NF/Objects/Tools/wrench.rsi, state: icon } event: !type:OpenModsuitGauntletToolsMenuActionEvent {} + +- type: entity + id: ActionTacticalEngineerGloveAdvancedToolsMenu + name: Integrated gloves tools + description: Open the radial menu to deploy integrated tools. + components: + - type: InstantAction + clientExclusive: true + icon: { sprite: Forge/Objects/Tools/Standart/jaws_of_life.rsi, state: jaws_pry } + event: !type:OpenModsuitGauntletToolsMenuActionEvent {} diff --git a/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml index 99a29bea68f..ace657a693c 100644 --- a/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml @@ -116,8 +116,8 @@ - type: entity parent: ClothingHandsGlovesCombat id: ClothingHandsGlovesTacticalCombatEngineer - name: Тактические инженерные перчатки - description: Тактические перчатки с защитой от огня и ударов. Содержат встроенный базовый набор инструментов. Однако из-за несовершенства технологий инструменты имеют крайне низкое качество. + name: Tactical engineering gloves + description: These tactical gloves are fireproof and shock resistant. They feature a built-in basic tool kit; however, due to technological limitations, the tools are of extremely poor quality. components: - type: Sprite sprite: _Mono/Clothing/Hands/Gloves/tactical_combat_any.rsi @@ -165,8 +165,8 @@ - type: entity parent: ClothingHandsGlovesCombat id: ClothingHandsGlovesTacticalCombatEngineerAdvanced - name: Продвинутые тактические инженерные перчатки - description: Улучшенная версия инженерных тактических перчаток. Благодаря технологиям блюспейса теперь снабжены продвинутым набором инструментов. + name: Advanced tactical engineering gloves + description: An improved version of the engineering tactical gloves. Thanks to Bluespace technology, they are now equipped with an advanced toolset. components: - type: Sprite sprite: _Mono/Clothing/Hands/Gloves/tactical_combat_any.rsi @@ -200,8 +200,8 @@ auxiliaryProto: Multitool - type: ActionGrant actions: - - ActionTacticalEngineerGloveToolsMenu + - ActionTacticalEngineerGloveAdvancedToolsMenu - type: ItemActionGrant actions: - - ActionTacticalEngineerGloveToolsMenu + - ActionTacticalEngineerGloveAdvancedToolsMenu activeIfWorn: true diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Tools/blueprints/blueprints_engineering.yml b/Resources/Prototypes/_Forge/Entities/Objects/Tools/blueprints/blueprints_engineering.yml index c1c492b2c24..2e84de4a18d 100644 --- a/Resources/Prototypes/_Forge/Entities/Objects/Tools/blueprints/blueprints_engineering.yml +++ b/Resources/Prototypes/_Forge/Entities/Objects/Tools/blueprints/blueprints_engineering.yml @@ -20,7 +20,7 @@ - WelderExperimental - PowerDrill - JawsOfLife - - ClothingHandsGlovesTacticalCombatEngineerAdvanced #Forge-Change + #- ClothingHandsGlovesTacticalCombatEngineerAdvanced #Forge-Change - type: entity parent: NFBaseBlueprintEngineering diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml b/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml index ccdfa7e50e1..c48a671c38a 100644 --- a/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml +++ b/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml @@ -1,8 +1,8 @@ - type: entity id: CrowbarPocketTacticalTool parent: CrowbarPocket - name: Встроенный лом - description: Встроенный в перчатки лом. Намного хуже обычного лома. + name: integrated crowbar + description: A crowbar integrated into the gloves. Much worse than a standard crowbar. categories: [ HideSpawnMenu ] components: - type: Tool @@ -11,8 +11,8 @@ - type: entity id: WrenchTacticalTool parent: Wrench - name: Встроенный гаечный ключ - description: Встроенный в перчатки гаечный ключ. Намного хуже обычного гаечного ключа. + name: Integrated wrench + description: A wrench integrated into the gloves. Much worse than a standard wrench. categories: [ HideSpawnMenu ] components: - type: Tool @@ -21,8 +21,8 @@ - type: entity id: ScrewdriverTacticalTool parent: Screwdriver - name: Встроенная отвертка - description: Встроенный в перчатки отвертка. Намного хуже обычной отвертки. + name: Integrated screwdriver + description: A screwdriver integrated into the gloves. Much worse than a standard screwdriver. categories: [ HideSpawnMenu ] components: - type: Tool @@ -31,8 +31,8 @@ - type: entity id: WirecutterTacticalTool parent: Wirecutter - name: Встроенные кусачки - description: Встроенный в перчатки кусачки. Намного хуже обычных кусачек. + name: Integrated wirecutter + description: A wirecutterr integrated into the gloves. Much worse than a standard wirecutter. categories: [ HideSpawnMenu ] components: - type: Tool @@ -41,8 +41,8 @@ - type: entity id: WelderTacticalTool parent: Welder - name: Встроенная сварка - description: Встроенный в перчатки сварка. Намного хуже обычной сварки. + name: Integrated welder + description: A welder integrated into the gloves. Much worse than a standard welder. categories: [ HideSpawnMenu ] components: - type: Tool @@ -59,38 +59,38 @@ - type: entity id: JawsOfLifeTacticalTool parent: JawsOfLife - name: Встроенные челюсти жизни - description: Встроенные в перчатки челюсти жизни. Практически неотличимы от ориганала. + name: Integrated Jaws Of Life + description: A Jaws of Life integrated into the gloves. Virtually indistinguishable from the original. categories: [ HideSpawnMenu ] components: - type: Tool - speedModifier: 1.4 #1.5 original + speedModifier: 1.3 #1.5 original - type: entity id: PowerDrillTacticalTool parent: PowerDrill - name: Встроенная электродрель - description: Встроенная в перчатки электродрель. Практически неотличима от ориганала. + name: Integrated powerdrill + description: A powerdrill integrated into the gloves. Virtually indistinguishable from the original. categories: [ HideSpawnMenu ] components: - type: Tool - speedModifier: 1.4 #1.5 original + speedModifier: 1.3 #1.5 original - type: entity id: WelderExperimentalTacticalTool parent: WelderExperimental - name: Встроенная эксперментальная сварка - description: Встроенная в перчатки эксперементальная сварка. Практически неотличима от ориганала. + name: Integrated experimental welder + description: A experimental welder integrated into the gloves. Virtually indistinguishable from the original. categories: [ HideSpawnMenu ] components: - type: Tool - speedModifier: 1.2 #1.3 original + speedModifier: 1.1 #1.3 original - type: entity id: NaniteApplicatorExperimentalTacticalTool parent: NaniteApplicatorExperimental - name: Встроенный эксперементальный нанитный репликатор. - description: Встроенный в перчатки эксперементальный нанитный репликатор. Практически неотличим от ориганала. + name: Integrated experimental nanite applicator + description: A experimental nanite applicator integrated into the gloves. Virtually indistinguishable from the original. categories: [ HideSpawnMenu ] components: - type: Tool From 99f84cf1a2f74355c48f273ab6b9740d70573a67 Mon Sep 17 00:00:00 2001 From: teasum Date: Sun, 2 Aug 2026 12:52:35 +0300 Subject: [PATCH 7/7] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B1=D0=B0=D0=BB=D0=B0=D0=BD=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Forge/Entities/Objects/Tools/tactical_tools.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml b/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml index c48a671c38a..e4797e8b1e6 100644 --- a/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml +++ b/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml @@ -64,7 +64,7 @@ categories: [ HideSpawnMenu ] components: - type: Tool - speedModifier: 1.3 #1.5 original + speedModifier: 1.2 #1.5 original - type: entity id: PowerDrillTacticalTool @@ -74,7 +74,7 @@ categories: [ HideSpawnMenu ] components: - type: Tool - speedModifier: 1.3 #1.5 original + speedModifier: 1.2 #1.5 original - type: entity id: WelderExperimentalTacticalTool @@ -84,7 +84,7 @@ categories: [ HideSpawnMenu ] components: - type: Tool - speedModifier: 1.1 #1.3 original + speedModifier: 1.0 #1.3 original - type: entity id: NaniteApplicatorExperimentalTacticalTool @@ -94,4 +94,4 @@ categories: [ HideSpawnMenu ] components: - type: Tool - speedModifier: 0.9 #1 original + speedModifier: 0.7 #1 original