SerbiaStrong-220 · lexaSvarshik · Oct 17, 2024 · Oct 17, 2024 · Sep 11, 2024 · Oct 17, 2024
diff --git a/Resources/Locale/en-US/ss220/store/uplink-catalog.ftl b/Resources/Locale/en-US/ss220/store/uplink-catalog.ftl
@@ -7,5 +7,8 @@ uplink-clothing-eyes-hud-syndicate-agent-desc = The syndicate's advanced head-up
 uplink-helmet-swat-syndicate-name = Syndicate SWAT Helmet
 uplink-helmet-swat-syndicate-desc = An extremely robust helmet, commonly used by paramilitary forces. It is adorned in a nefarious red and black stripe pattern.
 
+uplink-borg-module-axe-name = Modified fire axe cyborg module
+uplink-borg-module-axe-desc = A versatile module that gives cyborgs a modified fire axe that sets victims on fire when hit
+
 uplink-silent-shoes-name = Silent shoes
 uplink-silent-shoes-desc = Completely silent shoes used on Syndicate spy missions.
diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/specific/robotics/borg_modules.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/specific/robotics/borg_modules.ftl
@@ -0,0 +1,6 @@
+ent-BorgModuleProtoKineticAccelerator = протокинетический модуль киборга
+    .desc = Техническая деталь, дающая киборгам новые способности.
+ent-BorgModuleFireAxe = модуль киборга с пожарным топором
+    .desc = Техническая деталь, дающая киборгам пожарный топор!
+ent-BorgModuleFlamingAxe = модуль киборга с пожарным топором
+    .desc = Техническая деталь, дающая киборгам пожарный топор, поджигающий жертв!
diff --git a/Resources/Locale/ru-RU/ss220/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/ss220/store/uplink-catalog.ftl
@@ -38,5 +38,8 @@ uplink-criminal-delivery-desc = Содержит случайную маску,
 uplink-helmet-swat-syndicate-name = Шлем пехотинца Синдиката
 uplink-helmet-swat-syndicate-desc = Очень прочный шлем, обычно используемый военизированными формированиями Синдиката. Он украшен зловещим узором из красных и черных полос.
 
+uplink-borg-module-axe-name = Модуль киборга с огнетопором
+uplink-borg-module-axe-desc = Универсальный модуль, дающий киборгам модифицированный пожарный топор, поджигающий жертв при ударе
+
 uplink-silent-shoes-name = Бесшумные ботинки
 uplink-silent-shoes-desc = Совершенно бесшумные ботинки, используемые на шпионских миссиях Синдиката.
diff --git a/Resources/Locale/ru-RU/ss220/weapons/borg_fireaxe.ftl b/Resources/Locale/ru-RU/ss220/weapons/borg_fireaxe.ftl
@@ -0,0 +1,4 @@
+ent-BorgFireAxe = пожарный топор киборга
+    .desc = Специальный укороченный топор для инженерных киборгов, предназначен для борьбы с огнём и обилием стен!
+ent-BorgFireAxeFlaming = пожарный топор киборга
+    .desc = Модифицированный компанией Cybersun пожарный топор, подходящий для любых типов шасси! При ударе поджигает жертв.
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -624,6 +624,7 @@
     - BorgModuleProtoKineticAccelerator #SS220 Borg Modules
     - BorgModuleAdvancedTool
     - BorgModuleGPS
+    - BorgModuleFireAxe #SS220 Borg Modules
     - BorgModuleArtifact
     - BorgModuleAnomaly
     - BorgModuleGardening

diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
@@ -169,6 +169,7 @@
     - JawsOfLife
     - BorgModuleAdvancedTool
     - BorgModuleProtoKineticAccelerator # ss220
+    - BorgModuleFireAxe #SS220 Borg Modules
 
 # ss220 start thermoelectric generator
 - type: technology

diff --git a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml
@@ -187,6 +187,19 @@
   categories:
   - UplinkWearables
 
+- type: listing
+  id: UplinkBorgModuleFlamingAxe
+  name: uplink-borg-module-axe-name
+  description: uplink-borg-module-axe-desc
+  productEntity: BorgModuleFlamingAxe
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
+  cost:
+    Telecrystal: 3
+  categories:
+  - UplinkDisruption
+
 - type: listing
   id: ClothingSilentShoes
   name: uplink-silent-shoes-name

diff --git a/Resources/Prototypes/SS220/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/SS220/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -2,8 +2,7 @@
 - type: entity
   id: BorgModuleProtoKineticAccelerator
   parent: [ BaseBorgModuleCargo, BaseProviderBorgModule ]
-  name: протокинетический модуль киборга
-  description: Техническая деталь, дающая киборгам новые способности.
+  name: protokinetic cyborg module
   components:
   - type: Sprite
     layers:
@@ -13,4 +12,33 @@
     items:
     - WeaponProtoKineticAccelerator
     - JetpackBorgModule
-    - HandheldGPSBasic
+    - HandheldGPSBasic
+
+#Svarshik's cyborg fireaxes
+- type: entity
+  id: BorgModuleFireAxe
+  parent: [ BaseBorgModuleEngineering, BaseProviderBorgModule ]
+  name: fire axe cyborg module
+  description: A piece of tech that gives cyborgs a fire axe!
+  components:
+    - type: Sprite
+      layers:
+        - state: engineering
+        - state: icon-fireaxe
+    - type: ItemBorgModule
+      items:
+        - BorgFireAxe
+
+- type: entity
+  id: BorgModuleFlamingAxe
+  parent: [ BaseBorgModule, BaseProviderBorgModule ]
+  name: modified fire axe cyborg module
+  description: A piece of tech that gives cyborgs a fire axe that sets victims on fire!
+  components:
+    - type: Sprite
+      layers:
+        - state: syndicate
+        - state: icon-fireaxe-flaming
+    - type: ItemBorgModule
+      items:
+        - BorgFireAxeFlaming
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/borgFireaxe.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/borgFireaxe.yml
@@ -0,0 +1,69 @@
+- type: entity
+  name: borg fire axe
+  parent: [BaseItem]
+  id: BorgFireAxe
+  description: A special shortened axe for engineering cyborgs, designed to fight fire and an abundance of walls!
+  components:
+  - type: Tag
+    tags:
+    - FireAxe
+  - type: Sharp
+  - type: Execution
+    doAfterDuration: 4.0
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/fireaxe.rsi
+    state: icon
+  - type: MeleeWeapon
+    wideAnimationRotation: 135
+    swingLeft: true
+    attackRate: 0.75
+    damage:
+      types:
+        # axes are kinda like sharp hammers, you know?
+        Blunt: 5
+        Slash: 10
+        Structural: 90 #ss220
+    soundHit:
+      collection: MetalThud
+  - type: Item
+    size: Ginormous
+  - type: Tool
+    qualities:
+      - Prying
+      - PlatingCutting #SS220-tools-tile-prying-fix
+  - type: ToolTileCompatible
+  - type: Prying
+  - type: UseDelay
+    delay: 1
+  - type: IgniteOnMeleeHit
+    fireStacks: -4
+
+- type: entity
+  id: BorgFireAxeFlaming
+  name: borg fire axe
+  parent: BorgFireAxe
+  description: Cybersun's modified fire axe, suitable for all types of borg chassis! It sets victims on fire on impact.
+  components:
+  - type: MeleeWeapon
+    wideAnimationRotation: 135
+  - type: IgniteOnMeleeHit
+    fireStacks: 1
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/fireaxeflaming.rsi
+    state: icon
+# Corvax-HiddenDesc-Start
+  - type: HiddenDescription
+    entries:
+    - label: corvax-hidden-desc-FireAxeFlaming-syndicate
+      whitelistMind:
+        components:
+          - TraitorRole
+          - NukeOperative
+    - label: corvax-hidden-desc-FireAxeFlaming-research
+      jobRequired:
+        - ResearchAssistant
+        - ResearchDirector
+        - Scientist
+        - Borg
+# Corvax-HiddenDesc-End
+
diff --git a/Resources/Prototypes/SS220/Recipes/Lathes/robotics.yml b/Resources/Prototypes/SS220/Recipes/Lathes/robotics.yml
@@ -6,4 +6,9 @@
   materials:
     Steel: 600
     Glass: 600
-    Silver: 100
+    Silver: 100
+
+- type: latheRecipe
+  parent: BaseGoldBorgModuleRecipe
+  id: BorgModuleFireAxe
+  result: BorgModuleFireAxe
diff --git a/...rces/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-fireaxe-flaming.png b/...rces/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-fireaxe-flaming.png
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-fireaxe.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-fireaxe.png
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC0-1.0",
-  "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). icon-ProtoKinetic-gun made by discord glek3197 for SS220. syndicateborgbomb.png created by Mangohydra (github).",
+  "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). icon-ProtoKinetic-gun made by discord glek3197 for SS220. syndicateborgbomb.png created by Mangohydra (github). icon-fireaxe by lexasvarshik(github)",
   "size": {
     "x": 32,
     "y": 32
@@ -46,6 +46,12 @@
     {
       "name": "icon-fire-extinguisher"
     },
+    {
+      "name": "icon-fireaxe"
+    },
+    {
+        "name": "icon-fireaxe-flaming"
+    },
     {
       "name": "icon-gardening"
     },