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 c5bbedfc..b33ff051 100644 Binary files a/hyperstation/icons/obj/plushes.dmi and b/hyperstation/icons/obj/plushes.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 9f1a6945..062364c8 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -1,5 +1,6 @@ //This is the file that handles donator loadout items. + /datum/gear/pingcoderfailsafe name = "IF YOU SEE THIS, PING A CODER RIGHT NOW!" category = SLOT_IN_BACKPACK @@ -11,3 +12,9 @@ category = SLOT_IN_BACKPACK path = /obj/item/bikehorn geargroupID = list("DONORTEST") //This is a list mainly for the sake of testing, but geargroupID works just fine with ordinary strings + +/datum/gear/winterblooplush + name = "Will Plush" + category = SLOT_IN_BACKPACK + path = /obj/item/toy/plush/mammal/winterbloo + ckeywhitelist = list("Wolfy_wolf967") diff --git a/tgstation.dme b/tgstation.dme index b4ddb8c6..2362a1d3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2875,6 +2875,8 @@ #include "hyperstation\code\mobs\werewolf.dm" #include "hyperstation\code\modules\antagonists\werewolf\werewolf.dm" #include "hyperstation\code\obj\decal.dm" +#include "hyperstation\code\obj\patreon.dm" +#include "hyperstation\code\obj\plushes.dm" #include "hyperstation\code\obj\pregnancytester.dm" #include "interface\interface.dm" #include "interface\menu.dm"