From a578eeeb85a09b34b53a97b8c356df07697b1c83 Mon Sep 17 00:00:00 2001
From: Belsima <31827220+Belsima@users.noreply.github.com>
Date: Tue, 27 Feb 2018 15:49:06 -0500
Subject: [PATCH] plushie love (#4964)

* plushie love

* Kiss2

* good god why

* you can make severed heads kiss now :)

* [I] first

* [I] first2

* comma

* comma
---
 code/game/objects/items/toys.dm          | 7 +++++++
 code/modules/organs/subtypes/standard.dm | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index dda0f76560..e6487f58b9 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -727,6 +727,7 @@
 		user.visible_message("<span class='notice'><b>\The [user]</b> pokes the [src].</span>","<span class='notice'>You poke the [src].</span>")
 		visible_message("[src] says, \"[phrase]\"")
 
+
 /obj/structure/plushie/ian
 	name = "plush corgi"
 	desc = "A plushie of an adorable corgi! Don't you just want to hug it and squeeze it and call it \"Ian\"?"
@@ -788,6 +789,12 @@
 		to_chat(M, "You name the plushie [input], giving it a hug for good luck.")
 		return 1
 
+/obj/item/toy/plushie/attackby(obj/item/I as obj, mob/user as mob)
+	if(istype(I, /obj/item/toy/plushie) || istype(I, /obj/item/organ/external/head))
+		user.visible_message("<span class='notice'>[user] makes \the [I] kiss \the [src]!.</span>", \
+		"<span class='notice'>You make \the [I] kiss \the [src]!.</span>")
+	return ..()
+
 /obj/item/toy/plushie/nymph
 	name = "diona nymph plush"
 	desc = "A plushie of an adorable diona nymph! While its level of self-awareness is still being debated, its level of cuteness is not."
diff --git a/code/modules/organs/subtypes/standard.dm b/code/modules/organs/subtypes/standard.dm
index 8f04a2d0a9..eb0518de38 100644
--- a/code/modules/organs/subtypes/standard.dm
+++ b/code/modules/organs/subtypes/standard.dm
@@ -306,6 +306,12 @@
 			owner.custom_pain("A jolt of pain surges through your [name]!",1)
 			owner.eye_blurry += 20 //Specific level 2 'feature
 
+/obj/item/organ/external/head/attackby(obj/item/I as obj, mob/user as mob)
+	if(istype(I, /obj/item/toy/plushie) || istype(I, /obj/item/organ/external/head))
+		user.visible_message("<span class='notice'>[user] makes \the [I] kiss \the [src]!.</span>", \
+		"<span class='notice'>You make \the [I] kiss \the [src]!.</span>")
+	return ..()
+
 /obj/item/organ/external/head/skrell
 	eye_icon = "skrell_eyes_s"