From 91e1cde9b9770f1026e000c1a78d6c688cbd25a5 Mon Sep 17 00:00:00 2001
From: LankLTE <twlowe06@gmail.com>
Date: Thu, 13 Jul 2023 19:31:02 -0700
Subject: [PATCH 1/2] jetpack tech

---
 Resources/Locale/en-US/research/technologies.ftl       |  2 +-
 .../Prototypes/Entities/Structures/Machines/lathe.yml  |  1 +
 Resources/Prototypes/Recipes/Lathes/devices.yml        | 10 ++++++++++
 Resources/Prototypes/Research/civilianservices.yml     | 10 +++++-----
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index 9f8bbf84ba3..7f897db0ca8 100644
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -63,4 +63,4 @@ research-technology-advanced-cleaning = Advanced Cleaning
 research-technology-meat-manipulation = Meat Manipulation
 research-technology-honk-mech = H.O.N.K. Mech
 research-technology-advanced-spray = Advanced Spray
-research-technology-bluespace-cargo-transport = Bluespace Cargo Transport
+research-techology-advanced-personal-propulsion = Advanced Personal Propulsion
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index a83fe7a63b4..48ce24f5a39 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -227,6 +227,7 @@
       - WelderExperimental
       - JawsOfLife
       - UtilityBeltChiefEngineer
+      - JetpackVoid
 
 - type: entity
   id: CircuitImprinter
diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml
index 82e3eb46a1d..5a04e7943d3 100644
--- a/Resources/Prototypes/Recipes/Lathes/devices.yml
+++ b/Resources/Prototypes/Recipes/Lathes/devices.yml
@@ -165,3 +165,13 @@
     Steel: 500
     Glass: 400
     Gold: 100
+
+- type: latheRecipe
+  id: JetpackVoid
+  result: JetpackVoidFilled
+  completetime: 5
+  materials:
+    Steel: 1000
+    Silver: 500
+    Plasma: 500
+    Uranium: 250
\ No newline at end of file
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 46b0598731d..1cc24d0396e 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -173,13 +173,13 @@
 # Tier 3
 
 - type: technology
-  id: BluespaceCargoTransport
-  name: research-technology-bluespace-cargo-transport
+  id: AdvancedPersonalPropulsion
+  name: research-techology-advanced-personal-propulsion
   icon:
-    sprite: Structures/cargo_telepad.rsi
-    state: display
+    sprite: Objects/Tanks/Jetpacks/void.rsi
+    state: icon
   discipline: CivilianServices
   tier: 3
   cost: 15000
   recipeUnlocks:
-  - CargoTelepadMachineCircuitboard
+  - JetpackVoid

From 5ea380a54566acd799388b729094983fa6e1b3ed Mon Sep 17 00:00:00 2001
From: LankLTE <twlowe06@gmail.com>
Date: Thu, 13 Jul 2023 20:03:18 -0700
Subject: [PATCH 2/2] ftl fix

---
 Resources/Locale/en-US/_NF/research/technologies.ftl | 1 +
 Resources/Locale/en-US/research/technologies.ftl     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Locale/en-US/_NF/research/technologies.ftl

diff --git a/Resources/Locale/en-US/_NF/research/technologies.ftl b/Resources/Locale/en-US/_NF/research/technologies.ftl
new file mode 100644
index 00000000000..090b62aaa59
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/research/technologies.ftl
@@ -0,0 +1 @@
+research-techology-advanced-personal-propulsion = Advanced Personal Propulsion
\ No newline at end of file
diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index 7f897db0ca8..9f8bbf84ba3 100644
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -63,4 +63,4 @@ research-technology-advanced-cleaning = Advanced Cleaning
 research-technology-meat-manipulation = Meat Manipulation
 research-technology-honk-mech = H.O.N.K. Mech
 research-technology-advanced-spray = Advanced Spray
-research-techology-advanced-personal-propulsion = Advanced Personal Propulsion
+research-technology-bluespace-cargo-transport = Bluespace Cargo Transport