diff --git a/modular_zubbers/code/game/objects/effects/items/plushes.dm b/modular_zubbers/code/game/objects/effects/items/plushes.dm deleted file mode 100644 index 7a2960be58a..00000000000 --- a/modular_zubbers/code/game/objects/effects/items/plushes.dm +++ /dev/null @@ -1,5 +0,0 @@ -/obj/item/toy/plush/moth/lovers - name = "lovers moth plushie" - desc = "An adorable mothperson plushie. It's a lovely bug!" - icon = 'modular_zubbers/icons/obj/toys/plushes.dmi' - icon_state = "moffplush_lovers" diff --git a/modular_zubbers/code/game/objects/items/plushes.dm b/modular_zubbers/code/game/objects/items/plushes.dm index edcf8f00f97..5505523ec7e 100644 --- a/modular_zubbers/code/game/objects/items/plushes.dm +++ b/modular_zubbers/code/game/objects/items/plushes.dm @@ -284,7 +284,7 @@ ) /obj/item/toy/plush/mothroach_plush - name = "Mothroach Plush" + name = "mothroach plush" desc = "A plushie featuring the likeness everyone's favorite genetic freak-turned station pet. Do not soak it in milk and throw it against a wall." icon = 'modular_zubbers/icons/obj/toys/plushes.dmi' icon_state = "mothroach" @@ -292,3 +292,18 @@ attack_verb_simple = list("mothroach", "moth", "roach") gender = MALE squeak_override = list( 'sound/mobs/humanoids/moth/scream_moth.ogg' = 1, ) + +/obj/item/toy/plush/moth/lovers + name = "lovers moth plushie" + desc = "An adorable mothperson plushie. It's a lovely bug!" + icon = 'modular_zubbers/icons/obj/toys/plushes.dmi' + icon_state = "moffplush_lovers" + +/obj/item/toy/plush/lazy_synth + name = "lazy synth plush" + desc = "A soft plush of an extremely lazy synth. Might be found loafing in random places." + attack_verb_continuous = list("squishes") + attack_verb_simple = list("squish") + icon = 'modular_zubbers/icons/obj/toys/plushes.dmi' + icon_state = "lazy_synth" + squeak_override = list('modular_zubbers/sound/misc/squeakle.ogg' = 1) diff --git a/modular_zubbers/code/modules/loadout/categories/toys.dm b/modular_zubbers/code/modules/loadout/categories/toys.dm index 6825aef8585..4718d9d92be 100644 --- a/modular_zubbers/code/modules/loadout/categories/toys.dm +++ b/modular_zubbers/code/modules/loadout/categories/toys.dm @@ -98,3 +98,7 @@ /datum/loadout_item/toys/mothroach_plush name = "Mothroach Plush" item_path = /obj/item/toy/plush/mothroach_plush + +/datum/loadout_item/toys/lazy_synth + name = "Lazy Synth Plush" + item_path = /obj/item/toy/plush/lazy_synth diff --git a/modular_zubbers/icons/obj/toys/plushes.dmi b/modular_zubbers/icons/obj/toys/plushes.dmi index 00cecea5305..9f98c3804d3 100644 Binary files a/modular_zubbers/icons/obj/toys/plushes.dmi and b/modular_zubbers/icons/obj/toys/plushes.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 917be021661..8ab57564e77 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9017,7 +9017,6 @@ #include "modular_zubbers\code\game\objects\effects\decals\blood.dm" #include "modular_zubbers\code\game\objects\effects\decals\cleanable.dm" #include "modular_zubbers\code\game\objects\effects\effects_system\effect_sparks.dm" -#include "modular_zubbers\code\game\objects\effects\items\plushes.dm" #include "modular_zubbers\code\game\objects\effects\spawners\random\armory.dm" #include "modular_zubbers\code\game\objects\effects\spawners\random\moonstation_random.dm" #include "modular_zubbers\code\game\objects\effects\spawners\random\vending.dm"