Why is this a thing, really (#16169)

code/__HELPERS/traits.dm

@@ -152,9 +152,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_NOEXAMINE			"no_examine"
 #define TRAIT_NOPAIN			"no_pain"
 
-/// Blowing kisses actually does damage to the victim
-#define TRAIT_KISS_OF_DEATH	"kiss_of_death"
-
 //***** ITEM TRAITS *****//
 /// Show what machine/door wires do when held.
 #define TRAIT_SHOW_WIRE_INFO "show_wire_info"

code/_globalvars/traits.dm

@@ -45,7 +45,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_DWARF" = TRAIT_DWARF,
 		"TRAIT_SILENT_FOOTSTEPS" = TRAIT_SILENT_FOOTSTEPS,
 		"TRAIT_ALCOHOL_TOLERANCE" = TRAIT_ALCOHOL_TOLERANCE,
-		"TRAIT_KISS_OF_DEATH" = TRAIT_KISS_OF_DEATH,
 
 		"TRAIT_COMIC_SANS" = TRAIT_COMIC_SANS,
 		"TRAIT_NOFINGERPRINTS" = TRAIT_NOFINGERPRINTS,

code/game/objects/items/hand_item.dm

@@ -42,75 +42,3 @@
 		table_smacks_left--
 		if(table_smacks_left <= 0)
 			qdel(src)
-
-/obj/item/kisser
-	name = "kiss"
-	desc = "I want you all to know, everyone and anyone, to seal it with a kiss."
-	icon = 'icons/mob/animal.dmi'
-	icon_state = "heart"
-	item_state = "nothing"
-	force = 0
-	throwforce = 0
-	flags = DROPDEL | ABSTRACT
-	/// The kind of projectile this version of the kiss blower fires
-	var/kiss_type = /obj/item/projectile/kiss
-
-/obj/item/kisser/afterattack(atom/target, mob/user, flag, params)
-	var/turf/user_turf = get_turf(user)
-	var/obj/item/projectile/blown_kiss = new kiss_type(user_turf)
-	user.visible_message("<b>[user]</b> blows \a [blown_kiss] at [target]!", "<span class='notice'>You blow \a [blown_kiss] at [target]!</span>")
-
-	//Shooting Code:
-	blown_kiss.spread = 0
-	blown_kiss.original = target
-	blown_kiss.firer = user // don't hit ourself that would be really annoying
-	blown_kiss.preparePixelProjectile(target, user_turf, user, params)
-	blown_kiss.fire()
-	qdel(src)
-
-/obj/item/kisser/death
-	name = "kiss of death"
-	desc = "If looks could kill, they'd be this."
-	color = COLOR_BLACK
-	kiss_type = /obj/item/projectile/kiss/death
-
-/obj/item/projectile/kiss
-	name = "kiss"
-	icon = 'icons/mob/animal.dmi'
-	icon_state = "heart"
-	hitsound = 'sound/effects/kiss.ogg'
-	hitsound_wall = 'sound/effects/kiss.ogg'
-	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
-	speed = 1.6
-	damage_type = BRUTE
-	damage = 0
-	nodamage = TRUE // love can't actually hurt you
-	armour_penetration = 100 // but if it could, it would cut through even the thickest plate
-	flag = "magic" // and most importantly, love is magic~
-
-/obj/item/projectile/kiss/fire(angle)
-	if(firer)
-		name = "[name] blown by [firer]"
-	return ..()
-
-/obj/item/projectile/kiss/on_hit(atom/target, blocked, hit_zone)
-	def_zone = BODY_ZONE_HEAD // let's keep it PG, people
-	. = ..()
-
-/obj/item/projectile/kiss/death
-	name = "kiss of death"
-	nodamage = FALSE // okay i kinda lied about love not being able to hurt you
-	damage = 35
-	sharp = TRUE
-	color = COLOR_BLACK
-
-/obj/item/projectile/kiss/death/on_hit(atom/target, blocked, pierce_hit)
-	. = ..()
-	if(!iscarbon(target))
-		return
-	var/mob/living/carbon/heartbreakee = target
-	var/obj/item/organ/internal/heart/dont_go_breakin_my_heart = heartbreakee.get_organ_slot("heart")
-	if(dont_go_breakin_my_heart)
-		dont_go_breakin_my_heart.receive_damage(999)
-	else // You're probably a snowflakey species or Xenomorph
-		heartbreakee.adjustFireLoss(1000) // the sickest of burns

code/modules/mob/living/carbon/human/emote.dm

@@ -138,7 +138,7 @@
 			on_CD = handle_emote_CD()
 		if("clap", "claps")
 			on_CD = handle_emote_CD()
-		if("kiss", "kisses", "slap", "slaps")
+		if("slap", "slaps")
 			on_CD = handle_emote_CD(3 SECONDS)
 		//Everything else, including typos of the above emotes
 		else
@@ -516,17 +516,10 @@
 			m_type = 1
 
 		if("kiss", "kisses")
-			var/kiss_type = /obj/item/kisser
+			var/M = handle_emote_param(param)
 
-			if(HAS_TRAIT(src, TRAIT_KISS_OF_DEATH))
-				kiss_type = /obj/item/kisser/death
-
-			var/obj/item/kiss_blower = new kiss_type(src)
-			if(put_in_hands(kiss_blower))
-				to_chat(src, "<span class='notice'>You ready your kiss-blowing hand.</span>")
-			else
-				qdel(kiss_blower)
-				to_chat(src, "<span class='warning'>You're incapable of blowing a kiss in your current state.</span>")
+			message = "<B>[src]</B> blows a kiss[M ? " at [M]" : ""]."
+			m_type = 1
 
 		if("blush", "blushes")
 			message = "<B>[src]</B> blushes."