diff --git a/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm b/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm index 5de257abd9c..1bfd6420ba1 100644 --- a/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm +++ b/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm @@ -323,6 +323,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/grenade/chem_grenade/glitter/blue = 100, /obj/item/grenade/chem_grenade/metalfoam = 100, /obj/item/grenade/chem_grenade/smart_metal_foam = 75, + /obj/item/grenade/chem_grenade/wehnade = 75, /obj/item/grenade/chem_grenade/teargas = 25, /obj/item/grenade/firecracker = 25, /obj/item/grenade/flashbang = 10, diff --git a/modular_zubbers/code/modules/cargo/cargo_spawners.dm b/modular_zubbers/code/modules/cargo/cargo_spawners.dm new file mode 100644 index 00000000000..c790bc53f5d --- /dev/null +++ b/modular_zubbers/code/modules/cargo/cargo_spawners.dm @@ -0,0 +1,24 @@ +/obj/effect/spawner/random/lizard_crate + name = "lizard loot spawner" + desc = "What wondrous lizard related good could it contain?" + icon_state = "plushie" + loot = list( + //plushies + /obj/item/toy/plush/lizard_plushie/space = 20, + /obj/item/toy/plush/lizard_plushie/space/green = 20, + /obj/item/toy/plush/lizard_plushie/greyscale = 20, + /obj/item/toy/plush/lizard_plushie/green = 40, + /obj/item/toy/plush/lizard_plushie = 30, + + //wehnade + /obj/item/grenade/chem_grenade/wehnade = 15, + + //assorted lizard foods + /obj/item/food/tiziran_sausage = 10, + /obj/item/food/headcheese_slice = 10, + /obj/item/storage/box/spaceman_ration/meats/lizard = 5, + /obj/item/food/root_flatbread = 10, + + //lil lizards + /mob/living/basic/lizard = 40, + ) diff --git a/modular_zubbers/code/modules/cargo/packs/contraband.dm b/modular_zubbers/code/modules/cargo/packs/contraband.dm index ad85113f0eb..1eab3dab04b 100644 --- a/modular_zubbers/code/modules/cargo/packs/contraband.dm +++ b/modular_zubbers/code/modules/cargo/packs/contraband.dm @@ -16,3 +16,12 @@ crate_name = "patriotic crate" contraband = TRUE +/datum/supply_pack/imports/lizardgoodscrate + name = "Lizard Goods Crate" + desc = "Limited edition Lizard Goods Crate! Contains a random assortment of your FAVOURITE lizard related items, including the coveted 'weh-nade'" + cost = CARGO_CRATE_VALUE * 3 + contains = list( + /obj/effect/spawner/random/lizard_crate = 8 + ) + crate_name = "lizard goods crate" + contraband = TRUE diff --git a/modular_zubbers/code/modules/fun_items/grenades.dm b/modular_zubbers/code/modules/fun_items/grenades.dm new file mode 100644 index 00000000000..8147d637c3f --- /dev/null +++ b/modular_zubbers/code/modules/fun_items/grenades.dm @@ -0,0 +1,17 @@ +/obj/item/grenade/chem_grenade/wehnade + name = "wehnade" + desc = "A weird, old looking grenade casing. If you shake it you can hear liquid inside. It has no markings on it beside a hand written sticker that says 'Weh'!" + stage = GRENADE_READY + +/obj/item/grenade/chem_grenade/wehnade/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src) + var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src) + + beaker_one.reagents.add_reagent(/datum/reagent/fluorosurfactant, 30) + beaker_two.reagents.add_reagent(/datum/reagent/water, 30) + beaker_one.reagents.add_reagent(/datum/reagent/juice_that_makes_you_weh, 30) + beaker_two.reagents.add_reagent(/datum/reagent/juice_that_makes_you_weh, 30) + + beakers += beaker_one + beakers += beaker_two diff --git a/modular_zubbers/code/modules/reagents/chemistry/reagents/other_reagents.dm b/modular_zubbers/code/modules/reagents/chemistry/reagents/other_reagents.dm index 0775da60303..ef0f1184d43 100644 --- a/modular_zubbers/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/modular_zubbers/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -393,6 +393,30 @@ "Your blood coagulates!" = MUT_MSG_EXTENDED, "You feel a yearning for flesh and brains" = MUT_MSG_ABOUT2TURN) +//New chemical which only causes people to perform the 'weh' emote. No way to create this, currently will only be in rare foam grenades found as loot +/datum/reagent/juice_that_makes_you_weh + name = "Juice That Makes You Weh" + description = "A strange green chemical, will cause iliving beings to 'weh' uncontrollably for a time" + color = "#37e427" // rgb: 165, 240, 238 + taste_description = "an odd sweetness with a hint of spice" + metabolization_rate = 2 // metabolises 10x faster, will occur more often but not hang around for ages + penetrates_skin = VAPOR + ph = 5.5 + +//This code allows it to randomly proc regularly, causing a random pitch 'weh' sound +/datum/reagent/juice_that_makes_you_weh/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + . = ..() + + if (prob(50)) + to_chat(affected_mob, span_warning("You feel the urge to weh...")) + addtimer(CALLBACK(src, PROC_REF(do_weh), affected_mob), rand(1, 4) SECONDS) + +/datum/reagent/juice_that_makes_you_weh/proc/do_weh(mob/living/carbon/M) + if (QDELETED(M)) + return + M.emote("weh") + + #undef MUT_MSG_IMMEDIATE #undef MUT_MSG_EXTENDED #undef MUT_MSG_ABOUT2TURN diff --git a/tgstation.dme b/tgstation.dme index 83cfae94ee5..4730bca0ab4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9194,6 +9194,7 @@ #include "modular_zubbers\code\modules\bow_adjustments\bow.dm" #include "modular_zubbers\code\modules\bsrpd\code\bsrpd.dm" #include "modular_zubbers\code\modules\bubber_tram\code\moonstation_tram.dm" +#include "modular_zubbers\code\modules\cargo\cargo_spawners.dm" #include "modular_zubbers\code\modules\cargo\expressconsole.dm" #include "modular_zubbers\code\modules\cargo\bounties\assistant.dm" #include "modular_zubbers\code\modules\cargo\bounties\blacksmith.dm" @@ -9361,6 +9362,7 @@ #include "modular_zubbers\code\modules\food_and_drinks\recipes\drinks\drinks_non-alcoholic.dm" #include "modular_zubbers\code\modules\food_and_drinks\recipes\tablecraft\recipes_pizza.dm" #include "modular_zubbers\code\modules\food_and_drinks\recipes\tablecraft\recipes_seafood.dm" +#include "modular_zubbers\code\modules\fun_items\grenades.dm" #include "modular_zubbers\code\modules\GAGS\greyscale_configs.dm" #include "modular_zubbers\code\modules\ghost_wavedefence\wave_def.dm" #include "modular_zubbers\code\modules\ghostcafe\hilbertshotel_silicon.dm"