From 0336e122eeb4aeae8b08696a2f2d94169d3d3869 Mon Sep 17 00:00:00 2001
From: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date: Wed, 7 Sep 2022 08:40:25 -0400
Subject: [PATCH] this was meant to be a one line change (#18982)

---
 .../weapons/implants/implant_abductor.dm      | 10 +---
 .../weapons/implants/implant_adrenalin.dm     | 10 +---
 .../items/weapons/implants/implant_chem.dm    |  9 +---
 .../weapons/implants/implant_death_alarm.dm   | 10 +---
 .../items/weapons/implants/implant_dust.dm    | 10 +---
 .../items/weapons/implants/implant_emp.dm     | 10 +---
 .../items/weapons/implants/implant_exile.dm   | 10 +---
 .../weapons/implants/implant_explosive.dm     | 20 ++------
 .../items/weapons/implants/implant_freedom.dm | 10 +---
 .../items/weapons/implants/implant_health.dm  |  9 ++++
 .../weapons/implants/implant_krav_maga.dm     | 10 +---
 .../weapons/implants/implant_mindshield.dm    | 10 +---
 .../weapons/implants/implant_sad_trombone.dm  | 10 +---
 .../items/weapons/implants/implant_storage.dm | 10 +---
 .../weapons/implants/implant_tracking.dm      | 10 +---
 .../items/weapons/implants/implant_traitor.dm | 10 +---
 .../items/weapons/implants/implant_uplink.dm  | 49 +++++++++----------
 .../items/weapons/implants/implantcase.dm     |  2 +
 .../items/weapons/implants/implanter.dm       |  6 ++-
 19 files changed, 69 insertions(+), 156 deletions(-)

diff --git a/code/game/objects/items/weapons/implants/implant_abductor.dm b/code/game/objects/items/weapons/implants/implant_abductor.dm
index 4801e2516c8..4cfcb154564 100644
--- a/code/game/objects/items/weapons/implants/implant_abductor.dm
+++ b/code/game/objects/items/weapons/implants/implant_abductor.dm
@@ -51,15 +51,9 @@
 
 /obj/item/implanter/abductor
 	name = "implanter (abductor)"
-
-/obj/item/implanter/abductor/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/abductor(src)
+	implant_type = /obj/item/implant/abductor
 
 /obj/item/implantcase/abductor
 	name = "implant case - 'abductor'"
 	desc = "A glass case containing an abductor implant."
-
-/obj/item/implantcase/abductor/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/abductor(src)
+	implant_type = /obj/item/implant/abductor
diff --git a/code/game/objects/items/weapons/implants/implant_adrenalin.dm b/code/game/objects/items/weapons/implants/implant_adrenalin.dm
index 794c43838e7..13bd8c28848 100644
--- a/code/game/objects/items/weapons/implants/implant_adrenalin.dm
+++ b/code/game/objects/items/weapons/implants/implant_adrenalin.dm
@@ -25,15 +25,9 @@
 
 /obj/item/implanter/adrenalin
 	name = "implanter (adrenalin)"
-
-/obj/item/implanter/adrenalin/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/adrenalin(src)
+	implant_type = /obj/item/implant/adrenalin
 
 /obj/item/implantcase/adrenaline
 	name = "implant case - 'Adrenaline'"
 	desc = "A glass case containing an adrenaline implant."
-
-/obj/item/implantcase/adrenaline/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/adrenalin(src)
+	implant_type = /obj/item/implant/adrenalin
diff --git a/code/game/objects/items/weapons/implants/implant_chem.dm b/code/game/objects/items/weapons/implants/implant_chem.dm
index 9f11dc26106..b1ffdb240c6 100644
--- a/code/game/objects/items/weapons/implants/implant_chem.dm
+++ b/code/game/objects/items/weapons/implants/implant_chem.dm
@@ -37,14 +37,9 @@
 
 /obj/item/implanter/chem
 	name = "implanter (chem)"
+	implant_type = /obj/item/implant/chem
 
-/obj/item/implanter/chem/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/dust(src)
 /obj/item/implantcase/chem
 	name = "implant case - 'Remote Chemical'"
 	desc = "A glass case containing a remote chemical implant."
-
-/obj/item/implantcase/chem/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/chem(src)
+	implant_type = /obj/item/implant/chem
diff --git a/code/game/objects/items/weapons/implants/implant_death_alarm.dm b/code/game/objects/items/weapons/implants/implant_death_alarm.dm
index 778d8f05498..c36e3077b01 100644
--- a/code/game/objects/items/weapons/implants/implant_death_alarm.dm
+++ b/code/game/objects/items/weapons/implants/implant_death_alarm.dm
@@ -55,15 +55,9 @@
 
 /obj/item/implanter/death_alarm
 	name = "implanter (Death Alarm)"
-
-/obj/item/implanter/death_alarm/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/death_alarm(src)
+	implant_type = /obj/item/implant/death_alarm
 
 /obj/item/implantcase/death_alarm
 	name = "Implant Case - 'Death Alarm'"
 	desc = "A case containing a death alarm implant."
-
-/obj/item/implantcase/death_alarm/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/death_alarm(src)
+	implant_type = /obj/item/implant/death_alarm
diff --git a/code/game/objects/items/weapons/implants/implant_dust.dm b/code/game/objects/items/weapons/implants/implant_dust.dm
index 9d51d47b38a..34a2d747624 100644
--- a/code/game/objects/items/weapons/implants/implant_dust.dm
+++ b/code/game/objects/items/weapons/implants/implant_dust.dm
@@ -32,15 +32,9 @@
 
 /obj/item/implanter/dust
 	name = "implanter (Dust-on-death)"
-
-/obj/item/implanter/dust/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/dust(src)
+	implant_type = /obj/item/implant/dust
 
 /obj/item/implantcase/dust
 	name = "implant case - 'Dust'"
 	desc = "A glass case containing a dust implant."
-
-/obj/item/implantcase/dust/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/dust(src)
+	implant_type = /obj/item/implant/dust
diff --git a/code/game/objects/items/weapons/implants/implant_emp.dm b/code/game/objects/items/weapons/implants/implant_emp.dm
index 1082f3821ed..9bb0381ad79 100644
--- a/code/game/objects/items/weapons/implants/implant_emp.dm
+++ b/code/game/objects/items/weapons/implants/implant_emp.dm
@@ -15,15 +15,9 @@
 
 /obj/item/implanter/emp
 	name = "implanter (EMP)"
-
-/obj/item/implanter/emp/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/emp(src)
+	implant_type = /obj/item/implant/emp
 
 /obj/item/implantcase/emp
 	name = "implant case - 'EMP'"
 	desc = "A glass case containing an EMP implant."
-
-/obj/item/implantcase/emp/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/emp(src)
+	implant_type = /obj/item/implant/emp
diff --git a/code/game/objects/items/weapons/implants/implant_exile.dm b/code/game/objects/items/weapons/implants/implant_exile.dm
index d1072c1353a..12dfaf988c6 100644
--- a/code/game/objects/items/weapons/implants/implant_exile.dm
+++ b/code/game/objects/items/weapons/implants/implant_exile.dm
@@ -10,18 +10,12 @@
 
 /obj/item/implanter/exile
 	name = "implanter (exile)"
-
-/obj/item/implanter/exile/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/exile(src)
+	implant_type = /obj/item/implant/exile
 
 /obj/item/implantcase/exile
 	name = "implant case - 'Exile'"
 	desc = "A glass case containing an exile implant."
-
-/obj/item/implantcase/exile/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/exile(src)
+	implant_type = /obj/item/implant/exile
 
 /obj/structure/closet/secure_closet/exile
 	name = "exile implants"
diff --git a/code/game/objects/items/weapons/implants/implant_explosive.dm b/code/game/objects/items/weapons/implants/implant_explosive.dm
index 5d06c027e74..d4d398e4984 100644
--- a/code/game/objects/items/weapons/implants/implant_explosive.dm
+++ b/code/game/objects/items/weapons/implants/implant_explosive.dm
@@ -105,30 +105,18 @@
 
 /obj/item/implanter/explosive
 	name = "implanter (explosive)"
-
-/obj/item/implanter/explosive/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/explosive(src)
+	implant_type = /obj/item/implant/explosive
 
 /obj/item/implantcase/explosive
 	name = "implant case - 'Micro Explosive'"
 	desc = "A glass case containing a micro explosive implant."
-
-/obj/item/implantcase/explosive/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/explosive(src)
+	implant_type = /obj/item/implant/explosive
 
 /obj/item/implanter/explosive_macro
 	name = "implanter (macro-explosive)"
-
-/obj/item/implanter/explosive_macro/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/explosive/macro(src)
+	implant_type = /obj/item/implant/explosive/macro
 
 /obj/item/implantcase/explosive_macro
 	name = "implant case - 'Macro Explosive'"
 	desc = "A glass case containing a macro explosive implant."
-
-/obj/item/implantcase/explosive_macro/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/explosive/macro(src)
+	implant_type = /obj/item/implant/explosive/macro
diff --git a/code/game/objects/items/weapons/implants/implant_freedom.dm b/code/game/objects/items/weapons/implants/implant_freedom.dm
index f37bdb28cad..1a39ea9cb2d 100644
--- a/code/game/objects/items/weapons/implants/implant_freedom.dm
+++ b/code/game/objects/items/weapons/implants/implant_freedom.dm
@@ -29,15 +29,9 @@
 
 /obj/item/implanter/freedom
 	name = "implanter (freedom)"
-
-/obj/item/implanter/freedom/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/freedom(src)
+	implant_type = /obj/item/implant/freedom
 
 /obj/item/implantcase/freedom
 	name = "implant case - 'Freedom'"
 	desc = "A glass case containing a freedom implant."
-
-/obj/item/implantcase/freedom/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/freedom(src)
+	implant_type = /obj/item/implant/freedom
diff --git a/code/game/objects/items/weapons/implants/implant_health.dm b/code/game/objects/items/weapons/implants/implant_health.dm
index 45fa1d4a966..9a5be8cdf47 100644
--- a/code/game/objects/items/weapons/implants/implant_health.dm
+++ b/code/game/objects/items/weapons/implants/implant_health.dm
@@ -12,3 +12,12 @@
 	else
 		healthstring = "[round(imp_in.getOxyLoss())] - [round(imp_in.getFireLoss())] - [round(imp_in.getToxLoss())] - [round(imp_in.getBruteLoss())]"
 	return healthstring
+
+/obj/item/implanter/health
+	name = "implanter (health)"
+	implant_type = /obj/item/implant/health
+
+/obj/item/implantcase/health
+	name = "implant case - 'Health'"
+	desc = "A glass case containing a health implant."
+	implant_type = /obj/item/implant/health
diff --git a/code/game/objects/items/weapons/implants/implant_krav_maga.dm b/code/game/objects/items/weapons/implants/implant_krav_maga.dm
index 2cd0946aad5..77c179aa246 100644
--- a/code/game/objects/items/weapons/implants/implant_krav_maga.dm
+++ b/code/game/objects/items/weapons/implants/implant_krav_maga.dm
@@ -21,15 +21,9 @@
 
 /obj/item/implanter/krav_maga
 	name = "implanter (krav maga)"
-
-/obj/item/implanter/krav_maga/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/krav_maga(src)
+	implant_type = /obj/item/implant/krav_maga
 
 /obj/item/implantcase/krav_maga
 	name = "implant case - 'Krav Maga'"
 	desc = "A glass case containing an implant that can teach the user the art of Krav Maga."
-
-/obj/item/implantcase/krav_maga/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/krav_maga(src)
+	implant_type = /obj/item/implant/krav_maga
diff --git a/code/game/objects/items/weapons/implants/implant_mindshield.dm b/code/game/objects/items/weapons/implants/implant_mindshield.dm
index 77da96784fc..211c1fccad1 100644
--- a/code/game/objects/items/weapons/implants/implant_mindshield.dm
+++ b/code/game/objects/items/weapons/implants/implant_mindshield.dm
@@ -28,15 +28,9 @@
 
 /obj/item/implanter/mindshield
 	name = "implanter (mindshield)"
-
-/obj/item/implanter/mindshield/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/mindshield(src)
+	implant_type = /obj/item/implant/mindshield
 
 /obj/item/implantcase/mindshield
 	name = "implant case - 'mindshield'"
 	desc = "A glass case containing a mindshield implant."
-
-/obj/item/implantcase/mindshield/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/mindshield(src)
+	implant_type = /obj/item/implant/mindshield
diff --git a/code/game/objects/items/weapons/implants/implant_sad_trombone.dm b/code/game/objects/items/weapons/implants/implant_sad_trombone.dm
index db82e329898..64a6f171e30 100644
--- a/code/game/objects/items/weapons/implants/implant_sad_trombone.dm
+++ b/code/game/objects/items/weapons/implants/implant_sad_trombone.dm
@@ -19,15 +19,9 @@
 
 /obj/item/implanter/sad_trombone
 	name = "implanter (sad trombone)"
-
-/obj/item/implanter/sad_trombone/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/sad_trombone
+	implant_type = /obj/item/implant/sad_trombone
 
 /obj/item/implantcase/sad_trombone
 	name = "implant case - 'Sad Trombone'"
 	desc = "A glass case containing a sad trombone implant."
-
-/obj/item/implantcase/sad_trombone/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/sad_trombone
+	implant_type = /obj/item/implant/sad_trombone
diff --git a/code/game/objects/items/weapons/implants/implant_storage.dm b/code/game/objects/items/weapons/implants/implant_storage.dm
index a70270dda25..6554e48dd35 100644
--- a/code/game/objects/items/weapons/implants/implant_storage.dm
+++ b/code/game/objects/items/weapons/implants/implant_storage.dm
@@ -61,15 +61,9 @@
 
 /obj/item/implanter/storage
 	name = "implanter (storage)"
-
-/obj/item/implanter/storage/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/storage(src)
+	implant_type = /obj/item/implant/storage
 
 /obj/item/implantcase/storage
 	name = "implant case - 'Storage'"
 	desc = "A glass case containing a storage implant."
-
-/obj/item/implantcase/storage/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/storage(src)
+	implant_type = /obj/item/implant/storage
diff --git a/code/game/objects/items/weapons/implants/implant_tracking.dm b/code/game/objects/items/weapons/implants/implant_tracking.dm
index 979f2c2b77e..57388aa7f83 100644
--- a/code/game/objects/items/weapons/implants/implant_tracking.dm
+++ b/code/game/objects/items/weapons/implants/implant_tracking.dm
@@ -17,15 +17,9 @@
 
 /obj/item/implanter/tracking
 	name = "implanter (tracking)"
-
-/obj/item/implanter/tracking/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/tracking(src)
+	implant_type = /obj/item/implant/tracking
 
 /obj/item/implantcase/tracking
 	name = "implant case - 'Tracking'"
 	desc = "A glass case containing a tracking implant."
-
-/obj/item/implantcase/tracking/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/tracking(src)
+	implant_type = /obj/item/implant/tracking
diff --git a/code/game/objects/items/weapons/implants/implant_traitor.dm b/code/game/objects/items/weapons/implants/implant_traitor.dm
index 35ff856210c..aecddbd35c0 100644
--- a/code/game/objects/items/weapons/implants/implant_traitor.dm
+++ b/code/game/objects/items/weapons/implants/implant_traitor.dm
@@ -49,15 +49,9 @@
 
 /obj/item/implanter/traitor
 	name = "implanter (Mindslave)"
-
-/obj/item/implanter/traitor/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/traitor(src)
+	implant_type = /obj/item/implant/traitor
 
 /obj/item/implantcase/traitor
 	name = "implant case - 'Mindslave'"
 	desc = "A glass case containing a mindslave implant."
-
-/obj/item/implantcase/traitor/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/traitor(src)
+	implant_type = /obj/item/implant/traitor
diff --git a/code/game/objects/items/weapons/implants/implant_uplink.dm b/code/game/objects/items/weapons/implants/implant_uplink.dm
index e507c807d77..5ea5b6d83d7 100644
--- a/code/game/objects/items/weapons/implants/implant_uplink.dm
+++ b/code/game/objects/items/weapons/implants/implant_uplink.dm
@@ -12,6 +12,22 @@
 	hidden_uplink = new(src)
 	hidden_uplink.uses = 10
 
+/obj/item/implant/uplink/nuclear/Initialize(mapload)
+	. = ..()
+	if(hidden_uplink)
+		hidden_uplink.update_uplink_type(UPLINK_TYPE_NUCLEAR)
+
+/obj/item/implant/uplink/sit/Initialize(mapload)
+	. = ..()
+	if(hidden_uplink)
+		hidden_uplink.update_uplink_type(UPLINK_TYPE_SIT)
+
+/obj/item/implant/uplink/admin/Initialize(mapload)
+	. = ..()
+	if(hidden_uplink)
+		hidden_uplink.update_uplink_type(UPLINK_TYPE_ADMIN)
+
+
 /obj/item/implant/uplink/implant(mob/source)
 	var/obj/item/implant/imp_e = locate(type) in source
 	if(imp_e && imp_e != src)
@@ -30,38 +46,17 @@
 
 /obj/item/implanter/uplink
 	name = "implanter (uplink)"
-
-/obj/item/implanter/uplink/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/uplink(src)
+	implant_type = /obj/item/implant/uplink
 
 /obj/item/implantcase/uplink
 	name = "implant case - 'Syndicate Uplink'"
 	desc = "A glass case containing an uplink implant."
-
-/obj/item/implantcase/uplink/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/uplink(src)
-
-/obj/item/implant/uplink/nuclear/Initialize(mapload)
-	. = ..()
-	if(hidden_uplink)
-		hidden_uplink.update_uplink_type(UPLINK_TYPE_NUCLEAR)
+	implant_type = /obj/item/implant/uplink
 
 /obj/item/implanter/nuclear
 	name = "implanter (Nuclear Agent Uplink)"
+	implant_type = /obj/item/implant/uplink/nuclear
 
-/obj/item/implanter/nuclear/Initialize(mapload)
-	. = ..()
-	imp = new /obj/item/implant/uplink/nuclear(src)
-
-/obj/item/implant/uplink/sit/Initialize(mapload)
-	. = ..()
-	if(hidden_uplink)
-		hidden_uplink.update_uplink_type(UPLINK_TYPE_SIT)
-
-
-/obj/item/implant/uplink/admin/Initialize(mapload)
-	. = ..()
-	if(hidden_uplink)
-		hidden_uplink.update_uplink_type(UPLINK_TYPE_ADMIN)
+/obj/item/implantcase/nuclear
+	name = "implant case - 'Nuclear Agent Uplink'"
+	implant_type = /obj/item/implant/uplink/nuclear
diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm
index 457b434e7d3..caea9ea5ad7 100644
--- a/code/game/objects/items/weapons/implants/implantcase.dm
+++ b/code/game/objects/items/weapons/implants/implantcase.dm
@@ -12,9 +12,11 @@
 	materials = list(MAT_GLASS = 500)
 
 	var/obj/item/implant/imp
+	var/implant_type = /obj/item/implant
 
 /obj/item/implantcase/Initialize(mapload)
 	. = ..()
+	imp = new implant_type(src)
 	update_state()
 
 /obj/item/implantcase/Destroy()
diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index 1abf6e715a6..c9c56651d72 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -11,6 +11,7 @@
 	materials = list(MAT_METAL = 600, MAT_GLASS = 200)
 	toolspeed = 1
 	var/obj/item/implant/imp
+	var/implant_type = /obj/item/implant
 
 /obj/item/implanter/update_icon_state()
 	if(imp)
@@ -43,6 +44,7 @@
 	if(istype(W, /obj/item/pen))
 		rename_interactive(user, W)
 
-/obj/item/implanter/New()
-	..()
+/obj/item/implanter/Initialize(mapload)
+	. = ..()
+	imp = new implant_type()
 	update_icon(UPDATE_ICON_STATE)