Remove RCD from tech and make it a crate (#22720)

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 9c1c18249721769c275fb8bf5b3990fc9d5cf7f2..61bcd424a2bdbf3c6ac5777fe3bc6c0718438854 100644 (file)
--- 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 efd1126eed2648261a06f37f7e2511212b228721..eb039eae851ae57971b0ddbca5f91b5e5f34ee19 100644 (file)
--- 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 14d5f81e13246b35cd464e0d2bae68e85685448e..5a801e50ab0000b3743b560c40279ace78a46524 100644 (file)
--- 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 b8e07143288334632374454d7eafeb3e364316b6..c0982e035b0b3c0dfea7336777c070a8a7c36c58 100644 (file)
--- 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 31742d8a8a8580521eaeef988970b0cf11f901fe..7930c29bf60f21220f57a71024b2d2cab7713b06 100644 (file)
--- 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 c59d0720e4aa74185b27c9eb0d3971a037fb719a..f5083ac51fa9fd45e8954b281a8f2736d6fa3437 100644 (file)
--- 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