From f7e4a69b65b30572018891ac1c393054998d5a7c Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Fri, 16 Jun 2023 13:56:59 +1000
Subject: [PATCH] Move PKA to a tech (#17043)

---
 .../Locale/en-US/research/technologies.ftl    |  1 +
 Resources/Maps/origin.yml                     | 14 ----------
 .../Catalog/Fills/Lockers/cargo.yml           |  2 --
 .../VendingMachines/Inventories/salvage.yml   |  1 -
 .../Entities/Structures/Machines/lathe.yml    |  3 +++
 .../Prototypes/Recipes/Lathes/devices.yml     | 27 +++++++++++++++++++
 Resources/Prototypes/Research/industrial.yml  | 15 +++++++++++
 7 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index 9a6a6ddca1..f44c240795 100644
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -4,6 +4,7 @@ research-discipline-biochemical = Biochemical
 research-discipline-experimental = Experimental
 research-discipline-civilian-services = Civilian Services
 
+research-technology-salvage-weapons = Salvage weapons
 research-technology-salvage-equipment = Salvage Equipment
 research-technology-advanced-powercells = Advanced Powercells
 research-technology-compact-power = Compact Power
diff --git a/Resources/Maps/origin.yml b/Resources/Maps/origin.yml
index 929537e46f..e993b2e29c 100644
--- a/Resources/Maps/origin.yml
+++ b/Resources/Maps/origin.yml
@@ -217575,20 +217575,6 @@ entities:
     - pos: 31.586092,32.47933
       parent: 2
       type: Transform
-- proto: WeaponProtoKineticAccelerator
-  entities:
-  - uid: 30107
-    components:
-    - pos: -36.73277,27.512495
-      parent: 2
-      type: Transform
-  - uid: 30108
-    components:
-    - pos: -47.53973,38.643734
-      parent: 2
-      type: Transform
-    - nextFire: 1226.6534384
-      type: Gun
 - proto: WeaponRevolverDeckard
   entities:
   - uid: 30109
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
index 434894366c..3c37d416d8 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -14,7 +14,6 @@
 #      - id: ClothingEyesGlassesMeson
       - id: ClothingBeltUtilityFilled
       - id: SurvivalKnife
-      - id: WeaponProtoKineticAccelerator
 
 - type: entity
   id: LockerSalvageSpecialistFilled
@@ -27,4 +26,3 @@
 #      - id: ClothingEyesGlassesMeson
       - id: ClothingBeltUtilityFilled
       - id: SurvivalKnife
-      - id: WeaponProtoKineticAccelerator
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
index 960a6a78f9..51700a9015 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
@@ -9,6 +9,5 @@
     Floodlight: 2
     HandheldGPSBasic: 2
     RadioHandheld: 2
-    WeaponProtoKineticAccelerator: 2
     WeaponCrusher: 2
     WeaponCrusherDagger: 2
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 639cabd5f1..e6210a75c7 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -244,7 +244,10 @@
       - HolofanProjector
       - BluespaceBeaker
       - SyringeBluespace
+      - WeaponCrusher
+      - WeaponCrusherDagger
       - WeaponForceGun
+      - WeaponProtoKineticAccelerator
       - WeaponTetherGun
       - WeaponGrapplingGun
       - ClothingBackpackHolding
diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml
index 95d0e3086a..1be735a391 100644
--- a/Resources/Prototypes/Recipes/Lathes/devices.yml
+++ b/Resources/Prototypes/Recipes/Lathes/devices.yml
@@ -103,6 +103,24 @@
     Plasma: 1500
     Uranium: 1500
 
+- type: latheRecipe
+  id: WeaponCrusher
+  result: WeaponCrusher
+  completetime: 5
+  materials:
+    Steel: 1000
+    Glass: 250
+    Plastic: 100
+
+- type: latheRecipe
+  id: WeaponCrusherDagger
+  result: WeaponCrusherDagger
+  completetime: 5
+  materials:
+    Steel: 500
+    Glass: 250
+    Plastic: 50
+
 - type: latheRecipe
   id: WeaponForceGun
   result: WeaponForceGun
@@ -112,6 +130,15 @@
     Glass: 400
     Silver: 200
 
+- type: latheRecipe
+  id: WeaponProtoKineticAccelerator
+  result: WeaponProtoKineticAccelerator
+  completetime: 5
+  materials:
+    Steel: 1000
+    Glass: 500
+    Silver: 100
+
 - type: latheRecipe
   id: WeaponTetherGun
   result: WeaponTetherGun
diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index 0061d78c3d..21192133c8 100644
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -1,5 +1,20 @@
 # Tier 1
 
+- type: technology
+  id: SalvageWeapons
+  name: research-technology-salvage-weapons
+  icon:
+    sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
+    state: gun
+  discipline: Industrial
+  tier: 1
+  cost: 10000
+  recipeUnlocks:
+    - WeaponProtoKineticAccelerator
+    # These are roundstart but not replenishable for salvage
+    - WeaponCrusher
+    - WeaponCrusherDagger
+
 - type: technology
   id: SalvageEquipment
   name: research-technology-salvage-equipment