From d1413662cc5a5f0c0c2d7aa5fb3c4bcc78eda280 Mon Sep 17 00:00:00 2001
From: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Date: Sun, 17 Nov 2024 11:06:47 -0800
Subject: [PATCH] Genaric radio implants are no longer syndicate branded
 (#2159)

* First commit

* Minor fix

* Requested changes

* grammar
---
 .../Locale/en-US/deltav/store/uplink-catalog.ftl  |  3 ---
 .../DeltaV/Catalog/Cargo/cargo_medical.yml        | 10 ++++++++++
 .../DeltaV/Catalog/Fills/Crates/medical.yml       | 10 ++++++++++
 .../Prototypes/DeltaV/Catalog/uplink_catalog.yml  | 15 ---------------
 .../DeltaV/Entities/Objects/Misc/implanters.yml   |  2 +-
 .../Entities/Objects/Misc/subdermal_implants.yml  |  2 +-
 6 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 Resources/Prototypes/DeltaV/Catalog/Fills/Crates/medical.yml

diff --git a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl
index 204ab670aab..f1dd8e2ee01 100644
--- a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl
@@ -11,9 +11,6 @@ uplink-syndicate-radio-implanter-desc = A cranial implant that lets you talk on
 uplink-syndicate-radio-implanter-bundle-name = Syndicate Radio Implanter Bundle
 uplink-syndicate-radio-implanter-bundle-desc = Two implanters for the price of one and a half! Share one with your Syndicate friend.
 
-uplink-generic-radio-implanter-name = Generic Radio Implanter
-uplink-generic-radio-implanter-desc = A cranial implant with a bluespace compartment for a single encryption key (not included). Put in a key of your choice, and you can talk using it like you would with any headset.
-
 uplink-doorjack-name = Airlock Access Override
 uplink-doorjack-desc = A specialized cryptographic sequencer, designed solely to doorjack NanoTrasen's updated airlocks. Does not tamper with anything else.
 
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml
index 503fb675ff1..16a6d2c883e 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml
@@ -7,3 +7,13 @@
   cost: 500
   category: Medical
   group: market
+
+- type: cargoProduct
+  id: RadioImplantCrate
+  icon:
+    sprite: Objects/Specific/Medical/implanter.rsi
+    state: implanter0
+  product: CrateGenericRadioImplants
+  cost: 1500
+  category: Medical
+  group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/medical.yml
new file mode 100644
index 00000000000..edcfcab151b
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/medical.yml
@@ -0,0 +1,10 @@
+- type: entity
+  id: CrateGenericRadioImplants
+  parent: CrateMedical
+  name: radio implant crate
+  description: Communicate without having a pesky headset on your ear.
+  components:
+  - type: StorageFill
+    contents:
+    - id: GenericRadioImplanter
+      amount: 3
diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
index 35375518abe..05a7582cd35 100644
--- a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
@@ -75,21 +75,6 @@
   categories:
   - UplinkImplants
 
-
-- type: listing
-  id: UplinkGenericRadioImplanter
-  name: uplink-generic-radio-implanter-name
-  description: uplink-generic-radio-implanter-desc
-  icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: crypt_rusted }
-  productEntity: GenericRadioImplanter
-  discountCategory: usualDiscounts
-  discountDownTo:
-    Telecrystal: 1
-  cost:
-    Telecrystal: 2
-  categories:
-  - UplinkImplants
-
 - type: listing
   id: UplinkDoorjack
   name: uplink-doorjack-name
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml
index 4ab1652850c..b0f8741d81f 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml
@@ -7,7 +7,7 @@
     implant: BionicSyrinxImplant
 
 - type: entity
-  parent: BaseImplantOnlyImplanterSyndi
+  parent: BaseImplantOnlyImplanter
   id: GenericRadioImplanter
   suffix: generic radio
   components:
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml
index 279dc25cbed..883c48bccf3 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml
@@ -21,7 +21,7 @@
   parent: StorageImplant
   id: RadioImplant
   name: generic radio implant
-  description: This implant contains a radio augmentation with a bluespace compartment for an encryption key. It allows its user to communicate on the key's channels.
+  description: This implant contains a radio augmentation with a hidden compartment for an encryption key. It allows its user to communicate on the key's channels.
   components:
   - type: SubdermalImplant
     implantAction: ActionOpenRadioImplant