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/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/Actions/tactical_engineer_glove_tools.yml b/Resources/Prototypes/_Forge/Actions/tactical_engineer_glove_tools.yml new file mode 100644 index 00000000000..9bdbe074a31 --- /dev/null +++ b/Resources/Prototypes/_Forge/Actions/tactical_engineer_glove_tools.yml @@ -0,0 +1,19 @@ +- type: entity + id: ActionTacticalEngineerGloveToolsMenu + 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 570b77cd799..ace657a693c 100644 --- a/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/_Forge/Entities/Clothing/Hands/gloves.yml @@ -112,3 +112,96 @@ - type: Clothing sprite: Forge/Clothing/Hands/Gloves/tti_gloves.rsi - type: Insulated + +- type: entity + parent: ClothingHandsGlovesCombat + id: ClothingHandsGlovesTacticalCombatEngineer + 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 + color: "#d1c300" + - type: Clothing + sprite: _Mono/Clothing/Hands/Gloves/tactical_combat_any.rsi + clothingVisuals: + gloves: + - state: equipped-HAND + color: "#d1c300" + - type: Item + inhandVisuals: + left: + - state: inhand-left + color: "#d1c300" + right: + - state: inhand-right + color: "#d1c300" + - type: ModsuitGauntletTools + usePrototypeMenuIcons: true + enabledSlots: + - Urk + - Omnitool + - Welder + - NaniteApplicator + - Auxiliary + - Piping + urkProto: CrowbarPocketTacticalTool + omnitoolProto: WrenchTacticalTool + welderProto: ScrewdriverTacticalTool + naniteApplicatorProto: WirecutterTacticalTool + auxiliaryProto: WelderTacticalTool + pipingProto: Multitool + - type: ActionGrant + actions: + - ActionTacticalEngineerGloveToolsMenu + - type: ItemActionGrant + actions: + - ActionTacticalEngineerGloveToolsMenu + activeIfWorn: true + - type: StaticPrice + price: 12000 + vendPrice: 15000 + +- type: entity + parent: ClothingHandsGlovesCombat + id: ClothingHandsGlovesTacticalCombatEngineerAdvanced + 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 + 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: + - ActionTacticalEngineerGloveAdvancedToolsMenu + - type: ItemActionGrant + actions: + - 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 097d0c7918d..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,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 new file mode 100644 index 00000000000..e4797e8b1e6 --- /dev/null +++ b/Resources/Prototypes/_Forge/Entities/Objects/Tools/tactical_tools.yml @@ -0,0 +1,97 @@ +- type: entity + id: CrowbarPocketTacticalTool + parent: CrowbarPocket + name: integrated crowbar + description: A crowbar integrated into the gloves. Much worse than a standard crowbar. + categories: [ HideSpawnMenu ] + components: + - type: Tool + speedModifier: 0.2 #1 original + +- type: entity + id: WrenchTacticalTool + parent: Wrench + name: Integrated wrench + description: A wrench integrated into the gloves. Much worse than a standard wrench. + categories: [ HideSpawnMenu ] + components: + - type: Tool + speedModifier: 0.2 #1 original + +- type: entity + id: ScrewdriverTacticalTool + parent: Screwdriver + name: Integrated screwdriver + description: A screwdriver integrated into the gloves. Much worse than a standard screwdriver. + categories: [ HideSpawnMenu ] + components: + - type: Tool + speedModifier: 0.2 #1 original + +- type: entity + id: WirecutterTacticalTool + parent: Wirecutter + name: Integrated wirecutter + description: A wirecutterr integrated into the gloves. Much worse than a standard wirecutter. + categories: [ HideSpawnMenu ] + components: + - type: Tool + speedModifier: 0.2 #1 original + +- type: entity + id: WelderTacticalTool + parent: Welder + name: Integrated welder + description: A welder integrated into the gloves. Much worse than a standard welder. + categories: [ HideSpawnMenu ] + components: + - type: Tool + speedModifier: 0.2 #1 original + - type: SolutionContainerManager + solutions: + Welder: + reagents: + - ReagentId: WeldingFuel + Quantity: 25 + maxVol: 25 + +#advanced +- type: entity + id: JawsOfLifeTacticalTool + parent: JawsOfLife + 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.2 #1.5 original + +- type: entity + id: PowerDrillTacticalTool + parent: PowerDrill + name: Integrated powerdrill + description: A powerdrill integrated into the gloves. Virtually indistinguishable from the original. + categories: [ HideSpawnMenu ] + components: + - type: Tool + speedModifier: 1.2 #1.5 original + +- type: entity + id: WelderExperimentalTacticalTool + parent: WelderExperimental + name: Integrated experimental welder + description: A experimental welder integrated into the gloves. Virtually indistinguishable from the original. + categories: [ HideSpawnMenu ] + components: + - type: Tool + speedModifier: 1.0 #1.3 original + +- type: entity + id: NaniteApplicatorExperimentalTacticalTool + parent: NaniteApplicatorExperimental + name: Integrated experimental nanite applicator + description: A experimental nanite applicator integrated into the gloves. Virtually indistinguishable from the original. + categories: [ HideSpawnMenu ] + components: + - type: Tool + speedModifier: 0.7 #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/_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 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