diff --git a/modular_zubbers/code/game/objects/items/plushes.dm b/modular_zubbers/code/game/objects/items/plushes.dm index b5d279b28e9..daecec39fd5 100644 --- a/modular_zubbers/code/game/objects/items/plushes.dm +++ b/modular_zubbers/code/game/objects/items/plushes.dm @@ -410,3 +410,35 @@ attack_verb_simple = list("mar", "bite", "chomp", "paw", "fwoomp", "marmar") gender = FEMALE squeak_override = list('modular_zubbers/sound/emotes/sound_voice_mar.ogg' = 1) + +//Plushie for Roxy, of Cellophane +/obj/item/toy/plush/cello_plush + var/shirt = TRUE + name = "concerningly large merseed plush" + desc = "A large, silky-soft plushie of a merseed dragon. When you hug it, you can't get your arms around it no matter how hard you try." + icon = 'modular_zubbers/icons/obj/toys/plushes.dmi' + lefthand_file = 'modular_zubbers/icons/mob/inhands/items/plushes_lefthand.dmi' + righthand_file = 'modular_zubbers/icons/mob/inhands/items/plushes_righthand.dmi' + icon_state = "celloplush" + inhand_icon_state = "celloplush-shirt" + attack_verb_continuous = list("squishes", "smothers", "smacks", "bullies", "pancakes", "flops at", "smears", "dents") + attack_verb_simple = list("squish", "smother", "smack", "bully", "pancake", "flop", "smear", "dent") + gender = FEMALE + squeak_override = list( + 'sound/mobs/non-humanoids/fish/fish_slap1.ogg' = 1, 'sound/mobs/non-humanoids/fish/fish_slap2.ogg' = 1, + ) + +/obj/item/toy/plush/cello_plush/click_alt(mob/user) + shirt = !shirt + if(!shirt) + balloon_alert(user, "tummy shown...") + icon_state = "celloplush-alt" + inhand_icon_state = "celloplush-alt" + + else + balloon_alert(user, "tummy tucked away...") + icon_state = "celloplush" + inhand_icon_state = "celloplush-shirt" + + update_inhand_icon() + return ..() diff --git a/modular_zubbers/code/modules/loadout/categories/toys.dm b/modular_zubbers/code/modules/loadout/categories/toys.dm index 93bc5ee6270..3a840232cc1 100644 --- a/modular_zubbers/code/modules/loadout/categories/toys.dm +++ b/modular_zubbers/code/modules/loadout/categories/toys.dm @@ -131,4 +131,8 @@ name = "Bureaucratic Goat Plush" item_path = /obj/item/toy/plush/tian_plush +/datum/loadout_item/toys/plush/cello_plush + name = "Concerningly Large Merseed Plush" + item_path = /obj/item/toy/plush/cello_plush + diff --git a/modular_zubbers/code/modules/vending/games.dm b/modular_zubbers/code/modules/vending/games.dm index f45a5a7f3a0..137f31b7943 100644 --- a/modular_zubbers/code/modules/vending/games.dm +++ b/modular_zubbers/code/modules/vending/games.dm @@ -15,6 +15,7 @@ /obj/item/toy/plush/bubbledragon = 3, /obj/item/toy/plush/bubbleplush = 3, /obj/item/toy/plush/carpplushie = 3, + /obj/item/toy/plush/cello_plush = 3, /obj/item/toy/plush/chirp_plush = 3, /obj/item/toy/plush/goatplushie = 3, /obj/item/toy/plush/headcrab = 3, diff --git a/modular_zubbers/icons/mob/inhands/items/plushes_lefthand.dmi b/modular_zubbers/icons/mob/inhands/items/plushes_lefthand.dmi index 29bcc45811f..9ba9631de2e 100644 Binary files a/modular_zubbers/icons/mob/inhands/items/plushes_lefthand.dmi and b/modular_zubbers/icons/mob/inhands/items/plushes_lefthand.dmi differ diff --git a/modular_zubbers/icons/mob/inhands/items/plushes_righthand.dmi b/modular_zubbers/icons/mob/inhands/items/plushes_righthand.dmi index 6f7a9055ac1..5df2c93822e 100644 Binary files a/modular_zubbers/icons/mob/inhands/items/plushes_righthand.dmi and b/modular_zubbers/icons/mob/inhands/items/plushes_righthand.dmi differ diff --git a/modular_zubbers/icons/obj/toys/plushes.dmi b/modular_zubbers/icons/obj/toys/plushes.dmi index 8836e96ed0c..2850e2557cc 100644 Binary files a/modular_zubbers/icons/obj/toys/plushes.dmi and b/modular_zubbers/icons/obj/toys/plushes.dmi differ