From 5eb1a1ce8ca6d9471f6452d75abe5b38ad02a391 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Mon, 18 Dec 2023 21:40:55 -0500
Subject: [PATCH] Remove RCD from tech and make it a crate (#22720)

---
 .../fills/crates/engineering-crates.ftl       |  6 ++++++
 .../Locale/en-US/research/technologies.ftl    |  1 -
 .../Catalog/Cargo/cargo_engineering.yml       | 20 +++++++++++++++++++
 .../Catalog/Fills/Crates/engineering.yml      | 17 ++++++++++++++++
 .../Entities/Structures/Machines/lathe.yml    |  2 --
 Resources/Prototypes/Research/industrial.yml  | 15 +-------------
 6 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/engineering-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/engineering-crates.ftl
index 9c1c182497..61bcd424a2 100644
--- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/engineering-crates.ftl
+++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/engineering-crates.ftl
@@ -33,3 +33,9 @@ ent-CrateAirlockKit = Airlock kit
 
 ent-CrateEvaKit = EVA kit
     .desc = A set consisting of two prestigious EVA suits and helmets.
+
+ent-CrateRCDAmmo = RCD ammo crate
+    .desc = 3 RCD ammo, each restoring 5 charges.
+
+ent-CrateRCD = RCD crate
+    .desc = A crate containing a single Rapid Construction Device.
diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index efd1126eed..eb039eae85 100644
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -12,7 +12,6 @@ research-technology-compact-power = Compact Power
 research-technology-industrial-engineering = Industrial Engineering
 research-technology-power-generation = Power Generation
 research-technology-atmospheric-tech = Atmospherics
-research-technology-rapid-construction = Rapid Construction
 research-technology-shuttlecraft = Shuttlecraft
 research-technology-ripley-aplu = Ripley APLU
 research-technology-advanced-atmospherics = Advanced Atmospherics
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
index 14d5f81e13..5a801e50ab 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
@@ -87,3 +87,23 @@
   cost: 5000
   category: Engineering
   group: market
+
+- type: cargoProduct
+  id: EngineeringRCDAmmo
+  icon:
+    sprite: Objects/Tools/rcd.rsi
+    state: icon
+  product: CrateRCDAmmo
+  cost: 2500
+  category: Engineering
+  group: market
+
+- type: cargoProduct
+  id: EngineeringRCD
+  icon:
+    sprite: Objects/Tools/rcd.rsi
+    state: ammo
+  product: CrateRCD
+  cost: 800
+  category: Engineering
+  group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
index b8e0714328..c0982e035b 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
@@ -127,3 +127,20 @@
         amount: 2
       - id: ClothingOuterHardsuitEVA
         amount: 2
+
+- type: entity
+  id: CrateRCDAmmo
+  parent: CrateEngineering
+  components:
+  - type: StorageFill
+    contents:
+    - id: RCDAmmo
+      amount: 3
+
+- type: entity
+  id: CrateRCD
+  parent: CrateEngineeringSecure
+  components:
+  - type: StorageFill
+    contents:
+    - id: RCD
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 31742d8a8a..7930c29bf6 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -210,8 +210,6 @@
       - AnomalyScanner
       - AnomalyLocator
       - AnomalyLocatorWide
-      - RCD
-      - RCDAmmo
       - HandheldCrewMonitor
       - Scalpel
       - Retractor
diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index c59d0720e4..f5083ac51f 100644
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -122,20 +122,6 @@
   - WeaponGrapplingGun
   - BorgModuleGrapplingGun
 
-- type: technology
-  id: RapidConstruction
-  name: research-technology-rapid-construction
-  icon:
-    sprite: Objects/Tools/rcd.rsi
-    state: icon
-  discipline: Industrial
-  tier: 2
-  cost: 10000
-  recipeUnlocks:
-  - RCD
-  - RCDAmmo
-  - BorgModuleRCD
-
 - type: technology
   id: Shuttlecraft
   name: research-technology-shuttlecraft
@@ -193,6 +179,7 @@
     - PowerDrill
     - JawsOfLife
     - BorgModuleAdvancedTool
+    - BorgModuleRCD
 
 # Tier 3
 
-- 
2.51.2