From 8e563aa42b650a35392364dc2a10c19fcbc605e8 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed, 28 Jul 2021 20:02:52 +0200
Subject: [PATCH] [MIRROR] default instakill rifle doesnt delete itself (#7172)

* default instakill rifle doesnt delete itself (#60439)

* default instakill rifle doesnt delete itself

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
---
 code/modules/capture_the_flag/ctf_classes.dm   | 10 +++++-----
 code/modules/capture_the_flag/ctf_equipment.dm | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/code/modules/capture_the_flag/ctf_classes.dm b/code/modules/capture_the_flag/ctf_classes.dm
index 52ad1af5315..b71ba4d01ba 100644
--- a/code/modules/capture_the_flag/ctf_classes.dm
+++ b/code/modules/capture_the_flag/ctf_classes.dm
@@ -61,7 +61,7 @@
 
 /datum/outfit/ctf/instagib
 	name = "CTF Instagib (Solo)"
-	r_hand = /obj/item/gun/energy/laser/instakill
+	r_hand = /obj/item/gun/energy/laser/instakill/ctf
 	shoes = /obj/item/clothing/shoes/jackboots/fast
 	icon_state = "ctf_instakill"
 	class_description = "General purpose combat class. Armed with a laser rifle and backup pistol."
@@ -99,7 +99,7 @@
 
 /datum/outfit/ctf/red/instagib
 	name = "CTF Instagib (Red)"
-	r_hand = /obj/item/gun/energy/laser/instakill/red
+	r_hand = /obj/item/gun/energy/laser/instakill/ctf/red
 	shoes = /obj/item/clothing/shoes/jackboots/fast
 	team_radio_freq = FREQ_CTF_RED
 
@@ -134,7 +134,7 @@
 
 /datum/outfit/ctf/blue/instagib
 	name = "CTF Instagib (Blue)"
-	r_hand = /obj/item/gun/energy/laser/instakill/blue
+	r_hand = /obj/item/gun/energy/laser/instakill/ctf/blue
 	shoes = /obj/item/clothing/shoes/jackboots/fast
 	team_radio_freq = FREQ_CTF_BLUE
 
@@ -169,7 +169,7 @@
 
 /datum/outfit/ctf/green/instagib
 	name = "CTF Instagib (Green)"
-	r_hand = /obj/item/gun/energy/laser/instakill/green
+	r_hand = /obj/item/gun/energy/laser/instakill/ctf/green
 	shoes = /obj/item/clothing/shoes/jackboots/fast
 	team_radio_freq = FREQ_CTF_GREEN
 
@@ -204,7 +204,7 @@
 
 /datum/outfit/ctf/yellow/instagib
 	name = "CTF Instagib (Yellow)"
-	r_hand = /obj/item/gun/energy/laser/instakill/yellow
+	r_hand = /obj/item/gun/energy/laser/instakill/ctf/yellow
 	shoes = /obj/item/clothing/shoes/jackboots/fast
 	team_radio_freq = FREQ_CTF_YELLOW
 
diff --git a/code/modules/capture_the_flag/ctf_equipment.dm b/code/modules/capture_the_flag/ctf_equipment.dm
index 5cf4ce17846..2a5d8d817dd 100644
--- a/code/modules/capture_the_flag/ctf_equipment.dm
+++ b/code/modules/capture_the_flag/ctf_equipment.dm
@@ -162,13 +162,13 @@
 	ammo_x_offset = 2
 	shaded_charge = FALSE
 
-/obj/item/gun/energy/laser/instakill/Initialize()
-	. = ..()
-	AddElement(/datum/element/delete_on_drop)
-
 /obj/item/gun/energy/laser/instakill/emp_act() //implying you could stop the instagib
 	return
 
+/obj/item/gun/energy/laser/instakill/ctf/Initialize()
+	. = ..()
+	AddElement(/datum/element/delete_on_drop)
+
 /obj/item/ammo_casing/energy/instakill
 	projectile_type = /obj/projectile/beam/instakill
 	e_cost = 0
@@ -279,7 +279,7 @@
 
 
 // Instakill
-/obj/item/gun/energy/laser/instakill/red
+/obj/item/gun/energy/laser/instakill/ctf/red
 	desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a red design."
 	icon_state = "instagibred"
 	inhand_icon_state = "instagibred"
@@ -338,7 +338,7 @@
 
 
 // Instakill
-/obj/item/gun/energy/laser/instakill/blue
+/obj/item/gun/energy/laser/instakill/ctf/blue
 	desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a blue design."
 	icon_state = "instagibblue"
 	inhand_icon_state = "instagibblue"
@@ -404,7 +404,7 @@
 
 
 // Instakill
-/obj/item/gun/energy/laser/instakill/green
+/obj/item/gun/energy/laser/instakill/ctf/green
 	desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a green design."
 	icon_state = "instagibgreen"
 	inhand_icon_state = "instagibgreen"
@@ -470,7 +470,7 @@
 
 
 // Instakill
-/obj/item/gun/energy/laser/instakill/yellow
+/obj/item/gun/energy/laser/instakill/ctf/yellow
 	desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a yellow design."
 	icon_state = "instagibyellow"
 	inhand_icon_state = "instagibyellow"