Ports Slapping and Kissing (#15539)

* Ports Slapping and Kissing

* forgot this

* table slapping

code/modules/mob/living/carbon/alien/special/facehugger.dm

@@ -38,7 +38,7 @@
 		Die()
 
 /obj/item/clothing/mask/facehugger/attackby(obj/item/O, mob/user, params)
-	return O.attack_obj(src, user)
+	return O.attack_obj(src, user, params)
 
 /obj/item/clothing/mask/facehugger/attack_alien(mob/user) //can be picked up by aliens
 	return attack_hand(user)

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

@@ -123,7 +123,7 @@
 			on_CD = handle_emote_CD(50) //longer cooldown
 		if("fart", "farts", "flip", "flips", "snap", "snaps")
 			on_CD = handle_emote_CD()				//proc located in code\modules\mob\emote.dm
-		if("cough", "coughs", "slap", "slaps", "highfive")
+		if("cough", "coughs", "highfive")
 			on_CD = handle_emote_CD()
 		if("gasp", "gasps")
 			on_CD = handle_emote_CD()
@@ -133,6 +133,8 @@
 			on_CD = handle_emote_CD()
 		if("clap", "claps")
 			on_CD = handle_emote_CD()
+		if("kiss", "kisses", "slap", "slaps")
+			on_CD = handle_emote_CD(3 SECONDS)
 		//Everything else, including typos of the above emotes
 		else
 			on_CD = FALSE	//If it doesn't induce the cooldown, we won't check for the cooldown
@@ -502,6 +504,19 @@
 			message = "<B>[src]</B> nods[M ? " at [M]" : ""]."
 			m_type = 1
 
+		if("kiss", "kisses")
+			var/kiss_type = /obj/item/kisser
+
+			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>")
+
 		if("blush", "blushes")
 			message = "<B>[src]</B> blushes."
 			m_type = 1
@@ -841,16 +856,12 @@
 					message = "<B>[src]</B> sadly can't find anybody to give daps to, and daps [p_them()]self. Shameful."
 
 		if("slap", "slaps")
-			m_type = 1
-			if(!restrained())
-				var/M = handle_emote_param(param, null, 1)
-
-				if(M)
-					message = "<span class='danger'>[src] slaps [M] across the face. Ouch!</span>"
-				else
-					message = "<span class='danger'>[src] slaps [p_them()]self!</span>"
-					adjustFireLoss(4)
-				playsound(loc, 'sound/effects/snap.ogg', 50, 1)
+			var/obj/item/slapper/N = new(src)
+			if(put_in_hands(N))
+				to_chat(src, "<span class='notice'>You ready your slapping hand.</span>")
+			else
+				qdel(N)
+				to_chat(src, "<span class='warning'>You're incapable of slapping in your current state.</span>")
 
 		if("scream", "screams")
 			var/M = handle_emote_param(param)
@@ -934,8 +945,8 @@
 		if("help")
 			var/emotelist = "aflap(s), airguitar, blink(s), blink(s)_r, blush(es), bow(s)-none/mob, burp(s), choke(s), chuckle(s), clap(s), collapse(s), cough(s), cry, cries, custom, dance, dap(s)-none/mob," \
 			+ " deathgasp(s), drool(s), eyebrow, fart(s), faint(s), flap(s), flip(s), frown(s), gasp(s), giggle(s), glare(s)-none/mob, grin(s), groan(s), grumble(s), grin(s)," \
-			+ " handshake-mob, hug(s)-none/mob, hem, highfive, johnny, jump, laugh(s), look(s)-none/mob, moan(s), mumble(s), nod(s), pale(s), point(s)-atom, quiver(s), raise(s), salute(s)-none/mob, scream(s), shake(s)," \
-			+ " shiver(s), shrug(s), sigh(s), signal(s)-#1-10,slap(s)-none/mob, smile(s),snap(s), sneeze(s), sniff(s), snore(s), stare(s)-none/mob, tremble(s), twitch(es), twitch(es)_s," \
+			+ " handshake-mob, hug(s)-none/mob, hem, highfive, johnny, jump, kiss(es), laugh(s), look(s)-none/mob, moan(s), mumble(s), nod(s), pale(s), point(s)-atom, quiver(s), raise(s), salute(s)-none/mob, scream(s), shake(s)," \
+			+ " shiver(s), shrug(s), sigh(s), signal(s)-#1-10, slap(s), smile(s),snap(s), sneeze(s), sniff(s), snore(s), stare(s)-none/mob, tremble(s), twitch(es), twitch(es)_s," \
 			+ " wave(s), whimper(s), wink(s), yawn(s)"
 
 			switch(dna.species.name)