From 7d2fc218f1c13183af809adaf083dc99dd05ba05 Mon Sep 17 00:00:00 2001
From: jbox1 <40789662+jbox144@users.noreply.github.com>
Date: Fri, 28 Feb 2020 17:15:34 +1100
Subject: [PATCH] Update plushes.dm

---
 hyperstation/code/obj/plushes.dm | 42 +++++++++++++++++---------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/hyperstation/code/obj/plushes.dm b/hyperstation/code/obj/plushes.dm
index 711f5043..7989feb4 100644
--- a/hyperstation/code/obj/plushes.dm
+++ b/hyperstation/code/obj/plushes.dm
@@ -1,4 +1,3 @@
-/*
 /obj/item/toy/plush/mammal/winfre
 	desc = "An adorable stuffed toy of a pissed hyena. She looks unamused."
 	icon = 'hyperstation/icons/obj/plushes.dmi'
@@ -10,31 +9,26 @@
 	desc = "A cute stuffed fox toy. Now, about that sponge bath..."
 	icon = 'hyperstation/icons/obj/plushes.dmi'
 	icon_state = "marilyn"
-	item_state = "marilyn" 
-*/
-
-/obj/item/toy/plush/mothplushie/bib
-	desc = "An adorable stuffed toy of a moth person. He has his own little lamp!" // Bib only worships the L O M P
-	icon = 'hyperstation/icons/obj/plushes.dmi'
-	gender = MALE
-	icon_state = "bib"
-	item_state = "bib"
-	attack_verb = list("lamped", "fluttered", "shone")
+	item_state = "marilyn"
 
 /obj/item/toy/plush/slimeplushie/tania
 	desc = "An adorable stuffed toy of a slimegirl. She seems oddly damp..." // Milky slime
 	icon = 'hyperstation/icons/obj/plushes.dmi'
 	icon_state = "tania"
 	item_state = "tania"
-	attack_verb = list("hugged", "cuddled", "squished")
+	attack_verb = list("hugged", "cuddled", "embraced")
+	squeak_override = list('sound/weapons/thudswoosh.ogg' = 1)
 
-/obj/item/toy/plush/slimeplushie/tania/love(obj/item/toy/plush/Kisser, mob/living/user) // This is a closed marriage ):<
-	if (istype(Kisser, /obj/item/toy/plush/vladin))
+/obj/item/toy/plush/slimeplushie/tania/love(obj/item/toy/plush/Kisser, mob/living/user)
+	/* if (istype(Kisser, /obj/item/toy/plush/vladin) ) // Vladin plushie isn't real, Vladin plushie cannot hug you ;-;
 		..()
-	else
-		user.show_message("<span class='notice'>[src] hugs [Kisser]!</span>", 1,
-			"<span class='notice'>[src] hugs [Kisser]!</span>", 0)
+	else */
+	user.show_message("<span class='notice'>[src] hugs [Kisser]!</span>", 1,
+					  "<span class='notice'>[src] hugs [Kisser]!</span>", 0)
 
+// Patreon program means I cannot add the rest of the plushies I sprited :'(
+
+/*
 /obj/item/toy/plush/vladin
 	desc = "An adorable stuffed toy of a chief medical officer. He's tightly grasping his defib paddles!"
 	icon = 'hyperstation/icons/obj/plushes.dmi'
@@ -43,6 +37,7 @@
 	item_state = "vladin"
 	attack_verb = list("defibbed", "synthfleshed", "dosed")
 	squeak_override = list('sound/machines/defib_charge.ogg' = 1)
+	
 
 /obj/item/toy/plush/vladin/love(obj/item/toy/plush/Kisser, mob/living/user) // This is a closed marriage ):<
 	if (istype(Kisser, /obj/item/toy/plush/slimeplushie/tania))
@@ -56,6 +51,14 @@
 	icon_state = "squish"
 	item_state = "squish"
 
+/obj/item/toy/plush/mothplushie/bib
+	desc = "An adorable stuffed toy of a moth person. He has his own little lamp!" // Bib only worships the L O M P
+	icon = 'hyperstation/icons/obj/plushes.dmi'
+	gender = MALE
+	icon_state = "bib"
+	item_state = "bib"
+	attack_verb = list("lamped", "fluttered", "shone")
+
 /obj/item/toy/plush/bird/vivi
 	icon = 'hyperstation/icons/obj/plushes.dmi'
 	gender = MALE
@@ -84,7 +87,7 @@
 */
 
 /obj/item/toy/plush/borgplushie/mediborg
-	desc = "An adorable stuffed toy of a BootyF medical cyborg. It's holding a cookie for you!" 
+	desc = "An adorable stuffed toy of a BootyF medical cyborg. It's holding a cookie for you!"
 	icon = 'hyperstation/icons/obj/plushes.dmi'
 	gender = FEMALE
 	icon_state = "mediborg"
@@ -95,9 +98,10 @@
 	gender = FEMALE
 	icon_state = "kami"
 	item_state = "kami"
-	
+
 /obj/item/toy/plush/xeno/xe
 	icon = 'hyperstation/icons/obj/plushes.dmi'
 	gender = FEMALE
 	icon_state = "xe"
 	item_state = "xe"
+*/