Jetpack Module and Cyborg Action Icons for Our Modules

Content.Server/_NF/Whitelist/Components/NFBorgJetpackComponent.cs

@@ -0,0 +1,7 @@
+namespace Content.Server._NF.Whitelist.Components;
+
+/// <summary>
+/// Whitelist component for borg-suitable jetpacks to avoid tag redefinition and collisions
+/// </summary>
+[RegisterComponent]
+public sealed partial class NFBorgJetpackComponent : Component;

Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml

@@ -245,7 +245,6 @@
     damageProtection:
       flatReductions:
         Heat: 10 # capable of touching light bulbs and stoves without feeling pain!
-  - type: JetpackUser # DeltaV: Lets cyborgs fly in space
 
 - type: entity
   abstract: true

Resources/Prototypes/Entities/Mobs/Player/silicon.yml

@@ -605,7 +605,8 @@
         - PositronicBrain
       borg_module:
         - BorgModuleTool
-        - BorgModuleFireExtinguisher
+        # - BorgModuleFireExtinguisher # Frontier
+        - BorgModuleJetpack # Frontier
         - BorgModuleGPS
   - type: ItemSlots
     slots:

Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml

@@ -77,7 +77,7 @@
 #Empty blue
 - type: entity
   id: JetpackBlue
-  parent: BaseJetpack
+  parent: NFBaseJetpackBackMount # Frontier: BaseJetpack<NFBaseJetpackBackMount
   name: jetpack
   suffix: Empty
   components:
@@ -110,7 +110,7 @@
 #Empty black
 - type: entity
   id: JetpackBlack
-  parent: [BaseJetpack, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband
+  parent: [NFBaseJetpackBackMount, BaseC3SyndicateContraband] # Frontier: BaseJetpack<NFBaseJetpackBackMount, BaseSyndicateContraband<BaseC3SyndicateContraband
   name: jetpack
   suffix: Empty
   components:
@@ -145,7 +145,7 @@
 #Empty captain
 - type: entity
   id: JetpackCaptain
-  parent: BaseJetpack # Frontier: remove BaseGrandTheftContraband
+  parent: NFBaseJetpackBackMount # Frontier: remove BaseGrandTheftContraband, BaseJetpack<NFBaseJetpackBackMount
   name: captain's jetpack
   suffix: Empty
   components:
@@ -186,7 +186,7 @@
 #Empty mini
 - type: entity
   id: JetpackMini
-  parent: BaseJetpack
+  parent: NFBaseJetpackBackMount # Frontier: BaseJetpack<NFBaseJetpackBackMount
   name: mini jetpack
   description: It's a jetpack. It can hold 1.5 L of gas.
   suffix: Empty
@@ -228,7 +228,7 @@
 #Empty security
 - type: entity
   id: JetpackSecurity
-  parent: [BaseJetpack, BaseC2ContrabandUnredeemable] # Frontier: BaseRestrictedContraband<BaseC2ContrabandUnredeemable
+  parent: [NFBaseJetpackBackMount, BaseC2ContrabandUnredeemable] # Frontier: BaseJetpack<NFBaseJetpackBackMount, BaseRestrictedContraband<BaseC2ContrabandUnredeemable
   name: security jetpack
   suffix: Empty
   components:
@@ -263,7 +263,7 @@
 #Empty void
 - type: entity
   id: JetpackVoid
-  parent: BaseJetpack
+  parent: NFBaseJetpackBackMount # Frontier: BaseJetpack<NFBaseJetpackBackMount
   name: void jetpack
   suffix: Empty
   components:

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -686,6 +686,7 @@
     - BorgModuleHarvesting
     - BorgModuleDefibrillator
     - BorgModuleAdvancedTreatment
+    - BorgModuleJetpack # Frontier
     - BorgModuleAdvancedParamedic # Frontier
     - BorgModuleAdvancedMining # Frontier
     - RipleyHarness

Resources/Prototypes/Research/industrial.yml

@@ -172,6 +172,7 @@
     - JawsOfLife
     - UtilityBeltChiefEngineer
     - BorgModuleAdvancedTool
+    - BorgModuleJetpack # Frontier
     - NFBlueprintPowerDrill # Frontier
     - NFBlueprintJawsOfLife # Frontier
     - NFBlueprintWelderExperimental # Frontier

Resources/Prototypes/_NF/Entities/Objects/Specific/Robotics/borg_modules.yml

@@ -20,6 +20,8 @@
       whitelist:
         components:
         - NFOreBag
+  - type: BorgModuleIcon
+    icon: { sprite: _NF/Interface/Actions/actions_borg.rsi, state: adv-drill-module }
 
 - type: entity
   id: BorgModuleAdvancedParamedic
@@ -39,3 +41,24 @@
     - Gauze10Lingering
     - Bloodpack10Lingering
     - SyringeBluespace
+  - type: BorgModuleIcon
+    icon: { sprite: _NF/Interface/Actions/actions_borg.rsi, state: adv-paramed-module }
+
+- type: entity
+  id: BorgModuleJetpack
+  parent: [ BaseBorgModule, BaseProviderBorgModule ]
+  name: jetpack cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: generic
+    - state: icon-jetpack
+      sprite: _NF/Objects/Specific/Robotics/borgmodule.rsi
+  - type: ItemBorgModule
+    droppableItems:
+    - id: JetpackBlueFilled
+      whitelist:
+        components:
+        - NFBorgJetpack
+  - type: BorgModuleIcon
+    icon: { sprite: _NF/Interface/Actions/actions_borg.rsi, state: jetpack-module }

Resources/Prototypes/_NF/Entities/Objects/Tools/jetpacks.yml

@@ -1,4 +1,12 @@
-#Empty security
+# Base back-mounted jetpack (e.g. not syndie magboots)
+- type: entity
+  id: NFBaseJetpackBackMount
+  parent: BaseJetpack
+  abstract: true
+  components:
+  - type: NFBorgJetpack
+
+# Empty security
 - type: entity
   id: JetpackNfsd
   parent: JetpackSecurity
@@ -12,7 +20,7 @@
   - type: Clothing
     sprite: _NF/Objects/Tanks/Jetpacks/nfsd.rsi
 
-#Filled security
+# Filled security
 - type: entity
   id: JetpackNfsdFilled
   parent: JetpackSecurityFilled

Resources/Prototypes/_NF/Recipes/Lathes/robotics.yml

@@ -19,3 +19,13 @@
     Plastic: 250
     Bluespace: 200 # OreBagOfHolding Bluepsace price
     Diamond: 100 # MiningDrillDiamond Diamond price
+
+- type: latheRecipe
+  id: BorgModuleJetpack
+  result: BorgModuleJetpack
+  parent: BaseBorgModuleRecipe
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 250
+    Gold: 50

Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/meta.json

@@ -0,0 +1,20 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-4.0",
+    "copyright": "Made by GhostPrince for Frontier Station 14",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "adv-drill-module"
+        },
+        {
+            "name": "adv-paramed-module"
+        },
+        {
+            "name": "jetpack-module"
+        }
+    ]
+}

Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/meta.json

@@ -10,6 +10,9 @@
         {
             "name": "icon-advancedmining"
         },
+        {
+            "name": "icon-jetpack"
+        },
         {
             "name": "icon-paramedic"
         }