Adds PKA & Jetpack Module for Salvage Cyborgs

Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs

@@ -15,6 +15,7 @@
 using Content.Shared.Database;
 using Content.Shared.Interaction;
 using Content.Shared.Lock;
+using Content.Server.Silicons.Borgs.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -91,6 +92,10 @@ private void DirtyUI(EntityUid uid,
         if (canister.GasTankSlot.Item != null)
         {
             var tank = canister.GasTankSlot.Item.Value;
+            if (TryComp<BorgJetpackComponent>(tank, out var jetpack) && jetpack.JetpackUid.HasValue)
+            {
+                tank = jetpack.JetpackUid.Value;
+            }
             var tankComponent = Comp<GasTankComponent>(tank);
             tankLabel = Name(tank);
             tankPressure = tankComponent.Air.Pressure;
@@ -163,7 +168,12 @@ private void OnCanisterUpdated(EntityUid uid, GasCanisterComponent canister, ref
         {
             if (canister.GasTankSlot.Item != null)
             {
-                var gasTank = Comp<GasTankComponent>(canister.GasTankSlot.Item.Value);
+                var tank = canister.GasTankSlot.Item;
+                if (TryComp<BorgJetpackComponent>(tank, out var jetpack) && jetpack.JetpackUid.HasValue)
+                {
+                    tank = jetpack.JetpackUid.Value;
+                }
+                var gasTank = Comp<GasTankComponent>(tank.Value);
                 _atmos.ReleaseGasTo(canister.Air, gasTank.Air, canister.ReleasePressure);
             }
             else
@@ -233,7 +243,19 @@ private void OnCanisterInsertAttempt(EntityUid uid, GasCanisterComponent compone
         if (args.Slot.ID != component.ContainerName || args.User == null)
             return;
 
-        if (!TryComp<GasTankComponent>(args.Item, out var gasTank) || gasTank.IsValveOpen)
+        var tank = args.Item;
+
+        if (TryComp<BorgJetpackComponent>(tank, out var jetpack))
+        {
+            if (!jetpack.JetpackUid.HasValue)
+            {
+                args.Cancelled = true;
+                return;
+            }
+            tank = jetpack.JetpackUid.Value;
+        }
+
+        if (!TryComp<GasTankComponent>(tank, out var gasTank) || gasTank.IsValveOpen)
         {
             args.Cancelled = true;
             return;

Content.Server/Silicons/Borgs/BorgSystem.Modules.cs

@@ -2,6 +2,7 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Silicons.Borgs.Components;
+using Content.Server.Silicons.Borgs.Components;
 using Robust.Shared.Containers;
 
 namespace Content.Server.Silicons.Borgs;
@@ -190,6 +191,10 @@ private void ProvideItems(EntityUid chassis, EntityUid uid, BorgChassisComponent
             if (!component.ItemsCreated)
             {
                 item = Spawn(itemProto, xform.Coordinates);
+                if (TryComp<BorgJetpackComponent>(uid, out var module))
+                {
+                    module.JetpackUid = item;
+                }
             }
             else
             {

Content.Server/Silicons/Borgs/Components/BorgJetpackComponent.cs

@@ -0,0 +1,12 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Server.Silicons.Borgs.Components;
+
+/// <summary>
+/// Server side indicator for a jetpack module. Used as conditional for inserting in canisters.
+/// </summary>
+[RegisterComponent]
+public sealed partial class BorgJetpackComponent : Component
+{
+    public EntityUid? JetpackUid = null;
+}

Resources/Locale/en-US/research/technologies.ftl

@@ -16,6 +16,7 @@ research-technology-shuttlecraft = Shuttlecraft
 research-technology-ripley-aplu = Ripley APLU
 research-technology-advanced-atmospherics = Advanced Atmospherics
 research-technology-advanced-tools = Advanced Tools
+research-technology-mechanized-salvaging = Mechanized Salvaging
 research-technology-super-powercells = Super Powercells
 research-technology-bluespace-storage = Bluespace Storage
 research-technology-portable-fission = Portable Fission

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

@@ -210,6 +210,34 @@
     - Crowbar
     - RadioHandheld
 
+- type: entity
+  id: BorgModuleJetpack
+  parent: [ BaseBorgModuleCargo, BaseProviderBorgModule ]
+  name: jetpack cyborg module
+  description: A piece of tech that gives cyborgs new abilities. Needs to be loaded by a cyborg before you can refill the jetpack.
+  components:
+  - type: Sprite
+    layers:
+    - state: cargo
+    - state: icon-jetpack
+  - type: BorgJetpack
+  - type: ItemBorgModule
+    items:
+    - JetpackMicroFilled
+
+- type: entity
+  id: BorgModulePka
+  parent: [ BaseBorgModuleCargo, BaseProviderBorgModule ]
+  name: proto kinetic accelerator cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: cargo
+    - state: icon-pka
+  - type: ItemBorgModule
+    items:
+    - WeaponProtoKineticAccelerator
+
 - type: entity
   id: BorgModuleGrapplingGun
   parent: [ BaseBorgModuleCargo, BaseProviderBorgModule ]

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

@@ -295,3 +295,43 @@
       moles:
         - 1.025689525 # oxygen
         - 1.025689525 # nitrogen
+
+#Empty micro - Used in the Cyborg module, visually the same as mini jetpack.
+- type: entity
+  id: JetpackMicro
+  parent: BaseJetpack
+  name: micro jetpack
+  suffix: Empty
+  components:
+    - type: Item
+      sprite: Objects/Tanks/Jetpacks/mini.rsi
+    - type: Sprite
+      sprite: Objects/Tanks/Jetpacks/mini.rsi
+    - type: Clothing
+      sprite: Objects/Tanks/Jetpacks/mini.rsi
+      slots:
+        - Back
+        - suitStorage
+        - Belt
+    - type: GasTank
+      outputPressure: 42.6
+      air:
+        volume: 0.75
+
+
+# Filled micro
+- type: entity
+  id: JetpackMicroFilled
+  parent: JetpackMicro
+  name: micro jetpack
+  suffix: Filled
+  components:
+  - type: GasTank
+    outputPressure: 42.6
+    air:
+      # 2 minutes of thrust
+      volume: 0.75
+      temperature: 293.15
+      moles:
+        - 0.153853429 # oxygen
+        - 0.153853429 # nitrogen

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

@@ -593,6 +593,8 @@
     - BorgModuleAdvancedTool
     - BorgModuleGPS
     - BorgModuleRCD
+    - BorgModuleJetpack
+    - BorgModulePka
     - BorgModuleArtifact
     - BorgModuleAnomaly
     - BorgModuleGardening

Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml

@@ -98,6 +98,7 @@
         whitelist:
           components:
             - GasTank
+            - BorgJetpack
     - type: StaticPrice
       price: 1000
     - type: AccessReader

Resources/Prototypes/Recipes/Lathes/robotics.yml

@@ -612,3 +612,27 @@
     Steel: 250
     Glass: 250
     Plastic: 250
+
+- type: latheRecipe
+  id: BorgModulePka
+  result: BorgModulePka
+  category: Robotics
+  completetime: 3
+  materials:
+    Steel: 1000
+    Glass: 500
+    Plastic: 500
+    Silver: 100
+
+- type: latheRecipe
+  id: BorgModuleJetpack
+  result: BorgModuleJetpack
+  category: Robotics
+  completetime: 3
+  materials:
+    Steel: 250
+    Glass: 250
+    Plastic: 250
+    Gold: 100
+    Plasma: 1000
+

Resources/Prototypes/Research/industrial.yml

@@ -179,6 +179,19 @@
     - BorgModuleAdvancedTool
     - BorgModuleRCD
 
+- type: technology
+  id: MechanizedSalvaging
+  name: research-technology-mechanized-salvaging
+  icon:
+    sprite: Mobs/Silicon/chassis.rsi
+    state: miner
+  discipline: Industrial
+  tier: 2
+  cost: 10000
+  recipeUnlocks:
+  - BorgModulePka
+  - BorgModuleJetpack
+
 # Tier 3
 
 - type: technology

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

@@ -61,6 +61,9 @@
     {
       "name": "icon-harvesting"
     },
+    {
+      "name": "icon-jetpack"
+    },
     {
       "name": "icon-light-replacer"
     },
@@ -79,6 +82,9 @@
     {
       "name": "icon-pen"
     },
+    {
+      "name": "icon-pka"
+    },
     {
       "name": "icon-radiation"
     },