From 6e53a57083efafdc4f923bc77ec2c1e89fbf1650 Mon Sep 17 00:00:00 2001
From: jbox1 <40789662+jbox144@users.noreply.github.com>
Date: Thu, 27 Feb 2020 21:20:27 +1100
Subject: [PATCH 1/4] Create plushes.dm

---
 hyperstation/code/obj/plushes.dm | 103 +++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 hyperstation/code/obj/plushes.dm

diff --git a/hyperstation/code/obj/plushes.dm b/hyperstation/code/obj/plushes.dm
new file mode 100644
index 00000000..711f5043
--- /dev/null
+++ b/hyperstation/code/obj/plushes.dm
@@ -0,0 +1,103 @@
+/*
+/obj/item/toy/plush/mammal/winfre
+	desc = "An adorable stuffed toy of a pissed hyena. She looks unamused."
+	icon = 'hyperstation/icons/obj/plushes.dmi'
+	icon_state = "winfre"
+	item_state = "winfre"
+	attack_verb = list("cackled", "swirlie'd", "stepped on")
+
+/obj/item/toy/plush/mammal/marilyn
+	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")
+
+/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")
+
+/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))
+		..()
+	else
+		user.show_message("<span class='notice'>[src] hugs [Kisser]!</span>", 1,
+			"<span class='notice'>[src] hugs [Kisser]!</span>", 0)
+
+/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'
+	gender = MALE
+	icon_state = "vladin"
+	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))
+		..()
+	else
+		user.show_message("<span class='notice'>[src] rejects the advances of [Kisser]!</span>", 1,
+			"<span class='notice'>That didn't feel like it worked.</span>", 0)
+
+/obj/item/toy/plush/slimeplushie/squish
+	icon = 'hyperstation/icons/obj/plushes.dmi'
+	icon_state = "squish"
+	item_state = "squish"
+
+/obj/item/toy/plush/bird/vivi
+	icon = 'hyperstation/icons/obj/plushes.dmi'
+	gender = MALE
+	icon_state = "vivi"
+	item_state = "vivi"
+
+/obj/item/toy/plush/lizardplushie/chris
+	desc = "An adorable stuffed toy of an angry ashwalker. He even comes with his own little crusher!" // CHRIS CHRIS CHRIS!
+	icon = 'hyperstation/icons/obj/plushes.dmi'
+	gender = MALE
+	icon_state = "chris"
+	item_state = "chris"
+	squeak_override = list('sound/weapons/plasma_cutter.ogg' = 1) // The sound the crusher uses is the same as the plasma cutter :P
+
+	// Part of the code needed for the wishful thinkers who desire to make Chris clash with bubblegum
+
+/*	var/clashing
+	var/is_invoker = TRUE
+
+
+/obj/item/toy/plush/lizard/chris/Moved()
+	. = ..()
+	var/obj/item/toy/plush/bubbleplush/P = locate() in range(1, src)
+	if(P && istype(P.loc, /turf/open) && !P.clash_target && !clashing)
+		P.clash_of_the_plushies(src)
+*/
+
+/obj/item/toy/plush/borgplushie/mediborg
+	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"
+	item_state = "mediborg"
+
+/obj/item/toy/plush/lizardplushie/kami
+	icon = 'hyperstation/icons/obj/plushes.dmi'
+	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"

From a757970b33f63f9032f5ed2b81e2f17b59a21f31 Mon Sep 17 00:00:00 2001
From: jbox1 <40789662+jbox144@users.noreply.github.com>
Date: Thu, 27 Feb 2020 21:21:15 +1100
Subject: [PATCH 2/4] Add files via upload

---
 hyperstation/icons/obj/plushes.dmi | Bin 0 -> 2287 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 hyperstation/icons/obj/plushes.dmi

diff --git a/hyperstation/icons/obj/plushes.dmi b/hyperstation/icons/obj/plushes.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..c5bbedfc1bdaaac272a70afb25fe0db2594caa45
GIT binary patch
literal 2287
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
JPDHLkV1jnX7uNs)

literal 0
HcmV?d00001


From 13863b3cd6e72edfb4a791d7c38610f00b182a84 Mon Sep 17 00:00:00 2001
From: jbox1 <40789662+jbox144@users.noreply.github.com>
Date: Fri, 28 Feb 2020 17:14:36 +1100
Subject: [PATCH 3/4] Update plushes.dm

---
 code/game/objects/items/plushes.dm | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index 0debc38f..5aebf2aa 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -840,12 +840,6 @@
 	icon_state = "rae"
 	item_state = "rae"
 
-/obj/item/toy/plush/mammal/winfre
-	desc = "An adorable stuffed toy of a pissed hyena. She looks unamused."
-	icon_state = "winfre"
-	item_state = "winfre"
-	attack_verb = list("cackled", "swirlie'd", "stepped on")
-
 /obj/item/toy/plush/mammal/zed
 	desc = "A masked stuffed toy that resembles a fierce miner. He even comes with his own little crusher!"
 	icon_state = "zed"
@@ -931,11 +925,6 @@
 	icon_state = "marisol"
 	item_state = "marisol"
 
-/obj/item/toy/plush/mammal/marilyn
-	desc = "A cute stuffed fox toy. Now, about that sponge bath..."
-	icon_state = "marilyn"
-	item_state = "marilyn"
-
 /obj/item/toy/plush/catgirl
 	name = "feline plushie"
 	desc = "An adorable stuffed toy that resembles a feline."

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 4/4] 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"
+*/