From 258cac66c00a32269796daad0562f3bea5f06bf2 Mon Sep 17 00:00:00 2001
From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Sun, 10 Jul 2022 07:04:24 -0400
Subject: [PATCH] Removes the 357 revolver conversion kit (#18313)

---
 .../objects/items/weapons/conversion_kit.dm   | 21 -------------------
 .../items/weapons/storage/uplink_kits.dm      |  4 ----
 paradise.dme                                  |  1 -
 3 files changed, 26 deletions(-)
 delete mode 100644 code/game/objects/items/weapons/conversion_kit.dm

diff --git a/code/game/objects/items/weapons/conversion_kit.dm b/code/game/objects/items/weapons/conversion_kit.dm
deleted file mode 100644
index 4eb09ff6f6e..00000000000
--- a/code/game/objects/items/weapons/conversion_kit.dm
+++ /dev/null
@@ -1,21 +0,0 @@
-// Conversion kit
-/obj/item/conversion_kit
-	name = "\improper Revolver Conversion Kit"
-	desc = "A professional conversion kit used to convert any knock off revolver into the real deal capable of shooting lethal .357 rounds without the possibility of catastrophic failure."
-	icon_state = "kit"
-	flags = CONDUCT
-	w_class = WEIGHT_CLASS_SMALL
-	origin_tech = "combat=2"
-	var/open = 0
-
-/obj/item/conversion_kit/New()
-	..()
-	update_icon()
-
-/obj/item/conversion_kit/update_icon()
-	icon_state = "[initial(icon_state)]_[open]"
-
-/obj/item/conversion_kit/attack_self(mob/user)
-	open = !open
-	to_chat(user, "<span class='notice'>You [open ? "open" : "close"] the conversion kit.</span>")
-	update_icon()
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index 4f8d7ac1f02..d78c02425ff 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -143,10 +143,6 @@
 /obj/item/storage/box/syndie_kit/conversion
 	name = "box (CK)"
 
-/obj/item/storage/box/syndie_kit/conversion/populate_contents()
-	new /obj/item/conversion_kit(src)
-	new /obj/item/ammo_box/a357(src)
-
 /obj/item/storage/box/syndie_kit/boolets
 	name = "shotgun shells"
 
diff --git a/paradise.dme b/paradise.dme
index de2c30f4a65..e32019b13ec 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -948,7 +948,6 @@
 #include "code\game\objects\items\weapons\chrono_eraser.dm"
 #include "code\game\objects\items\weapons\cigs.dm"
 #include "code\game\objects\items\weapons\clown_items.dm"
-#include "code\game\objects\items\weapons\conversion_kit.dm"
 #include "code\game\objects\items\weapons\cosmetics.dm"
 #include "code\game\objects\items\weapons\courtroom.dm"
 #include "code\game\objects\items\weapons\defib.dm"