diff --git a/_maps/map_files/ProtoBoxStation/ProtoBoxStation.dmm b/_maps/map_files/ProtoBoxStation/ProtoBoxStation.dmm index c056e8fe4bb07..786461386ecd8 100644 --- a/_maps/map_files/ProtoBoxStation/ProtoBoxStation.dmm +++ b/_maps/map_files/ProtoBoxStation/ProtoBoxStation.dmm @@ -37360,7 +37360,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/structure/table/wood, -/obj/effect/spawner/random/food_or_drink/snack, +/obj/item/toy/plush/explosive, /turf/open/floor/iron/checker, /area/station/science/breakroom) "dQL" = ( diff --git a/code/game/objects/effects/spawners/random/entertainment.dm b/code/game/objects/effects/spawners/random/entertainment.dm index 74ca4213b0dc5..1557187721282 100644 --- a/code/game/objects/effects/spawners/random/entertainment.dm +++ b/code/game/objects/effects/spawners/random/entertainment.dm @@ -252,6 +252,9 @@ /obj/item/toy/plush/beeplushie, /obj/item/toy/plush/moth, /obj/item/toy/plush/pkplush, +//MASSMETA ADDITION BEGIN + /obj/item/toy/plush/explosive +//MASSMETA ADDITION END ) /obj/effect/spawner/random/entertainment/plushie_delux @@ -279,6 +282,9 @@ /obj/item/toy/plush/bubbleplush = 2, /obj/item/toy/plush/ratplush = 2, /obj/item/toy/plush/narplush = 2, +//MASSMETA ADDITION BEGIN + /obj/item/toy/plush/explosive = 2, +//MASSMETA ADDITION END ) /obj/effect/spawner/random/entertainment/colorful_grenades diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 35e4c7ff72e9f..34609b3ecdd2a 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -792,4 +792,4 @@ icon_state = "blahaj" inhand_icon_state = "blahaj" attack_verb_continuous = list("gnaws", "gnashes", "chews") - attack_verb_simple = list("gnaw", "gnash", "chew") + attack_verb_simple = list("gnaw", "gnash", "chew") \ No newline at end of file diff --git a/icons/obj/toys/plushes.dmi b/icons/obj/toys/plushes.dmi index 241d45fc33d27..018b7715790fd 100644 Binary files a/icons/obj/toys/plushes.dmi and b/icons/obj/toys/plushes.dmi differ diff --git a/massmeta/features/explushie/code/explushie.dm b/massmeta/features/explushie/code/explushie.dm new file mode 100644 index 0000000000000..7301fe7997087 --- /dev/null +++ b/massmeta/features/explushie/code/explushie.dm @@ -0,0 +1,8 @@ +/obj/item/toy/plush/explosive + name = "an unusual moth plushie" + desc = "Chik-chiki boom, chik-chiki boom, chik-chiki boom..." + icon = 'massmeta/features/explushie/icons/plushes.dmi' + icon_state = "xestia" + attack_verb_continuous = list("booms", "explodes") + attack_verb_simple = list("boom", "explode") + squeak_override = list('sound/effects/explosion_distant.ogg' = 2) diff --git a/massmeta/features/explushie/icons/plushes.dmi b/massmeta/features/explushie/icons/plushes.dmi new file mode 100644 index 0000000000000..13aab1f0b9819 Binary files /dev/null and b/massmeta/features/explushie/icons/plushes.dmi differ diff --git a/massmeta/features/explushie/includes.dm b/massmeta/features/explushie/includes.dm new file mode 100644 index 0000000000000..06099f0ce743a --- /dev/null +++ b/massmeta/features/explushie/includes.dm @@ -0,0 +1,2 @@ +#include "code\explushie.dm" + diff --git a/massmeta/modular_meta.dm b/massmeta/modular_meta.dm index 443a6a9aa55cf..7af6b24182104 100644 --- a/massmeta/modular_meta.dm +++ b/massmeta/modular_meta.dm @@ -13,6 +13,7 @@ // BEGIN_INCLUDE #include "features\additional_circuit\includes.dm" +#include "features\explushie\includes.dm" #include "features\hardsuits\includes.dm" #include "features\kvass\includes.dm" #include "features\smites\includes.dm" @@ -104,4 +105,4 @@ //Testicular_torsion wizard #include "code\modules\spells\spell_types\touch\testicular_torsion.dm" -#include "code\modules\antags\wizard\equipment\spellbook_entries\offensive.dm" +#include "code\modules\antags\wizard\equipment\spellbook_entries\offensive.dm" \ No newline at end of file