From 3e2219bad17daf43fd3894d31c201240a2317613 Mon Sep 17 00:00:00 2001
From: QuoteFox <49098813+quotefox@users.noreply.github.com>
Date: Mon, 2 Mar 2020 17:29:43 +0000
Subject: [PATCH] Patreon Reward: winterbloo
Plushie added to his loadout, for a patreon reward!
---
hyperstation/code/obj/plushes.dm | 89 ++----------------
hyperstation/icons/obj/plushes.dmi | Bin 2287 -> 2520 bytes
.../code/modules/client/loadout/__donator.dm | 7 ++
tgstation.dme | 2 +
4 files changed, 18 insertions(+), 80 deletions(-)
diff --git a/hyperstation/code/obj/plushes.dm b/hyperstation/code/obj/plushes.dm
index 7989feb4..0a42aa6f 100644
--- a/hyperstation/code/obj/plushes.dm
+++ b/hyperstation/code/obj/plushes.dm
@@ -8,9 +8,18 @@
/obj/item/toy/plush/mammal/marilyn
desc = "A cute stuffed fox toy. Now, about that sponge bath..."
icon = 'hyperstation/icons/obj/plushes.dmi'
+ attack_verb = list("hugged", "cuddled", "embraced")
icon_state = "marilyn"
item_state = "marilyn"
+/obj/item/toy/plush/mammal/winterbloo
+ name = "Will, the biggest dog"
+ desc = "A plush made to look like a thick as hell shiba, looks a little bigger than average too."
+ icon = 'hyperstation/icons/obj/plushes.dmi'
+ icon_state = "winterbloo"
+ item_state = "winterbloo"
+ attack_verb = list("hugged", "cuddled", "embraced")
+
/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'
@@ -25,83 +34,3 @@
else */
user.show_message("[src] hugs [Kisser]!", 1,
"[src] hugs [Kisser]!", 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'
- 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("[src] rejects the advances of [Kisser]!", 1,
- "That didn't feel like it worked.", 0)
-
-/obj/item/toy/plush/slimeplushie/squish
- icon = 'hyperstation/icons/obj/plushes.dmi'
- 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
- 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"
-*/
diff --git a/hyperstation/icons/obj/plushes.dmi b/hyperstation/icons/obj/plushes.dmi
index c5bbedfc1bdaaac272a70afb25fe0db2594caa45..b33ff051c1f5e2db6a927b9e21f399f34f02a1a6 100644
GIT binary patch
delta 2268
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