Merge pull request #18668 from coiax/dropdel

Adds DROPDEL flag; items will qdel() on dropped()

code/game/objects/items/weapons/chrono_eraser.dm

@@ -46,7 +46,7 @@
 	icon_state = "chronogun"
 	item_state = "chronogun"
 	w_class = 3
-	flags = NODROP
+	flags = NODROP | DROPDEL
 	ammo_type = list(/obj/item/ammo_casing/energy/chrono_beam)
 	can_charge = 0
 	fire_delay = 50
@@ -62,10 +62,6 @@
 		TED = new(src.loc)
 		qdel(src)
 
-/obj/item/weapon/gun/energy/chrono_gun/dropped()
-	..()
-	qdel(src)
-
 /obj/item/weapon/gun/energy/chrono_gun/update_icon()
 	return
 
@@ -264,4 +260,4 @@
 
 
 #undef CHRONO_BEAM_RANGE
-#undef CHRONO_FRAME_COUNT
+#undef CHRONO_FRAME_COUNT

code/game/objects/items/weapons/handcuffs.dm

@@ -290,19 +290,18 @@
 	armed = 1
 	icon_state = "e_snare"
 	trap_damage = 0
+	flags = DROPDEL
 
 /obj/item/weapon/restraints/legcuffs/beartrap/energy/New()
 	..()
-	spawn(100)
-		if(!istype(loc, /mob))
-			var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
-			sparks.set_up(1, 1, src)
-			sparks.start()
-			qdel(src)
+	addtimer(src, "dissipate", 100)
 
-/obj/item/weapon/restraints/legcuffs/beartrap/energy/dropped()
-	..()
-	qdel(src)
+/obj/item/weapon/restraints/legcuffs/beartrap/energy/proc/dissipate()
+	if(!istype(loc, /mob))
+		var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
+		sparks.set_up(1, 1, src)
+		sparks.start()
+		qdel(src)
 
 /obj/item/weapon/restraints/legcuffs/beartrap/energy/attack_hand(mob/user)
 	Crossed(user) //honk

code/game/objects/items/weapons/holy_weapons.dm

@@ -49,15 +49,12 @@
 	item_state = "disintegrate"
 	name = "god hand"
 	desc = "This hand of yours glows with an awesome power!"
-	flags = ABSTRACT | NODROP
+	flags = ABSTRACT | NODROP | DROPDEL
 	w_class = 5
 	hitsound = 'sound/weapons/sear.ogg'
 	damtype = BURN
 	attack_verb = list("punched", "cross countered", "pummeled")
 
-/obj/item/weapon/nullrod/godhand/dropped(mob/user)
-	qdel(src)
-
 /obj/item/weapon/nullrod/staff
 	icon_state = "godstaff-red"
 	item_state = "godstaff-red"

code/game/objects/items/weapons/implants/implant.dm

@@ -10,6 +10,7 @@
 	item_color = "b"
 	var/allow_multiple = 0
 	var/uses = -1
+	flags = DROPDEL
 
 
 /obj/item/weapon/implant/proc/trigger(emote, mob/source)
@@ -73,12 +74,9 @@
 		removed(imp_in)
 	return ..()
 
-
 /obj/item/weapon/implant/proc/get_data()
 	return "No information available"
 
 /obj/item/weapon/implant/dropped(mob/user)
-	..()
 	. = 1
-	qdel(src)
-
+	..()