diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm index 5652653b79d..5b891e60b06 100644 --- a/code/__DEFINES/reagents.dm +++ b/code/__DEFINES/reagents.dm @@ -126,6 +126,16 @@ /// Supercedes [REAGENT_REVERSE_METABOLISM]. #define REAGENT_UNAFFECTED_BY_METABOLISM (1<<10) +/// Spawn from features that can produce an infinite amount of something, like geysers, strange seeds and bees +#define REAGENT_SPAWN_RANDOM_PRODUCERS (1<<0) +/// Spawn from maintpills (only real maintpills, not the fake mapped or purchased kind) +#define REAGENT_SPAWN_MAINTENANCE_PILL (1<<1) + +/// Do not ever spawn in anything random +#define REAGENT_SPAWN_NO_RANDOM NONE +/// Just spawn in everything, we don't care +#define REAGENT_SPAWN_ALL_RANDOM_SPAWNS ALL + //Chemical reaction flags, for determining reaction specialties ///Convert into impure/pure on reaction completion #define REACTION_CLEAR_IMPURE (1<<0) diff --git a/code/__HELPERS/reagents.dm b/code/__HELPERS/reagents.dm index 5c194b01319..e569278eb41 100644 --- a/code/__HELPERS/reagents.dm +++ b/code/__HELPERS/reagents.dm @@ -156,33 +156,17 @@ return input_reagent ///Returns a random reagent object, with the option to blacklist reagents. -/proc/get_random_reagent_id(list/blacklist) - var/static/list/reagent_static_list = list() //This is static, and will be used by default if a blacklist is not passed. - var/list/reagent_list_to_process - if(blacklist) //If we do have a blacklist, we recompile a new list with the excluded reagents not present and pick from there. - reagent_list_to_process = list() - else - reagent_list_to_process = reagent_static_list +/proc/get_random_reagent_id(randomization_flags = REAGENT_SPAWN_RANDOM_PRODUCERS, list/blacklist, list/whitelist) + var/list/reagent_list_to_process = list() - if(!reagent_list_to_process.len) - for(var/datum/reagent/reagent_path as anything in subtypesof(/datum/reagent)) - if(is_path_in_list(reagent_path, blacklist)) - continue - if(initial(reagent_path.chemical_flags) & REAGENT_CAN_BE_SYNTHESIZED) - reagent_list_to_process += reagent_path + whitelist ||= subtypesof(/datum/reagent) - var/picked_reagent = pick(reagent_list_to_process) - return picked_reagent - -///Returns a random reagent consumable ethanol object minus blacklisted reagents -/proc/get_random_drink_id() - var/static/list/random_drinks = list() - if(!random_drinks.len) - for(var/datum/reagent/drink_path as anything in subtypesof(/datum/reagent/consumable/ethanol)) - if(initial(drink_path.chemical_flags) & REAGENT_CAN_BE_SYNTHESIZED) - random_drinks += drink_path - var/picked_drink = pick(random_drinks) - return picked_drink + for(var/datum/reagent/reagent_path as anything in whitelist) + if(is_path_in_list(reagent_path, blacklist)) + continue + if(reagent_path::randomized_spawns & randomization_flags) + reagent_list_to_process += reagent_path + return pick(reagent_list_to_process) ///Returns reagent datum from reagent name string /proc/get_chem_id(chem_name) diff --git a/code/datums/weather/weather.dm b/code/datums/weather/weather.dm index c744d148140..50fa90c79e2 100644 --- a/code/datums/weather/weather.dm +++ b/code/datums/weather/weather.dm @@ -149,7 +149,7 @@ else if(whitelist_weather_reagents) reagent_id = pick_weight_recursive(whitelist_weather_reagents) else if(blacklist_weather_reagents) // randomized - reagent_id = get_random_reagent_id(blacklist_weather_reagents) + reagent_id = get_random_reagent_id(blacklist = blacklist_weather_reagents) if(reagent_id) weather_reagent = GLOB.chemical_reagents_list[reagent_id] diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm index ff25eac7976..7d834015838 100644 --- a/code/modules/hydroponics/beekeeping/beebox.dm +++ b/code/modules/hydroponics/beekeeping/beebox.dm @@ -63,7 +63,7 @@ icon_state = "beebox" var/datum/reagent/custom_reagent = null if(random_reagent) - custom_reagent = pick(subtypesof(/datum/reagent)) + custom_reagent = get_random_reagent_id() custom_reagent = GLOB.chemical_reagents_list[custom_reagent] queen_bee = new(src) diff --git a/code/modules/mob/living/basic/farm_animals/bee/_bee.dm b/code/modules/mob/living/basic/farm_animals/bee/_bee.dm index 06334d1c954..a90b4e0dd4f 100644 --- a/code/modules/mob/living/basic/farm_animals/bee/_bee.dm +++ b/code/modules/mob/living/basic/farm_animals/bee/_bee.dm @@ -198,21 +198,8 @@ generate_bee_visuals() /// Picks a random toxin and assigns it to the bee -/mob/living/basic/bee/proc/assign_random_toxin_reagent(respect_can_synth = TRUE) - var/list/toxin_pool = typesof(/datum/reagent/toxin) - var/datum/reagent/toxin - var/sanity = 0 - - do - if(sanity > 20 || !length(toxin_pool)) - toxin = pick(/datum/reagent/toxin, /datum/reagent/toxin/histamine, /datum/reagent/toxin/venom) - respect_can_synth = FALSE // in case someone removes cansynth from all of the above for some goofy reason - else - toxin = pick_n_take(toxin_pool) - sanity += 1 - while(respect_can_synth && !(toxin::chemical_flags & REAGENT_CAN_BE_SYNTHESIZED)) - - assign_reagent(GLOB.chemical_reagents_list[toxin]) +/mob/living/basic/bee/proc/assign_random_toxin_reagent() + assign_reagent(get_random_reagent_id(whitelist = subtypesof(/datum/reagent/toxin))) /mob/living/basic/bee/mutate() . = ..() @@ -235,7 +222,7 @@ /mob/living/basic/bee/toxin/Initialize(mapload) . = ..() - assign_random_toxin_reagent(respect_can_synth = FALSE) + assign_random_toxin_reagent() /// A bee which despawns after a short amount of time (beespawns?) /mob/living/basic/bee/timed diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm index 2a00b8c9a32..fd115c1114a 100644 --- a/code/modules/reagents/chemistry/reagents.dm +++ b/code/modules/reagents/chemistry/reagents.dm @@ -97,6 +97,8 @@ var/fallback_icon_state /// When ordered in a restaurant, what custom order do we create? var/restaurant_order = /datum/custom_order/reagent/drink + /// How we interact with random generators + var/randomized_spawns = REAGENT_SPAWN_NO_RANDOM /datum/reagent/New() SHOULD_CALL_PARENT(TRUE) diff --git a/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm b/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm index fa6401761e3..6f698959660 100644 --- a/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm @@ -5,6 +5,7 @@ color = "90560B" taste_description = "burning" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/freon/on_mob_metabolize(mob/living/breather) . = ..() @@ -21,6 +22,7 @@ color = "90560B" taste_description = "minty" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_RESISTHEAT) /datum/reagent/halon/on_mob_metabolize(mob/living/breather) @@ -38,6 +40,7 @@ color = "90560B" taste_description = "rubbery" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/healium/on_mob_end_metabolize(mob/living/breather) . = ..() @@ -60,6 +63,7 @@ color = "90560B" taste_description = "searingly cold" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/hypernoblium/on_mob_life(mob/living/carbon/breather, seconds_per_tick, metabolization_ratio) . = ..() @@ -74,6 +78,7 @@ taste_description = "sourness" ph = 1.8 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/stimulants = 50) metabolized_traits = list(TRAIT_SLEEPIMMUNE) @@ -93,6 +98,7 @@ taste_description = "burning" ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/nitrium_low_metabolization/on_mob_metabolize(mob/living/breather) . = ..() @@ -109,6 +115,7 @@ color = COLOR_GRAY taste_description = "irradiated air" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/pluoxium/on_mob_life(mob/living/carbon/breather, seconds_per_tick, metabolization_ratio) . = ..() diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm index 49596037346..13784310a8b 100644 --- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm @@ -24,6 +24,7 @@ var/helbent = FALSE var/reaping = FALSE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/c2/helbital/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -107,6 +108,7 @@ inverse_chem_val = 0.3 inverse_chem = /datum/reagent/inverse/libitoil chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/c2/libital/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -125,6 +127,7 @@ inverse_chem_val = 0.5//Though it's tough to get inverse_chem = /datum/reagent/medicine/metafactor //Seems thematically intact chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/c2/probital/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -172,6 +175,7 @@ color = "#6171FF" ph = 4.7 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS inverse_chem_val = 0.4 inverse_chem = /datum/reagent/inverse/lentslurri @@ -189,6 +193,7 @@ color = "#8C93FF" ph = 4 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS inverse_chem_val = 0.35 inverse_chem = /datum/reagent/inverse/aiuri @@ -210,6 +215,7 @@ inverse_chem = /datum/reagent/inverse/hercuri inverse_chem_val = 0.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/c2/hercuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -258,6 +264,7 @@ inverse_chem_val = 0.5 inverse_chem = /datum/reagent/inverse/healing/convermol chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/c2/convermol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -287,6 +294,7 @@ inverse_chem = /datum/reagent/inverse/healing/tirimol inverse_chem_val = 0.25 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /// A cooldown for spacing bursts of stamina damage COOLDOWN_DECLARE(drowsycd) @@ -320,6 +328,7 @@ inverse_chem = /datum/reagent/inverse/technetium inverse_chem_val = 0.45 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /// Temperatures below this number give radiation healing. var/rads_heal_threshold = 100 @@ -364,6 +373,7 @@ inverse_chem_val = 0.35 ph = 9.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/c2/multiver/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -401,6 +411,7 @@ overdose_threshold = 6 ph = 8.6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS var/conversion_amount /datum/reagent/medicine/c2/syriniver/expose_mob(mob/living/carbon/exposed_mob, methods, trans_volume, show_message, touch_protection) @@ -449,6 +460,7 @@ ph = 9.1 var/datum/brain_trauma/mild/muscle_weakness/trauma chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/c2/musiver/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -487,6 +499,7 @@ color = "#FFEBEB" ph = 7.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/c2/synthflesh/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message = TRUE, touch_protection = 0) . = ..() @@ -572,6 +585,7 @@ inverse_chem = /datum/reagent/inverse/penthrite inverse_chem_val = 0.25 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /// List of traits to add/remove from our subject when we are in their system var/static/list/subject_traits = list( TRAIT_STABLEHEART, diff --git a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm index 1d21e845ffa..b3a49dbcebc 100644 --- a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm @@ -115,6 +115,7 @@ taste_description = "mild carbonated malt" ph = 4 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_STOCK // Beer is a chemical composition of alcohol and various other things. It's a garbage nutrient but hey, it's still one. Also alcohol is bad, mmmkay? @@ -129,6 +130,7 @@ taste_description = "dish water" ph = 5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/beer/maltliquor name = "Malt Liquor" @@ -137,6 +139,7 @@ taste_description = "sweet corn beer and the hood life" ph = 4.8 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/beer/green name = "Green Beer" @@ -146,6 +149,7 @@ taste_description = "green piss water" ph = 6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/beer/green/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -177,6 +181,7 @@ boozepwr = 45 ph = 6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_STIMULATED) /datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) @@ -195,6 +200,7 @@ taste_description = "molasses" ph = 4.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_STOCK /datum/reagent/consumable/ethanol/whiskey/kong @@ -203,6 +209,7 @@ color = "#332100" // rgb: 51, 33, 0 taste_description = "the grip of a giant ape" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/whiskey/candycorn name = "Candy Corn Liquor" @@ -210,6 +217,7 @@ color = "#ccb800" // rgb: 204, 184, 0 taste_description = "pancake syrup" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/whiskey/candycorn/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -226,6 +234,7 @@ overdose_threshold = 60 taste_description = "jitters and death" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_STIMULATED) /datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) @@ -289,6 +298,7 @@ taste_description = "grain alcohol" ph = 8.1 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_CLEANS //Very high proof + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/cup/glass/bottle/vodka /datum/reagent/consumable/ethanol/bilk @@ -299,6 +309,7 @@ boozepwr = 15 taste_description = "desperation and lactate" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -315,6 +326,7 @@ taste_description = "dryness" ph = 3.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/threemileisland/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -328,6 +340,7 @@ taste_description = "an alcoholic christmas tree" ph = 6.9 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_STOCK /datum/reagent/consumable/ethanol/rum @@ -339,6 +352,7 @@ ph = 6.5 default_container = /obj/item/reagent_containers/cup/glass/bottle/rum chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/rum/aged name = "Aged Rum" @@ -369,6 +383,7 @@ taste_description = "paint stripper" ph = 4 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_STOCK /datum/reagent/consumable/ethanol/vermouth @@ -379,6 +394,7 @@ taste_description = "dry alcohol" ph = 3.25 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/wine name = "Wine" @@ -388,6 +404,7 @@ taste_description = "bitter sweetness" ph = 3.45 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_STOCK default_container = /obj/item/reagent_containers/cup/glass/bottle/wine @@ -413,6 +430,7 @@ taste_description = "scaley sweetness" ph = 3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_STOCK /datum/reagent/consumable/ethanol/grappa @@ -423,6 +441,7 @@ taste_description = "classy bitter sweetness" ph = 3.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_STOCK /datum/reagent/consumable/ethanol/amaretto @@ -432,6 +451,7 @@ boozepwr = 25 taste_description = "fruity and nutty sweetness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_STOCK /datum/reagent/consumable/ethanol/cognac @@ -442,6 +462,7 @@ taste_description = "smooth and french" ph = 3.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_STOCK /datum/reagent/consumable/ethanol/absinthe @@ -451,6 +472,7 @@ boozepwr = 80 //Very strong even by default taste_description = "death and licorice" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -465,6 +487,7 @@ taste_description = "pure resignation" addiction_types = list(/datum/addiction/maintenance_drugs = 600) chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/ale name = "Ale" @@ -474,6 +497,7 @@ taste_description = "hearty barley ale" ph = 4.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_STOCK /datum/reagent/consumable/ethanol/goldschlager @@ -484,6 +508,7 @@ quality = DRINK_NICE taste_description = "burning cinnamon" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS // This drink is really popular with a certain demographic. var/teenage_girl_quality = DRINK_VERYGOOD @@ -520,6 +545,7 @@ taste_description = "metallic and expensive" ph = 4.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_HIGH /datum/reagent/consumable/ethanol/gintonic @@ -531,6 +557,7 @@ taste_description = "mild and tart" ph = 3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_EASY /datum/reagent/consumable/ethanol/rum_coke @@ -542,6 +569,7 @@ color = "#3E1B00" ph = 4 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/cuba_libre name = "Cuba Libre" @@ -551,6 +579,7 @@ quality = DRINK_GOOD taste_description = "a refreshing marriage of citrus and rum" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/cuba_libre/on_mob_life(mob/living/carbon/cubano, seconds_per_tick, metabolization_ratio) . = ..() @@ -571,6 +600,7 @@ quality = DRINK_NICE taste_description = "cola" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/martini name = "Classic Martini" @@ -580,6 +610,7 @@ quality = DRINK_NICE taste_description = "dry class" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_EASY /datum/reagent/consumable/ethanol/vodkamartini @@ -590,6 +621,7 @@ quality = DRINK_NICE taste_description = "shaken, not stirred" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/white_russian @@ -600,6 +632,7 @@ quality = DRINK_GOOD taste_description = "bitter cream" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/screwdrivercocktail name = "Screwdriver" @@ -609,6 +642,7 @@ quality = DRINK_NICE taste_description = "oranges" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/screwdrivercocktail/on_new(data) . = ..() @@ -660,6 +694,7 @@ boozepwr = 45 taste_description = "sweet 'n creamy" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/bloody_mary name = "Bloody Mary" @@ -669,6 +704,7 @@ quality = DRINK_GOOD taste_description = "tomatoes with a hint of lime and liquid murder" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/bloody_mary/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -682,6 +718,7 @@ quality = DRINK_NICE taste_description = "alcoholic bravery" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_EASY metabolized_traits = list(TRAIT_FEARLESS, TRAIT_ANALGESIA) var/tough_text @@ -707,6 +744,7 @@ quality = DRINK_GOOD taste_description = "oranges with a hint of pomegranate" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_MEDIUM var/obj/effect/light_holder @@ -736,6 +774,7 @@ quality = DRINK_VERYGOOD taste_description = "spicy toxins" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/toxins_special/on_mob_life(mob/living/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -752,6 +791,7 @@ overdose_threshold = 40 ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS var/datum/brain_trauma/special/beepsky/beepsky_hallucination /datum/reagent/consumable/ethanol/beepsky_smash/on_mob_metabolize(mob/living/carbon/drinker) @@ -797,6 +837,7 @@ quality = DRINK_NICE taste_description = "creamy alcohol" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/manly_dorf name = "The Manly Dorf" @@ -806,6 +847,7 @@ quality = DRINK_NICE taste_description = "hair on your chest and your chin" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS var/dorf_mode = FALSE /datum/reagent/consumable/ethanol/manly_dorf/on_mob_metabolize(mob/living/drinker) @@ -834,6 +876,7 @@ quality = DRINK_VERYGOOD taste_description = "a mixture of cola and alcohol" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/moonshine name = "Moonshine" @@ -842,6 +885,7 @@ boozepwr = 95 taste_description = "bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/b52 name = "B-52" @@ -851,6 +895,7 @@ quality = DRINK_GOOD taste_description = "angry and irish" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_EASY /datum/reagent/consumable/ethanol/b52/on_mob_metabolize(mob/living/drinker) @@ -865,6 +910,7 @@ quality = DRINK_NICE taste_description = "giving up on the day" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_STIMULATED) /datum/reagent/consumable/ethanol/margarita @@ -875,6 +921,7 @@ quality = DRINK_NICE taste_description = "dry and salty" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_MEDIUM /datum/reagent/consumable/ethanol/black_russian @@ -885,6 +932,7 @@ quality = DRINK_NICE taste_description = "bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/manhattan name = "Manhattan" @@ -894,6 +942,7 @@ quality = DRINK_NICE taste_description = "mild dryness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_EASY /datum/reagent/consumable/ethanol/manhattan_proj @@ -904,6 +953,7 @@ quality = DRINK_VERYGOOD taste_description = "death, the destroyer of worlds" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -917,6 +967,7 @@ quality = DRINK_NICE taste_description = "soda" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/antifreeze name = "Anti-freeze" @@ -926,6 +977,7 @@ quality = DRINK_NICE taste_description = "Jack Frost's piss" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -939,6 +991,7 @@ quality = DRINK_VERYGOOD taste_description = "creamy berries" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/barefoot/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -956,6 +1009,7 @@ quality = DRINK_NICE taste_description = "refreshing cold" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/demonsblood name = "Demon's Blood" @@ -965,6 +1019,7 @@ quality = DRINK_VERYGOOD taste_description = "sweet tasting iron" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_STIMULATED) /datum/reagent/consumable/ethanol/demonsblood/on_mob_metabolize(mob/living/metabolizer) @@ -1002,6 +1057,7 @@ quality = DRINK_VERYGOOD taste_description = "bitter iron" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/devilskiss/on_mob_metabolize(mob/living/metabolizer) . = ..() @@ -1046,6 +1102,7 @@ quality = DRINK_NICE taste_description = "tart bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/ginfizz name = "Gin Fizz" @@ -1055,6 +1112,7 @@ quality = DRINK_GOOD taste_description = "dry, tart lemons" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/bahama_mama name = "Bahama Mama" @@ -1064,6 +1122,7 @@ quality = DRINK_GOOD taste_description = "pineapple, coconut, and a hint of coffee" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/singulo name = "Singulo" @@ -1073,6 +1132,7 @@ quality = DRINK_VERYGOOD taste_description = "concentrated matter" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_MADNESS_IMMUNE) var/static/list/ray_filter = list(type = "rays", size = 40, density = 15, color = SUPERMATTER_SINGULARITY_RAYS_COLOUR, factor = 15) @@ -1106,6 +1166,7 @@ quality = DRINK_GOOD taste_description = "hot and spice" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1119,6 +1180,7 @@ quality = DRINK_GOOD taste_description = "sweet and salty alcohol" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/mead name = "Mead" @@ -1129,6 +1191,7 @@ quality = DRINK_NICE taste_description = "sweet, sweet alcohol" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/iced_beer name = "Iced Beer" @@ -1137,6 +1200,7 @@ boozepwr = 15 taste_description = "refreshingly cold" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1149,6 +1213,7 @@ boozepwr = 1 //Basically nothing taste_description = "a poor excuse for alcohol" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/aloe name = "Aloe" @@ -1158,6 +1223,7 @@ quality = DRINK_VERYGOOD taste_description = "sweet 'n creamy" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS //somewhat annoying mix glass_price = DRINK_PRICE_MEDIUM @@ -1169,6 +1235,7 @@ quality = DRINK_GOOD taste_description = "lemons" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/alliescocktail name = "Allies Cocktail" @@ -1178,6 +1245,7 @@ quality = DRINK_NICE taste_description = "bitter yet free" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_EASY /datum/reagent/consumable/ethanol/acid_spit @@ -1188,6 +1256,7 @@ quality = DRINK_VERYGOOD taste_description = "stomach acid" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/amasec name = "Amasec" @@ -1197,6 +1266,7 @@ quality = DRINK_GOOD taste_description = "dark and metallic" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/changelingsting name = "Changeling Sting" @@ -1206,6 +1276,7 @@ quality = DRINK_GOOD taste_description = "your brain coming out your nose" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/changelingsting/on_mob_life(mob/living/carbon/target, seconds_per_tick, metabolization_ratio) . = ..() @@ -1220,6 +1291,7 @@ quality = DRINK_GOOD taste_description = "the spirit of Ireland" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/syndicatebomb name = "Syndicate Bomb" @@ -1229,6 +1301,7 @@ quality = DRINK_GOOD taste_description = "purified antagonism" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/syndicatebomb/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1243,6 +1316,7 @@ quality = DRINK_GOOD taste_description = "psychic links" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/erikasurprise name = "Erika Surprise" @@ -1252,6 +1326,7 @@ quality = DRINK_VERYGOOD taste_description = "tartness and bananas" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/driestmartini name = "Driest Martini" @@ -1262,6 +1337,7 @@ quality = DRINK_GOOD taste_description = "a beach" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/bananahonk name = "Banana Honk" @@ -1272,6 +1348,7 @@ quality = DRINK_GOOD taste_description = "a bad joke" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/bananahonk/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1290,6 +1367,7 @@ quality = DRINK_GOOD taste_description = "a pencil eraser" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1307,6 +1385,7 @@ quality = DRINK_VERYGOOD taste_description = "molasses and a mouthful of pool water" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/whiskey_sour //Requested since we had whiskey cola and soda but not sour. name = "Whiskey Sour" @@ -1324,6 +1403,7 @@ boozepwr = 25 taste_description = "the season that falls between summer and winter" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_STOCK /datum/reagent/consumable/ethanol/fetching_fizz //A reference to one of my favorite games of all time. Pulls nearby ores to the imbiber! @@ -1335,6 +1415,7 @@ metabolization_rate = 0.1 * REAGENTS_METABOLISM taste_description = "charged metal" // the same as teslium, honk honk. chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/fetching_fizz/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1352,6 +1433,7 @@ metabolization_rate = 0.4 * REAGENTS_METABOLISM taste_description = "bravado in the face of disaster" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/hearty_punch/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1371,6 +1453,7 @@ boozepwr = 300 //I warned you taste_description = "a wall of bricks" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/atomicbomb name = "Atomic Bomb" @@ -1380,6 +1463,7 @@ quality = DRINK_FANTASTIC taste_description = "da bomb" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_HIGH /datum/reagent/consumable/ethanol/atomicbomb/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) @@ -1405,6 +1489,7 @@ quality = DRINK_GOOD taste_description = "your brains smashed out by a lemon wrapped around a gold brick" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/gargle_blaster/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1430,6 +1515,7 @@ taste_description = "a numbing sensation" metabolization_rate = REAGENTS_METABOLISM chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/neurotoxin/proc/pick_paralyzed_limb() return (pick(TRAIT_PARALYSIS_L_ARM,TRAIT_PARALYSIS_R_ARM,TRAIT_PARALYSIS_R_LEG,TRAIT_PARALYSIS_L_LEG)) @@ -1477,6 +1563,7 @@ metabolization_rate = 0.2 * REAGENTS_METABOLISM taste_description = "giving peace a chance" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1519,6 +1606,7 @@ quality = DRINK_VERYGOOD taste_description = "custard and alcohol" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/dreadnog name = "Dreadnog" @@ -1529,6 +1617,7 @@ quality = DRINK_REVOLTING taste_description = "custard and alcohol" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/narsour name = "Nar'Sour" @@ -1538,6 +1627,7 @@ quality = DRINK_FANTASTIC taste_description = "bloody" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/narsour/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1551,6 +1641,7 @@ boozepwr = 30 taste_description = "a warm flowery orange taste which recalls the ocean air and summer wind of the caribbean" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/creme_de_menthe name = "Creme de Menthe" @@ -1559,6 +1650,7 @@ boozepwr = 20 taste_description = "a minty, cool, and invigorating splash of cold streamwater" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/creme_de_cacao name = "Creme de Cacao" @@ -1567,6 +1659,7 @@ boozepwr = 20 taste_description = "a slick and aromatic hint of chocolates swirling in a bite of alcohol" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/creme_de_coconut name = "Creme de Coconut" @@ -1575,6 +1668,7 @@ boozepwr = 20 taste_description = "a sweet milky flavor with notes of toasted sugar" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/quadruple_sec name = "Quadruple Sec" @@ -1584,6 +1678,7 @@ quality = DRINK_GOOD taste_description = "an invigorating bitter freshness which suffuses your being; no enemy of the station will go unrobusted this day" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/quadruple_sec/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1602,6 +1697,7 @@ quality = DRINK_FANTASTIC taste_description = "THE LAW" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/quintuple_sec/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1622,6 +1718,7 @@ quality = DRINK_GOOD taste_description = "chocolate and mint dancing around your mouth" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/stinger name = "Stinger" @@ -1631,6 +1728,7 @@ quality = DRINK_NICE taste_description = "a slap on the face in the best possible way" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/bastion_bourbon name = "Bastion Bourbon" @@ -1642,6 +1740,7 @@ metabolization_rate = 2 * REAGENTS_METABOLISM //0.4u per second ph = 4 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_HIGH /datum/reagent/consumable/ethanol/bastion_bourbon/on_mob_metabolize(mob/living/drinker) @@ -1683,6 +1782,7 @@ taste_description = "stale bread with a staler aftertaste" nutriment_factor = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/squirt_cider/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1696,6 +1796,7 @@ quality = DRINK_GOOD taste_description = "ethylic alcohol with a hint of sugar" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/sugar_rush name = "Sugar Rush" @@ -1706,6 +1807,7 @@ taste_description = "your arteries clogging with sugar" nutriment_factor = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/sugar_rush/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1719,6 +1821,7 @@ quality = DRINK_VERYGOOD taste_description = "a bitter SPIKE with a sour aftertaste" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/crevice_spike/on_mob_metabolize(mob/living/drinker) //damage only applies when drink first enters system and won't again until drink metabolizes out . = ..() @@ -1731,6 +1834,7 @@ boozepwr = 70 taste_description = "sweet rice wine" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_STOCK /datum/reagent/consumable/ethanol/peppermint_patty @@ -1741,6 +1845,7 @@ boozepwr = 25 quality = DRINK_GOOD chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/peppermint_patty/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1755,6 +1860,7 @@ quality = DRINK_GOOD taste_description = "bitter, creamy cacao" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS var/datum/weakref/mighty_shield /datum/reagent/consumable/ethanol/alexander/on_mob_metabolize(mob/living/drinker) @@ -1790,6 +1896,7 @@ quality = DRINK_VERYGOOD taste_description = "sweet, creamy cacao" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/sidecar name = "Sidecar" @@ -1799,6 +1906,7 @@ quality = DRINK_GOOD taste_description = "delicious freedom" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_MEDIUM /datum/reagent/consumable/ethanol/between_the_sheets @@ -1809,6 +1917,7 @@ quality = DRINK_GOOD taste_description = "seduction" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_MEDIUM /datum/reagent/consumable/ethanol/between_the_sheets/on_mob_life(mob/living/drinker, seconds_per_tick, metabolization_ratio) @@ -1844,6 +1953,7 @@ quality = DRINK_GOOD taste_description = "divine windiness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/mojito name = "Mojito" @@ -1853,6 +1963,7 @@ quality = DRINK_GOOD taste_description = "refreshing mint" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_MEDIUM /datum/reagent/consumable/ethanol/moscow_mule @@ -1863,6 +1974,7 @@ quality = DRINK_GOOD taste_description = "refreshing spiciness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/fernet name = "Fernet" @@ -1871,6 +1983,7 @@ boozepwr = 80 taste_description = "utter bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1888,6 +2001,7 @@ quality = DRINK_NICE taste_description = "sweet relief" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/fernet_cola/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1905,6 +2019,7 @@ quality = DRINK_NICE taste_description = "a sweet sobering mix" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_HIGH /datum/reagent/consumable/ethanol/fanciulli/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) @@ -1925,6 +2040,7 @@ quality = DRINK_GOOD taste_description = "a bitter freshness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_MEDIUM /datum/reagent/consumable/ethanol/branca_menta/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) @@ -1945,6 +2061,7 @@ quality = DRINK_GOOD taste_description = "bubbling possibility" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/blank_paper/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -2067,6 +2184,7 @@ boozepwr = 40 taste_description = "auspicious occasions and bad decisions" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_EASY /datum/reagent/consumable/ethanol/wizz_fizz @@ -2077,6 +2195,7 @@ quality = DRINK_GOOD taste_description = "friendship! It is magic, after all" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/wizz_fizz/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -2098,6 +2217,7 @@ quality = DRINK_GOOD taste_description = "the pain of ten thousand slain mosquitos" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS affected_biotype = MOB_BUG /datum/reagent/consumable/ethanol/bug_spray/on_new(data) @@ -2120,6 +2240,7 @@ boozepwr = 20 taste_description = "an honest day's work at the orchard" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/jack_rose name = "Jack Rose" @@ -2129,6 +2250,7 @@ quality = DRINK_NICE taste_description = "a sweet and sour slice of apple" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/turbo name = "Turbo" @@ -2138,6 +2260,7 @@ quality = DRINK_VERYGOOD taste_description = "the outlaw spirit" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/turbo/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -2154,6 +2277,7 @@ quality = DRINK_NICE taste_description = "simpler times" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/old_timer/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -2180,6 +2304,7 @@ quality = DRINK_GOOD taste_description = "artificial fruitiness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_SHOCKIMMUNE) /datum/reagent/consumable/ethanol/duplex @@ -2190,6 +2315,7 @@ quality = DRINK_NICE taste_description = "green apples and blue raspberries" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/trappist name = "Trappist Beer" @@ -2199,6 +2325,7 @@ quality = DRINK_VERYGOOD taste_description = "dried plums and malt" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/trappist/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -2243,6 +2370,7 @@ quality = DRINK_FANTASTIC taste_description = "fiery, with an aftertaste of burnt flesh" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/mauna_loa/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -2260,6 +2388,7 @@ quality = DRINK_NICE taste_description = "sugary tartness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_ANALGESIA) /datum/reagent/consumable/ethanol/pina_colada @@ -2299,6 +2428,7 @@ boozepwr = 85 taste_description = "your tastebuds being individually shanked" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/pruno/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -2312,6 +2442,7 @@ quality = DRINK_GOOD taste_description = "sweetness followed by a soft sourness and warmth" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/godfather name = "Godfather" @@ -2321,6 +2452,7 @@ quality = DRINK_GOOD taste_description = "a delightful softened punch" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_MEDIUM /datum/reagent/consumable/ethanol/godmother @@ -2331,6 +2463,7 @@ quality = DRINK_GOOD taste_description = "sweetness and a zesty twist" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/kortara name = "Kortara" @@ -2340,6 +2473,7 @@ quality = DRINK_GOOD taste_description = "sweet nectar" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/kortara/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -2355,6 +2489,7 @@ quality = DRINK_VERYGOOD taste_description = "mint choc chip" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/sea_breeze/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -2368,6 +2503,7 @@ quality = DRINK_GOOD taste_description = "strikes and gutters" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/drunken_espatier name = "Drunken Espatier" @@ -2377,6 +2513,7 @@ quality = DRINK_GOOD taste_description = "sorrow" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/drunken_espatier/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -2399,6 +2536,7 @@ taste_description = "regret" nutriment_factor = 3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/protein_blend/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -2416,6 +2554,7 @@ quality = DRINK_VERYGOOD taste_description = "sweet 'shrooms" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/triumphal_arch name = "Triumphal Arch" @@ -2425,6 +2564,7 @@ quality = DRINK_FANTASTIC taste_description = "victory" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/triumphal_arch/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -2439,6 +2579,7 @@ quality = DRINK_GOOD taste_description = "like, the future, man" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS var/datum/brain_trauma/special/bluespace_prophet/prophet_trauma /datum/reagent/consumable/ethanol/the_juice/on_mob_metabolize(mob/living/carbon/drinker) @@ -2483,6 +2624,7 @@ quality = DRINK_NICE taste_description = "blue orange" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/navy_rum //IN THE NAVY name = "Navy Rum" @@ -2492,6 +2634,7 @@ quality = DRINK_NICE taste_description = "a life on the waves" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/bitters //why do they call them bitters, anyway? they're more spicy than anything else name = "Andromeda Bitters" @@ -2501,6 +2644,7 @@ quality = DRINK_NICE taste_description = "spiced alcohol" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/admiralty //navy rum, vermouth, fernet name = "Admiralty" @@ -2510,6 +2654,7 @@ quality = DRINK_VERYGOOD taste_description = "haughty arrogance" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/long_haul //Rum, Curacao, Sugar, dash of bitters, lengthened with soda water name = "Long Haul" @@ -2519,6 +2664,7 @@ quality = DRINK_VERYGOOD taste_description = "companionship" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/long_john_silver //navy rum, bitters, lemonade name = "Long John Silver" @@ -2528,6 +2674,7 @@ quality = DRINK_VERYGOOD taste_description = "rum and spices" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/tropical_storm //dark rum, pineapple juice, triple citrus, curacao name = "Tropical Storm" @@ -2537,6 +2684,7 @@ quality = DRINK_VERYGOOD taste_description = "the tropics" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/dark_and_stormy //rum and ginger beer- simple and classic name = "Dark and Stormy" @@ -2546,6 +2694,7 @@ quality = DRINK_GOOD taste_description = "ginger and rum" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/salt_and_swell //navy rum, tochtause syrup, egg whites, dash of saline-glucose solution name = "Salt and Swell" @@ -2555,6 +2704,7 @@ quality = DRINK_FANTASTIC taste_description = "salt and spice" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/tiltaellen //yoghurt, salt, vinegar name = "Tiltällen" @@ -2564,6 +2714,7 @@ quality = DRINK_NICE taste_description = "sour cheesy yoghurt" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/tich_toch name = "Tich Toch" @@ -2573,6 +2724,7 @@ quality = DRINK_VERYGOOD taste_description = "spicy sour cheesy yoghurt" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/helianthus name = "Helianthus" @@ -2582,6 +2734,7 @@ quality = DRINK_VERYGOOD taste_description = "golden memories" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS var/hal_amt = 4 var/hal_cap = 24 @@ -2598,6 +2751,7 @@ boozepwr = 20 taste_description = "a poet's love and undoing" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_STOCK /datum/reagent/consumable/ethanol/the_hat @@ -2608,6 +2762,7 @@ quality = DRINK_NICE taste_description = "something perfumy" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_STOCK /datum/reagent/consumable/ethanol/gin_garden @@ -2618,6 +2773,7 @@ quality = DRINK_VERYGOOD taste_description = "light gin with sweet ginger and cucumber" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_MEDIUM /datum/reagent/consumable/ethanol/gin_garden/on_mob_life(mob/living/carbon/doll, seconds_per_tick, metabolization_ratio) @@ -2631,6 +2787,7 @@ color = "#FFAA00" taste_description = "static with a hint of sweetness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/wine_voltaic/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) //can't be on life because of the way blood works. . = ..() @@ -2650,6 +2807,7 @@ quality = DRINK_NICE taste_description = "the howling storm" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_SHOCKIMMUNE) /datum/reagent/consumable/ethanol/telepole/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) //can't be on life because of the way blood works. @@ -2670,6 +2828,7 @@ quality = DRINK_FANTASTIC taste_description = "victory, with a hint of insanity" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/pod_tesla/on_mob_metabolize(mob/living/affected_mob) . = ..() @@ -2698,6 +2857,7 @@ quality = DRINK_NICE taste_description = "mild carbonated malt" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/shochu name = "Shochu" @@ -2707,6 +2867,7 @@ quality = DRINK_NICE taste_description = "stiff rice wine" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/yuyake name = "Yūyake" @@ -2716,6 +2877,7 @@ quality = DRINK_NICE taste_description = "sweet melon" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/coconut_rum name = "Coconut Rum" @@ -2725,6 +2887,7 @@ quality = DRINK_NICE taste_description = "coconut rum" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS // Mixed Martian Drinks /datum/reagent/consumable/ethanol/yuyakita @@ -2735,6 +2898,7 @@ quality = DRINK_NICE taste_description = "death" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/saibasan name = "Saibāsan" @@ -2744,6 +2908,7 @@ quality = DRINK_FANTASTIC taste_description = "betrayal" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/banzai_ti name = "Banzai-Tī" @@ -2753,6 +2918,7 @@ quality = DRINK_VERYGOOD taste_description = "an asian twist on the liquor cabinet" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/sanraizusoda name = "Sanraizusōda" @@ -2762,6 +2928,7 @@ quality = DRINK_GOOD taste_description = "creamy melon soda" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/kumicho name = "Kumichō" @@ -2771,6 +2938,7 @@ quality = DRINK_VERYGOOD taste_description = "rice and rye" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/red_planet name = "Red Planet" @@ -2780,6 +2948,7 @@ quality = DRINK_VERYGOOD taste_description = "the spirit of freedom" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/amaterasu name = "Amaterasu" @@ -2789,6 +2958,7 @@ quality = DRINK_VERYGOOD taste_description = "sweet nectar of the gods" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/nekomimosa name = "Nekomimosa" @@ -2798,6 +2968,7 @@ quality = DRINK_GOOD taste_description = "MELON" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/sentai_quencha //melon soda, triple citrus, shochu, blue curacao name = "Sentai Quencha" @@ -2807,6 +2978,7 @@ quality = DRINK_GOOD taste_description = "ultimate ninja power" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/bosozoku name = "Bōsōzoku" @@ -2816,6 +2988,7 @@ quality = DRINK_GOOD taste_description = "bittersweet lemon" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/ersatzche name = "Ersatzche" @@ -2825,6 +2998,7 @@ quality = DRINK_VERYGOOD taste_description = "spicy pineapple beer" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/red_city_am name = "Red City AM" @@ -2834,6 +3008,7 @@ quality = DRINK_NICE taste_description = "breakfast in a glass" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/kings_ransom name = "King's Ransom" @@ -2843,6 +3018,7 @@ quality = DRINK_VERYGOOD taste_description = "bitter raspberry" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/four_bit name = "Four Bit" @@ -2852,6 +3028,7 @@ quality = DRINK_GOOD taste_description = "cyberspace" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/white_hawaiian //coconut milk, coconut rum, coffee liqueur name = "White Hawaiian" @@ -2861,6 +3038,7 @@ quality = DRINK_GOOD taste_description = "COCONUT" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/maui_sunrise //coconut rum, pineapple juice, yuyake, triple citrus, lemon-lime soda name = "Maui Sunrise" @@ -2870,6 +3048,7 @@ quality = DRINK_VERYGOOD taste_description = "sunrise over the pacific" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/imperial_mai_tai //navy rum, rum, lime, triple sec, korta nectar name = "Imperial Mai Tai" @@ -2879,6 +3058,7 @@ quality = DRINK_VERYGOOD taste_description = "spicy nutty rum" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/konococo_rumtini //todo: add espresso | coffee, coffee liqueur, coconut rum, sugar name = "Konococo Rumtini" @@ -2888,6 +3068,7 @@ quality = DRINK_VERYGOOD taste_description = "coconut coffee" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_STIMULATED) /datum/reagent/consumable/ethanol/blue_hawaiian //pineapple juice, lemon juice, coconut rum, blue curacao @@ -2898,6 +3079,7 @@ quality = DRINK_VERYGOOD taste_description = "the aloha state" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/boston_sour name = "Boston Sour" @@ -2907,6 +3089,7 @@ quality = DRINK_VERYGOOD taste_description = "foamy lemony sourness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/star name = "Star" @@ -2916,6 +3099,7 @@ quality = DRINK_GOOD taste_description = "vinous apples" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/old_fashioned name = "Old Fashioned" @@ -2925,6 +3109,7 @@ quality = DRINK_GOOD taste_description = "rounded out whiskey" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_EASY /datum/reagent/consumable/ethanol/sazerac @@ -2935,6 +3120,7 @@ quality = DRINK_GOOD taste_description = "flowery anise-scented whiskey" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/amaretto_sour name = "Amaretto Sour" @@ -2944,6 +3130,7 @@ quality = DRINK_VERYGOOD taste_description = "foamy lemony sweetness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_MEDIUM /datum/reagent/consumable/ethanol/ramos_gin_fizz @@ -2954,6 +3141,7 @@ quality = DRINK_FANTASTIC taste_description = "creamy fluffy citrusy gin" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/french_75 name = "French 75" @@ -2963,6 +3151,7 @@ quality = DRINK_GOOD taste_description = "glory and gunnery" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_MEDIUM /datum/reagent/consumable/ethanol/sangria @@ -2973,6 +3162,7 @@ quality = DRINK_GOOD taste_description = "refreshing fruity wine" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/suffering_bastard name = "Suffering Bastard" @@ -2982,6 +3172,7 @@ quality = DRINK_VERYGOOD taste_description = "ginger-flavored recuperation" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/suffering_bastard/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -2998,6 +3189,7 @@ quality = DRINK_NICE taste_description = "scorched sweet whiskey" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/blue_blazer/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -3011,6 +3203,7 @@ quality = DRINK_GOOD taste_description = "the warmth of a comfy fireplace" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_MEDIUM /datum/reagent/consumable/ethanol/hot_toddy/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -3025,6 +3218,7 @@ quality = DRINK_VERYGOOD taste_description = "sweetened and spiced bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/daiquiri name = "Daiquiri" @@ -3034,6 +3228,7 @@ quality = DRINK_NICE taste_description = "crisp lime" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/flip_cocktail name = "Flip Cocktail" @@ -3043,6 +3238,7 @@ quality = DRINK_GOOD taste_description = "creamy brandy and nutmeg" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/flip_cocktail/on_mob_metabolize(mob/living/drinker) . = ..() diff --git a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm index fb7854944bc..8dfd8ac2709 100644 --- a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm @@ -5,6 +5,7 @@ taste_description = "oranges" ph = 3.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice /datum/reagent/consumable/orangejuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -19,6 +20,7 @@ color = "#731008" // rgb: 115, 16, 8 taste_description = "tomatoes" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice /datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -34,6 +36,7 @@ taste_description = "unbearable sourness" ph = 2.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice /datum/reagent/consumable/limejuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -48,6 +51,7 @@ color = "#973800" // rgb: 151, 56, 0 taste_description = "carrots" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/carrotjuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -69,6 +73,7 @@ color = "#863333" // rgb: 134, 51, 51 taste_description = "berries" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/applejuice name = "Apple Juice" @@ -83,6 +88,7 @@ color = "#792b49" // rgb: 121, 43, 73 taste_description = "berries" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -95,6 +101,7 @@ color = "#af5e5e" // rgb: 175, 94, 94 taste_description = "juicy watermelon" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/lemonjuice name = "Lemon Juice" @@ -103,6 +110,7 @@ taste_description = "sourness" ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/lemonjuice /datum/reagent/consumable/banana @@ -111,6 +119,7 @@ color = "#FFFCB9" // rgb: 255, 252, 185 taste_description = "banana" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/banana/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -124,6 +133,7 @@ description = "Absolutely nothing." taste_description = "nothing" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/glass_style/shot_glass/nothing required_drink_type = /datum/reagent/consumable/nothing @@ -143,6 +153,7 @@ color = "#FF4DD2" taste_description = "laughter" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/laughter/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tic, metabolization_ratio) . = ..() @@ -156,6 +167,7 @@ color = "#FF4DD2" taste_description = "laughter" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/superlaughter/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -171,6 +183,7 @@ color = "#E8A856" // rgb: 234, 157, 58 taste_description = "irish sadness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/pickle name = "Pickle Juice" @@ -179,6 +192,7 @@ color = "#cde65e" // rgb: 205, 230, 94 taste_description = "vinegar brine" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/pickle/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -193,6 +207,7 @@ color = "#290029" // dark purple taste_description = "grape soda" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/plumjuice name = "Plum Juice" @@ -200,6 +215,7 @@ color = "#b6062c" taste_description = "plums" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/milk name = "Milk" @@ -208,6 +224,7 @@ taste_description = "milk" ph = 6.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/milk // Milk is good for humans, but bad for plants. @@ -239,6 +256,7 @@ color = "#DFDFC7" // rgb: 223, 223, 199 taste_description = "soy milk" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/soymilk /datum/reagent/consumable/soymilk/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -253,6 +271,7 @@ color = "#DFD7AF" // rgb: 223, 215, 175 taste_description = "creamy milk" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/cream /datum/reagent/consumable/cream/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -268,6 +287,7 @@ overdose_threshold = 80 taste_description = "bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_STOCK metabolized_traits = list(TRAIT_STIMULATED) @@ -292,6 +312,7 @@ nutriment_factor = 0 taste_description = "tart black tea" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_STOCK default_container = /obj/item/reagent_containers/cup/glass/mug/tea metabolized_traits = list(TRAIT_STIMULATED) @@ -344,6 +365,7 @@ quality = DRINK_NICE taste_description = "sunshine and summertime" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_EASY /datum/reagent/consumable/tea/arnold_palmer @@ -354,6 +376,7 @@ nutriment_factor = 10 taste_description = "bitter tea" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/tea/arnold_palmer/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -368,6 +391,7 @@ overdose_threshold = 80 taste_description = "bitter coldness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_STIMULATED) /datum/reagent/consumable/icecoffee/overdose_process(mob/living/affected_mob, seconds_per_tick, metabolization_ratio) @@ -389,6 +413,7 @@ overdose_threshold = 80 taste_description = "bitter coldness and a hint of smoke" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_STIMULATED) /datum/reagent/consumable/hot_ice_coffee/overdose_process(mob/living/affected_mob, seconds_per_tick, metabolization_ratio) @@ -411,6 +436,7 @@ nutriment_factor = 0 taste_description = "sweet tea" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_STIMULATED) /datum/reagent/consumable/icetea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -429,6 +455,7 @@ color = "#100800" // rgb: 16, 8, 0 taste_description = "cola" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/space_cola/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -442,6 +469,7 @@ quality = DRINK_GOOD taste_description = "fruity overlysweet cola" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/roy_rogers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) affected_mob.set_jitter_if_lower(6 SECONDS * metabolization_ratio * seconds_per_tick) @@ -456,6 +484,7 @@ quality = DRINK_VERYGOOD taste_description = "the future" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/nuka_cola/on_mob_metabolize(mob/living/affected_mob) . = ..() @@ -485,6 +514,7 @@ metabolization_rate = 2 * REAGENTS_METABOLISM taste_description = "a monstrous sugar rush" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /// If we activated the effect var/effect_enabled = FALSE @@ -516,6 +546,7 @@ quality = DRINK_VERYGOOD taste_description = "carbonated oil" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_SHOCKIMMUNE) /datum/reagent/consumable/grey_bull/on_mob_metabolize(mob/living/carbon/affected_atom) @@ -539,6 +570,7 @@ color = "#102000" // rgb: 16, 32, 0 taste_description = "sweet citrus soda" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_STIMULATED) /datum/reagent/consumable/spacemountainwind/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -554,6 +586,7 @@ color = "#102000" // rgb: 16, 32, 0 taste_description = "cherry soda" // FALSE ADVERTISING chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/dr_gibb/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -566,6 +599,7 @@ color = COLOR_VIBRANT_LIME // rgb: 0, 255, 0 taste_description = "cherry soda" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/space_up/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -577,6 +611,7 @@ color = "#8CFF00" // rgb: 135, 255, 0 taste_description = "tangy lime and lemon soda" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/lemon_lime/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -588,6 +623,7 @@ color = "#9385bf" // rgb: 58, 52, 75 taste_description = "sweet and salty tang" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/pwr_game/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) . = ..() @@ -608,6 +644,7 @@ color = "#f00060" // rgb: 94, 0, 38 taste_description = "carbonated metallic soda" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/shamblers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -619,6 +656,7 @@ color = "#619494" // rgb: 97, 148, 148 taste_description = "carbonated water" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS // A variety of nutrients are dissolved in club soda, without sugar. // These nutrients include carbon, oxygen, hydrogen, phosphorous, potassium, sulfur and sodium, all of which are needed for healthy plant growth. @@ -638,6 +676,7 @@ color = "#0064C8" // rgb: 0, 100, 200 taste_description = "tart and fresh" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/tonic/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -652,6 +691,7 @@ color = "#762399" // rgb: 118, 35, 153 taste_description = "grapes and the fresh open sea" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/wellcheers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -674,6 +714,7 @@ overdose_threshold = 60 taste_description = "barbecue and nostalgia" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_STIMULATED) /datum/reagent/consumable/monkey_energy/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -704,6 +745,7 @@ color = "#619494" // rgb: 97, 148, 148 taste_description = "ice" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/cup/glass/ice /datum/reagent/consumable/ice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -719,6 +761,7 @@ quality = DRINK_NICE taste_description = "creamy coffee" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_EASY metabolized_traits = list(TRAIT_STIMULATED) @@ -746,6 +789,7 @@ quality = DRINK_NICE taste_description = "bitter cream" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_EASY metabolized_traits = list(TRAIT_STIMULATED) @@ -772,6 +816,7 @@ quality = DRINK_VERYGOOD taste_description = "homely fruit" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -795,6 +840,7 @@ quality = DRINK_VERYGOOD taste_description = "sweet tangy fruit" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/cinderella/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -808,6 +854,7 @@ nutriment_factor = 8 taste_description = "creamy tart cherry" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_MEDIUM /datum/reagent/consumable/bluecherryshake @@ -818,6 +865,7 @@ nutriment_factor = 8 taste_description = "creamy blue cherry" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/vanillashake name = "Vanilla Shake" @@ -827,6 +875,7 @@ nutriment_factor = 8 taste_description = "sweet creamy vanilla" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_MEDIUM /datum/reagent/consumable/caramelshake @@ -837,6 +886,7 @@ nutriment_factor = 10 taste_description = "sweet rich creamy caramel" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_MEDIUM /datum/reagent/consumable/choccyshake @@ -847,6 +897,7 @@ nutriment_factor = 8 taste_description = "sweet creamy chocolate" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_MEDIUM /datum/reagent/consumable/strawberryshake @@ -857,6 +908,7 @@ nutriment_factor = 8 taste_description = "sweet strawberries and milk" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_MEDIUM /datum/reagent/consumable/bananashake @@ -867,6 +919,7 @@ nutriment_factor = 8 taste_description = "thick banana" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_MEDIUM /datum/reagent/consumable/pumpkin_latte @@ -878,6 +931,7 @@ nutriment_factor = 3 taste_description = "creamy pumpkin" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_STIMULATED) /datum/reagent/consumable/pumpkin_latte/overdose_process(mob/living/affected_mob, seconds_per_tick, metabolization_ratio) @@ -904,6 +958,7 @@ nutriment_factor = 3 taste_description = "creamy cherry" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/pumpkinjuice name = "Pumpkin Juice" @@ -911,6 +966,7 @@ color = "#FFA500" taste_description = "pumpkin" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/blumpkinjuice name = "Blumpkin Juice" @@ -918,6 +974,7 @@ color = "#00BFFF" taste_description = "a mouthful of pool water" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/triple_citrus name = "Triple Citrus" @@ -926,6 +983,7 @@ quality = DRINK_NICE taste_description = "extreme bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/grape_soda name = "Grape Soda" @@ -933,6 +991,7 @@ color = "#E6CDFF" taste_description = "grape soda" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/grape_soda/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -945,6 +1004,7 @@ quality = DRINK_NICE taste_description = "chocolate milk" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/hot_coco name = "Hot Coco" @@ -953,6 +1013,7 @@ color = "#3b240e" // rgb: 59, 36, 14 taste_description = "creamy chocolate" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/hot_coco/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) affected_mob.adjust_bodytemperature(2.5 * metabolization_ratio * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal()) @@ -971,6 +1032,7 @@ quality = DRINK_VERYGOOD taste_description = "thick creamy chocolate" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/italian_coco/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -982,6 +1044,7 @@ color = "#80AF9C" taste_description = "mint" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/menthol /datum/reagent/consumable/menthol/on_mob_life(mob/living/affected_mob, seconds_per_tick, metabolization_ratio) @@ -994,6 +1057,7 @@ color = "#EA1D26" taste_description = "sweet pomegranates" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/grenadine/on_mob_metabolize(mob/living/drinker) . = ..() @@ -1013,6 +1077,7 @@ color = "#FFA500" taste_description = "parsnip" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/pineapplejuice name = "Pineapple Juice" @@ -1020,6 +1085,7 @@ color = "#F7D435" taste_description = "pineapple" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice /datum/reagent/consumable/peachjuice //Intended to be extremely rare due to being the limiting ingredients in the blazaam drink @@ -1028,6 +1094,7 @@ color = "#E78108" taste_description = "peaches" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/cream_soda name = "Cream Soda" @@ -1036,6 +1103,7 @@ quality = DRINK_VERYGOOD taste_description = "fizzy vanilla" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/cream_soda/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1048,6 +1116,7 @@ quality = DRINK_NICE taste_description = "sweet ginger spice" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/sol_dry/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1060,6 +1129,7 @@ quality = DRINK_GOOD taste_description = "sweet cherry syrup and ginger spice" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/shirley_temple/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) affected_mob.adjust_disgust(-1.5 * metabolization_ratio * seconds_per_tick) @@ -1072,6 +1142,7 @@ quality = DRINK_GOOD taste_description = "wonder" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS var/current_size = RESIZE_DEFAULT_SIZE /datum/reagent/consumable/red_queen/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -1097,6 +1168,7 @@ description = "Exotic! You feel like you are on vacation already." taste_description = "succulent bungo" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/prunomix name = "Pruno Mixture" @@ -1104,6 +1176,7 @@ description = "Fruit, sugar, yeast, and water pulped together into a pungent slurry." taste_description = "garbage" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/aloejuice name = "Aloe Juice" @@ -1111,6 +1184,7 @@ description = "A healthy and refreshing juice." taste_description = "vegetable" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/aloejuice/on_mob_life(mob/living/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1125,6 +1199,7 @@ quality = DRINK_VERYGOOD taste_description = "cool refreshing watermelon" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/agua_fresca/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1140,6 +1215,7 @@ nutriment_factor = 0 taste_description = "mushrooms" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/mushroom_tea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1155,6 +1231,7 @@ nutriment_factor = 0 taste_description = "fiery itchy pain" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/toechtauese_syrup name = "Töchtaüse Syrup" @@ -1163,6 +1240,7 @@ nutriment_factor = 0 taste_description = "sugar, spice, and nothing nice" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/strawberry_banana name = "Strawberry Banana Smoothie" @@ -1171,6 +1249,7 @@ nutriment_factor = 0 taste_description = "strawberry and banana" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/berry_blast name = "Berry Blast Smoothie" @@ -1179,6 +1258,7 @@ nutriment_factor = 0 taste_description = "mixed berry" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/funky_monkey name = "Funky Monkey Smoothie" @@ -1187,6 +1267,7 @@ nutriment_factor = 0 taste_description = "chocolate and banana" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/green_giant name = "Green Giant Smoothie" @@ -1195,6 +1276,7 @@ nutriment_factor = 0 taste_description = "green, just green" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/melon_baller name = "Melon Baller Smoothie" @@ -1203,6 +1285,7 @@ nutriment_factor = 0 taste_description = "fresh melon" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/vanilla_dream name = "Vanilla Dream Smoothie" @@ -1211,6 +1294,7 @@ nutriment_factor = 0 taste_description = "creamy vanilla" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/cucumberjuice name = "Cucumber Juice" @@ -1218,6 +1302,7 @@ color = "#B1D861" // rgb: 177, 216, 97 taste_description = "light cucumber" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/cucumberlemonade name = "Cucumber Lemonade" @@ -1226,6 +1311,7 @@ quality = DRINK_GOOD taste_description = "citrus soda with cucumber" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_HIGH /datum/reagent/consumable/cucumberlemonade/on_mob_life(mob/living/carbon/doll, seconds_per_tick, metabolization_ratio) @@ -1241,6 +1327,7 @@ color = "#d4422f" // rgb: 212,66,47 taste_description = "sludge seeping down your throat" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/mississippi_queen/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -1259,6 +1346,7 @@ color = "#583d09" // rgb: 88, 61, 9 taste_description = "one of your 26 favorite letters" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_STIMULATED) /datum/reagent/consumable/t_letter/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -1278,6 +1366,7 @@ color = "#c4b000" taste_description = "bubbly yerba mate" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/coconut_milk name = "Coconut Milk" @@ -1285,6 +1374,7 @@ color = "#DFDFDF" taste_description = "milky coconut" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/melon_soda name = "Melon Soda" @@ -1292,6 +1382,7 @@ color = "#6FEB48" taste_description = "fizzy melon" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/volt_energy name = "24-Volt Energy" @@ -1299,6 +1390,7 @@ color = "#99E550" taste_description = "sour pear" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_STIMULATED) /datum/reagent/consumable/volt_energy/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) @@ -1318,6 +1410,7 @@ color = "#f7b2e3" taste_description = "dangerously sweet fruit" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS quality = DRINK_VERYGOOD /datum/reagent/consumable/fruit_punch/on_mob_life(mob/living/affected_mob, seconds_per_tick, metabolization_ratio) @@ -1378,6 +1471,7 @@ quality = DRINK_NICE taste_description = "mild aromatics" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/ethanol/bitters_soda/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1391,6 +1485,7 @@ taste_description = "purple and a hint of opioid." addiction_types = list(/datum/addiction/opioids = 200) chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolization_rate = 0.5 * REAGENTS_METABOLISM /datum/reagent/consumable/lean/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 4d1b4a855dc..a425d5e86ab 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -16,6 +16,7 @@ overdose_threshold = 30 ph = 9 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/hallucinogens = 60) /datum/reagent/drug/space_drugs/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -44,6 +45,7 @@ overdose_threshold = INFINITY ph = 6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolization_rate = 0.125 * REAGENTS_METABOLISM /datum/reagent/drug/cannabis/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -72,6 +74,7 @@ metabolization_rate = 0.125 * REAGENTS_METABOLISM ph = 8 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/nicotine = 10) //Nicotine is used as a pesticide IRL. @@ -105,6 +108,7 @@ overdose_threshold = 20 ph = 9 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS inverse_chem_val = 0.3 inverse_chem = /datum/reagent/inverse/krokodil addiction_types = list(/datum/addiction/opioids = 30) @@ -147,6 +151,7 @@ metabolization_rate = 0.75 * REAGENTS_METABOLISM ph = 5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/stimulants = 75) metabolized_traits = list(TRAIT_STIMULATED) @@ -216,6 +221,7 @@ addiction_types = list(/datum/addiction/stimulants = 25) ph = 8.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_STUNIMMUNE, TRAIT_SLEEPIMMUNE, TRAIT_ANALGESIA, TRAIT_STIMULATED) var/datum/brain_trauma/special/psychotic_brawling/bath_salts/rage @@ -263,6 +269,7 @@ description = "Amps you up, gets you going, and rapidly restores stamina damage. Side effects include breathlessness and toxicity." color = "#78FFF0" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS inverse_chem_val = 0.5 inverse_chem = /datum/reagent/inverse/aranesp addiction_types = list(/datum/addiction/stimulants = 75) @@ -288,6 +295,7 @@ color = "#EE35FF" overdose_threshold = 20 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS taste_description = "paint thinner" inverse_chem_val = 0.4 inverse_chem = /datum/reagent/inverse/happiness @@ -334,6 +342,7 @@ metabolization_rate = 2 * REAGENTS_METABOLISM overdose_threshold = 30 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/stimulants = 400) metabolized_traits = list(TRAIT_BATON_RESISTANCE, TRAIT_ANALGESIA, TRAIT_STIMULATED) @@ -398,6 +407,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM overdose_threshold = 15 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/maintenance_drugs = 50) /datum/reagent/drug/maint/powder/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -425,6 +435,7 @@ metabolization_rate = 2 * REAGENTS_METABOLISM overdose_threshold = 25 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/maintenance_drugs = 300) metabolized_traits = list(TRAIT_HARDLY_WOUNDED, TRAIT_ANALGESIA) @@ -453,6 +464,7 @@ color = COLOR_BLACK overdose_threshold = 30 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/maintenance_drugs = 120) /datum/reagent/drug/maint/tar/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -478,6 +490,7 @@ ph = 11 overdose_threshold = 30 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/hallucinogens = 20) /datum/reagent/drug/mushroomhallucinogen/on_mob_life(mob/living/carbon/psychonaut, seconds_per_tick, metabolization_ratio) @@ -560,6 +573,7 @@ ph = 5 overdose_threshold = 30 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/hallucinogens = 40) metabolized_traits = list(TRAIT_STIMULATED) ///How many flips have we done so far? @@ -685,6 +699,7 @@ overdose_threshold = 25 ph = 10 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/maintenance_drugs = 30) /datum/reagent/drug/saturnx/on_mob_life(mob/living/carbon/invisible_man, seconds_per_tick, metabolization_ratio) @@ -793,6 +808,7 @@ If you have at over 25u in your body you restore more than 20 stamina per cycle, overdose_threshold = 20 metabolization_rate = 0.75 * REAGENTS_METABOLISM chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/stimulants = 50) metabolized_traits = list(TRAIT_STIMULATED) @@ -907,6 +923,7 @@ If you have at over 25u in your body you restore more than 20 stamina per cycle, ph = 7 overdose_threshold = 10 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/hallucinogens = 50) /// Track the active hallucination we're giving out so we don't replace it by accident VAR_PRIVATE/datum/weakref/active_hallucination_weakref diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index ac9a7b2f2d9..bca5b24a61e 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -64,6 +64,7 @@ nutriment_factor = 15 color = "#664330" // rgb: 102, 67, 48 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /// Whether this reagent should get the tastes of food it's in applied onto it var/carry_food_tastes = TRUE @@ -129,6 +130,7 @@ description = "All the best vitamins, minerals, and carbohydrates the body needs in pure form." taste_description = "bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS brute_heal = 1 burn_heal = 1 @@ -145,6 +147,7 @@ brute_heal = 0.8 //Rewards the player for eating a balanced diet. nutriment_factor = 9 //45% as calorie dense as oil. chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/protein /datum/reagent/consumable/nutriment/fat @@ -156,6 +159,7 @@ burn_heal = 1 nutriment_factor = 18 // Twice as nutritious compared to protein and carbohydrates chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS var/fry_temperature = 450 //Around ~350 F (117 C) which deep fryers operate around in the real world /datum/reagent/consumable/nutriment/fat/expose_obj(obj/exposed_obj, reac_volume, methods=TOUCH, show_message=TRUE) @@ -220,6 +224,7 @@ metabolization_rate = 10 * REAGENTS_METABOLISM penetrates_skin = NONE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/vegetable_oil /datum/reagent/consumable/nutriment/fat/oil/olive @@ -242,6 +247,7 @@ description = "Natural tissues that make up the bulk of organs, providing many vitamins and minerals." taste_description = "rich earthy pungent" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/nutriment/organ_tissue/stomach_lining name = "Stomach Lining" @@ -254,6 +260,7 @@ taste_description = "cloth" nutriment_factor = 30 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS brute_heal = 0 burn_heal = 0 ///Amount of satiety that will be drained when the cloth_fibers is fully metabolized @@ -300,6 +307,7 @@ overdose_threshold = 120 // Hyperglycaemic shock taste_description = "sweetness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/sugar // Plants should not have sugar, they can't use it and it prevents them getting water/ nutients, it is good for mold though... @@ -328,6 +336,7 @@ color = "#899613" // rgb: 137, 150, 19 taste_description = "watery milk" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS // Compost for EVERYTHING /datum/reagent/consumable/virus_food/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) @@ -340,6 +349,7 @@ color = "#792300" // rgb: 121, 35, 0 taste_description = "umami" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/soysauce /datum/reagent/consumable/ketchup @@ -349,6 +359,7 @@ color = "#731008" // rgb: 115, 16, 8 taste_description = "ketchup" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/ketchup /datum/reagent/consumable/mustard @@ -358,6 +369,7 @@ color = "#ffd129" taste_description = "mustard" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/mustard /datum/reagent/consumable/capsaicin @@ -367,6 +379,7 @@ taste_description = "hot peppers" taste_mult = 1.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/capsaicin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -391,6 +404,7 @@ taste_description = "mint" ph = 13 //HMM! I wonder chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS ///40 joules per unit. specific_heat = 40 default_container = /obj/item/reagent_containers/cup/bottle/frostoil @@ -438,6 +452,7 @@ penetrates_skin = NONE ph = 7.4 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/cup/bottle/capsaicin /datum/reagent/consumable/condensedcapsaicin/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) @@ -484,6 +499,7 @@ taste_description = "salt" penetrates_skin = NONE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/saltshaker /datum/reagent/consumable/salt/expose_turf(turf/exposed_turf, reac_volume) //Creates an umbra-blocking salt pile @@ -533,6 +549,7 @@ // no color (ie, black) taste_description = "pepper" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/peppermill /datum/reagent/consumable/coco @@ -542,6 +559,7 @@ color = "#302000" // rgb: 48, 32, 0 taste_description = "bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/garlic //NOTE: having garlic in your blood stops vampires from biting you. name = "Garlic Juice" @@ -550,6 +568,7 @@ taste_description = "garlic" metabolization_rate = 0.15 * REAGENTS_METABOLISM chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS added_traits = list(TRAIT_GARLIC_BREATH) /datum/reagent/consumable/garlic/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -595,6 +614,7 @@ color = COLOR_MAGENTA // rgb: 255, 0, 255 taste_description = "childhood whimsy" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/sprinkles/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -609,6 +629,7 @@ color = "#365E30" // rgb: 54, 94, 48 taste_description = "sweetness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/enzyme /datum/reagent/consumable/dry_ramen @@ -617,6 +638,7 @@ color = "#302000" // rgb: 48, 32, 0 taste_description = "dry and cheap noodles" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/cup/glass/dry_ramen /datum/reagent/consumable/hot_ramen @@ -626,6 +648,7 @@ color = "#302000" // rgb: 48, 32, 0 taste_description = "wet and cheap noodles" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/cup/glass/dry_ramen /datum/reagent/consumable/nutraslop @@ -635,6 +658,7 @@ color = "#3E4A00" // rgb: 62, 74, 0 taste_description = "your imprisonment" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -647,6 +671,7 @@ color = "#302000" // rgb: 48, 32, 0 taste_description = "wet and cheap noodles on fire" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/hell_ramen/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -658,6 +683,7 @@ color = COLOR_WHITE // rgb: 0, 0, 0 taste_description = "chalky wheat" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_AFFECTS_WOUNDS + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/flour /datum/reagent/consumable/flour/expose_mob(mob/living/exposed_mob, methods, reac_volume) @@ -707,6 +733,7 @@ color = "#801E28" // rgb: 128, 30, 40 taste_description = "cherry" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/cherryjelly /datum/reagent/consumable/bluecherryjelly @@ -722,6 +749,7 @@ color = COLOR_WHITE // rgb: 0, 0, 0 taste_description = "rice" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/rice /datum/reagent/consumable/rice_flour @@ -730,6 +758,7 @@ color = COLOR_WHITE // rgb: 0, 0, 0 taste_description = "chalky wheat with rice" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/vanilla name = "Vanilla Powder" @@ -739,6 +768,7 @@ color = "#FFFACD" taste_description = "vanilla" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/eggyolk name = "Egg Yolk" @@ -747,6 +777,7 @@ color = "#FFB500" taste_description = "egg" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/eggwhite name = "Egg White" @@ -755,6 +786,7 @@ color = "#fffdf7" taste_description = "bland egg" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/corn_starch name = "Corn Starch" @@ -762,6 +794,7 @@ color = "#DBCE95" taste_description = "slime" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_AFFECTS_WOUNDS + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS // Starch has similar absorbing properties to flour (Stronger here because it's rarer) /datum/reagent/consumable/corn_starch/expose_mob(mob/living/exposed_mob, methods, reac_volume) @@ -802,6 +835,7 @@ metabolization_rate = 3 * REAGENTS_METABOLISM taste_description = "sweet slime" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -814,6 +848,7 @@ nutriment_factor = 15 taste_description = "sweetness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/honey // On the other hand, honey has been known to carry pollen with it rarely. Can be used to take in a lot of plant qualities all at once, or harm the plant. @@ -851,6 +886,7 @@ color = "#DFDFDF" taste_description = "mayonnaise" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/mayonnaise /datum/reagent/consumable/mold // yeah, ok, togopal, I guess you could call that a condiment @@ -859,6 +895,7 @@ color ="#708a88" taste_description = "rancid fungus" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/moltobeso name = "Molt'Obeso" //pardon my Italian @@ -870,6 +907,7 @@ metabolization_rate = 0.025 * REAGENTS_METABOLISM metabolized_traits = list(TRAIT_GLUTTON) chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/moltobeso/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -887,6 +925,7 @@ color ="#708a88" taste_description = "rotten eggs" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/nutriment/stabilized name = "Stabilized Nutriment" @@ -894,6 +933,7 @@ nutriment_factor = 15 color = "#664330" // rgb: 102, 67, 48 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/nutriment/stabilized/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -910,6 +950,7 @@ taste_description = "bitter mushroom" ph = 12 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/entpoly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -934,6 +975,7 @@ ph = 11.2 self_consuming = TRUE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_DEAD_PROCESS + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/tinlux/expose_mob(mob/living/exposed_mob, methods = TOUCH, reac_volume, show_message = TRUE, touch_protection = 0) . = ..() @@ -959,6 +1001,7 @@ taste_description = "fruity mushroom" ph = 10.4 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/vitfro/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -976,6 +1019,7 @@ color = "#97ee63" taste_description = "pure electricity" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/liquidelectricity/enriched name = "Enriched Liquid Electricity" @@ -1008,6 +1052,7 @@ taste_description = "sweetness" overdose_threshold = 17 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/astrotame/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1035,6 +1080,7 @@ inverse_chem = /datum/reagent/peptides_failed//should be impossible, but it's so it appears in the chemical lookup gui inverse_chem_val = 0.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/caramel name = "Caramel" @@ -1044,6 +1090,7 @@ taste_mult = 2 taste_description = "caramel" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/caramel/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) . = ..() @@ -1059,6 +1106,7 @@ taste_description = "smoke" overdose_threshold = 15 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/char/overdose_process(mob/living/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1073,6 +1121,7 @@ taste_mult = 2.5 //sugar's 1.5, capsacin's 1.5, so a good middle ground. taste_description = "smokey sweetness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/bbqsauce /datum/reagent/consumable/chocolatepudding @@ -1083,6 +1132,7 @@ nutriment_factor = 4 taste_description = "sweet chocolate" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_EASY /datum/glass_style/drinking_glass/chocolatepudding @@ -1100,6 +1150,7 @@ nutriment_factor = 4 taste_description = "sweet vanilla" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/glass_style/drinking_glass/vanillapudding required_drink_type = /datum/reagent/consumable/vanillapudding @@ -1116,6 +1167,7 @@ taste_mult = 2 taste_description = "fizzy sweetness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/gravy name = "Gravy" @@ -1124,6 +1176,7 @@ color = "#623301" taste_mult = 1.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/pancakebatter name = "Pancake Batter" @@ -1131,6 +1184,7 @@ taste_description = "milky batter" color = "#fccc98" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/korta_flour name = "Korta Flour" @@ -1138,6 +1192,7 @@ taste_description = "earthy heat" color = "#EEC39A" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/korta_milk name = "Korta Milk" @@ -1145,6 +1200,7 @@ taste_description = "sugary milk" color = COLOR_WHITE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/korta_nectar name = "Korta Nectar" @@ -1153,6 +1209,7 @@ nutriment_factor = 5 taste_description = "peppery sweetness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/whipped_cream name = "Whipped Cream" @@ -1161,6 +1218,7 @@ nutriment_factor = 4 taste_description = "fluffy sweet cream" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/peanut_butter name = "Peanut Butter" @@ -1169,6 +1227,7 @@ color = "#D9A066" nutriment_factor = 15 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/peanut_butter /datum/reagent/consumable/peanut_butter/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) //ET loves peanut butter @@ -1183,6 +1242,7 @@ taste_description = "acid" color = "#661F1E" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/vinegar /datum/reagent/consumable/cornmeal @@ -1191,6 +1251,7 @@ taste_description = "raw cornmeal" color = "#ebca85" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/cornmeal /datum/reagent/consumable/yoghurt @@ -1200,6 +1261,7 @@ color = "#efeff0" nutriment_factor = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/yoghurt /datum/reagent/consumable/cornmeal_batter @@ -1208,6 +1270,7 @@ taste_description = "raw batter" color = "#ebca85" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/olivepaste name = "Olive Paste" @@ -1215,6 +1278,7 @@ taste_description = "mushy olives" color = "#adcf77" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/creamer name = "Coffee Creamer" @@ -1223,6 +1287,7 @@ color = "#efeff0" nutriment_factor = 1.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/creamer /datum/reagent/consumable/mintextract @@ -1231,6 +1296,7 @@ color = "#CF3600" // rgb: 207, 54, 0 taste_description = "mint" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/mintextract/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1245,6 +1311,7 @@ color = "#572b26" taste_description = "sweet fish" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/worcestershire /datum/reagent/consumable/red_bay @@ -1253,6 +1320,7 @@ color = "#8E4C00" taste_description = "spice" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/red_bay /datum/reagent/consumable/curry_powder @@ -1261,6 +1329,7 @@ color = "#F6C800" taste_description = "dry curry" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/curry_powder /datum/reagent/consumable/dashi_concentrate @@ -1269,6 +1338,7 @@ color = "#372926" taste_description = "extreme umami" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/condiment/dashi_concentrate /datum/reagent/consumable/martian_batter @@ -1277,6 +1347,7 @@ color = "#D49D26" taste_description = "umami dough" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/consumable/grounding_solution name = "Grounding Solution" @@ -1284,3 +1355,4 @@ color = "#efeff0" taste_description = "metallic salt" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 69c421c6dce..927b2a71463 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -21,6 +21,7 @@ ph = 8.4 color = "#DB90C6" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/leporazine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -85,6 +86,7 @@ color = COLOR_MAGENTA ph = 4 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/synaptizine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -104,6 +106,7 @@ color = "#EC536D" // rgb: 236, 83, 109 ph = 5.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/synaphydramine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -123,6 +126,7 @@ color = "#07e4d1" ph = 6.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/sansufentanyl/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -145,6 +149,7 @@ burning_temperature = 20 //cold burning burning_volume = 0.1 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -178,6 +183,7 @@ taste_description = "spicy jelly" ph = 12 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/pyroxadone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -216,6 +222,7 @@ ph = 12.2 taste_description = "fish" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS inverse_chem_val = 0.25 inverse_chem = /datum/reagent/inverse/rezadone @@ -259,6 +266,7 @@ metabolization_rate = 0.1 * REAGENTS_METABOLISM ph = 8.1 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS inverse_chem_val = 0.3 inverse_chem = /datum/reagent/inverse/spaceacillin added_traits = list(TRAIT_VIRUS_RESISTANCE) @@ -273,6 +281,7 @@ overdose_threshold = 25 ph = 10.7 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS inverse_chem_val = 0.3 inverse_chem = /datum/reagent/inverse/oxandrolone @@ -301,6 +310,7 @@ taste_description = "sweetness and salt" ph = 5.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /// Add about half this much extra blood regen per second. var/extra_regen = 0.25 @@ -356,6 +366,7 @@ metabolization_rate = 0.4 * REAGENTS_METABOLISM ph = 2.6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_AFFECTS_WOUNDS + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_ANALGESIA) /datum/reagent/medicine/mine_salve/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -403,6 +414,7 @@ overdose_threshold = 30 ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS var/healing = 0.5 /datum/reagent/medicine/omnizine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -433,6 +445,7 @@ color = "#d8c7b7" healing = 0.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/calomel name = "Calomel" @@ -443,6 +456,7 @@ overdose_threshold = 20 ph = 1.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/calomel/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -471,6 +485,7 @@ overdose_threshold = 10 ph = 7 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS inverse_chem_val = 0.50 inverse_chem = /datum/reagent/inverse/ammoniated_mercury @@ -499,6 +514,7 @@ metabolization_rate = 2 * REAGENTS_METABOLISM ph = 12 //It's a reducing agent chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_HALT_RADIATION_EFFECTS) /datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -514,6 +530,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM ph = 1 //One of the best buffers, NEVERMIND! chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS inverse_chem_val = 0.4 inverse_chem = /datum/reagent/inverse/pen_acid metabolized_traits = list(TRAIT_HALT_RADIATION_EFFECTS) @@ -534,6 +551,7 @@ overdose_threshold = 25 ph = 2.1 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS inverse_chem_val = 0.3 inverse_chem = /datum/reagent/inverse/sal_acid @@ -560,6 +578,7 @@ metabolization_rate = 0.25 * REAGENTS_METABOLISM ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS inverse_chem_val = 0.25 inverse_chem = /datum/reagent/inverse/salbutamol @@ -586,6 +605,7 @@ metabolization_rate = REAGENTS_METABOLISM ph = 4 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/inhaler_canister /// The decrement we will apply to the received_pressure_mult of our targets lungs. @@ -666,6 +686,7 @@ ph = 12 purity = REAGENT_STANDARD_PURITY chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/stimulants = 150) inverse_chem = /datum/reagent/inverse/corazargh inverse_chem_val = 0.4 @@ -716,6 +737,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM ph = 11.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -733,6 +755,7 @@ overdose_threshold = 30 ph = 8.96 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/opioids = 30) metabolized_traits = list(TRAIT_ANALGESIA) @@ -788,6 +811,7 @@ purity = REAGENT_STANDARD_PURITY ph = 10 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS inverse_chem = /datum/reagent/inverse/oculine inverse_chem_val = 0.45 ///The lighting alpha that the mob had on addition @@ -869,6 +893,7 @@ purity = 1 ph = 0.01 chemical_flags = REAGENT_DEAD_PROCESS|REAGENT_IGNORE_STASIS|REAGENT_NO_RANDOM_RECIPE|REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_MAINTENANCE_PILL inverse_chem = /datum/reagent/inverse inverse_chem_val = 0 var/static/list/eye_types = list(/obj/item/organ/eyes/snail, /obj/item/organ/eyes/night_vision/mushroom) @@ -923,6 +948,7 @@ ph = 2 purity = REAGENT_STANDARD_PURITY chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS inverse_chem_val = 0.3 inverse_chem = /datum/reagent/impurity/inacusiate @@ -957,6 +983,7 @@ overdose_threshold = 35 ph = 12 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS inverse_chem_val = 0.35 inverse_chem = /datum/reagent/inverse/atropine added_traits = list(TRAIT_NOCRITDAMAGE, TRAIT_PREVENT_IMPLANT_AUTO_EXPLOSION) @@ -995,6 +1022,7 @@ overdose_threshold = 30 ph = 10.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_NOCRITDAMAGE) /datum/reagent/medicine/epinephrine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -1056,6 +1084,7 @@ taste_description = "magnets" ph = 0.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /// The amount of damage a single unit of this will heal var/healing_per_reagent_unit = 5 /// The ratio of the excess reagent used to contribute to excess healing @@ -1171,6 +1200,7 @@ taste_description = "magnetic scales" ph = 0.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS // only revives fish. /datum/reagent/medicine/strange_reagent/fishy_reagent/pre_rez_check(atom/thing_to_rez) @@ -1191,6 +1221,7 @@ ph = 10.4 overdose_threshold = 15 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS purity = REAGENT_STANDARD_PURITY inverse_chem = /datum/reagent/inverse inverse_chem_val = 0.45 @@ -1224,6 +1255,7 @@ description = "Reacts with neural tissue, helping reform damaged connections. Can cure minor traumas." color = COLOR_SILVER //ditto chemical_flags = REAGENT_CAN_BE_SYNTHESIZED | REAGENT_DEAD_PROCESS + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS purity = REAGENT_STANDARD_PURITY inverse_chem_val = 0.5 inverse_chem = /datum/reagent/inverse/neurine @@ -1266,6 +1298,7 @@ taste_description = "acid" ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/mutadone/on_mob_metabolize(mob/living/affected_mob) . = ..() @@ -1297,6 +1330,7 @@ ph = 4 purity = REAGENT_STANDARD_PURITY chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS inverse_chem_val = 0.35 inverse_chem = /datum/reagent/inverse/antihol /// All status effects we remove on metabolize. @@ -1332,6 +1366,7 @@ overdose_threshold = 60 ph = 8.7 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/stimulants = 150) metabolized_traits = list(TRAIT_BATON_RESISTANCE, TRAIT_ANALGESIA, TRAIT_STIMULATED) @@ -1372,6 +1407,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM ph = 6.7 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/insulin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1386,6 +1422,7 @@ color = "#A4D8D8" ph = 8.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1399,6 +1436,7 @@ color = "#CC23FF" taste_description = "jelly" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS affected_biotype = MOB_ORGANIC | MOB_MINERAL | MOB_PLANT // no healing ghosts affected_respiration_type = ALL @@ -1429,6 +1467,7 @@ overdose_threshold = 30 ph = 11 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1454,6 +1493,7 @@ overdose_threshold = 25 ph = 11 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/hallucinogens = 90) metabolized_traits = list(TRAIT_PACIFISM) @@ -1516,6 +1556,7 @@ metabolization_rate = 0.4 * REAGENTS_METABOLISM ph = 4.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/haloperidol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1587,6 +1628,7 @@ color = "#AE151D" metabolization_rate = 2.5 * REAGENTS_METABOLISM chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/changelinghaste/on_mob_metabolize(mob/living/affected_mob) . = ..() @@ -1607,6 +1649,7 @@ color = "#FF3542" self_consuming = TRUE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_STABLELIVER) /datum/reagent/medicine/cordiolis_hepatico @@ -1615,6 +1658,7 @@ color = COLOR_BLACK self_consuming = TRUE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/cordiolis_hepatico/on_mob_add(mob/living/affected_mob) . = ..() @@ -1628,6 +1672,7 @@ name = "Muscle Stimulant" description = "A potent chemical that allows someone under its influence to be at full physical ability even when under massive amounts of pain." chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_ANALGESIA) /datum/reagent/medicine/muscle_stimulant/on_mob_metabolize(mob/living/affected_mob) @@ -1647,6 +1692,7 @@ taste_description = "salt" // it actually does taste salty ph = 7.89 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_SLEEPIMMUNE) /// To track overdose progress var/overdose_progress = 0 @@ -1712,6 +1758,7 @@ overdose_threshold = 30 ph = 9.12 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_FEARLESS) /datum/reagent/medicine/psicodine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -1738,6 +1785,7 @@ inverse_chem_val = 0.1 //Shouldn't happen - but this is so looking up the chem will point to the failed type inverse_chem = /datum/reagent/impurity/probital_failed chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/metafactor/overdose_start(mob/living/carbon/affected_mob, metabolization_ratio) . = ..() @@ -1754,6 +1802,7 @@ color = "#FFFFD0" metabolization_rate = 1.5 * REAGENTS_METABOLISM chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/silibinin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1768,6 +1817,7 @@ overdose_threshold = 50 taste_description = "numbing bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/polypyr/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) //I wanted a collection of small positive effects, this is as hard to obtain as coniine after all. . = ..() @@ -1796,6 +1846,7 @@ overdose_threshold = 50 metabolization_rate = 0.5 * REAGENTS_METABOLISM //same as C2s chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_ANALGESIA) /datum/reagent/medicine/granibitaluri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -1829,6 +1880,7 @@ /// For tracking when we tell the person we're no longer bleeding var/was_working chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_COAGULATING) /datum/reagent/medicine/coagulant/on_mob_metabolize(mob/living/affected_mob) @@ -1888,6 +1940,7 @@ clot_rate = 0.2 passive_bleed_modifier = 0.8 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/glass_style/drinking_glass/banana_peel required_drink_type = /datum/reagent/medicine/coagulant/banana_peel @@ -1917,6 +1970,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM ph = 10.6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/ondansetron/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1935,6 +1989,7 @@ ph = 4 penetrates_skin = TOUCH|VAPOR chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_ADDICTIONRESILIENT) var/static/list/opiates_to_clear = list( /datum/reagent/medicine/morphine, diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 533c1ed83cc..7bed221fd53 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -56,6 +56,7 @@ material = /datum/material/meat ph = 7.45 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/glass_style/shot_glass/liquidgibs required_drink_type = /datum/reagent/consumable/liquidgibs @@ -109,6 +110,7 @@ color = "#AAAAAA77" // rgb: 170, 170, 170, 77 (alpha) taste_description = "water" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_CLEANS + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/cup/glass/waterbottle var/cooling_temperature = 2 @@ -246,6 +248,7 @@ /datum/reagent/water/mineral name = "Mineral Water" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE|REAGENT_CLEANS + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/water/mineral/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -259,6 +262,7 @@ taste_description = "the sea" cooling_temperature = 3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_CLEANS + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/cup/glass/waterbottle /datum/glass_style/shot_glass/water/salt @@ -308,6 +312,7 @@ self_consuming = TRUE //divine intervention won't be limited by the lack of a liver ph = 7.5 //God is alkaline chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_CLEANS|REAGENT_UNAFFECTED_BY_METABOLISM // Operates at fixed metabolism for balancing memes. + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/item/reagent_containers/cup/glass/bottle/holywater metabolized_traits = list(TRAIT_HOLY) @@ -399,6 +404,7 @@ color = "#88878777" taste_description = "emptyiness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/hydrogen_peroxide name = "Hydrogen Peroxide" @@ -407,6 +413,7 @@ taste_description = "burning water" ph = 6.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/glass_style/shot_glass/hydrogen_peroxide required_drink_type = /datum/reagent/hydrogen_peroxide @@ -453,6 +460,7 @@ penetrates_skin = TOUCH|VAPOR ph = 6.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/fuel/unholywater/on_mob_metabolize(mob/living/affected_mob) . = ..() @@ -493,6 +501,7 @@ taste_description = "burning" ph = 0.1 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/hellwater/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -512,6 +521,7 @@ description = "Slowly heals all damage types. Has a rather high overdose threshold. Glows with mysterious power." overdose_threshold = 150 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS ///Used for clownery /datum/reagent/lube @@ -521,6 +531,7 @@ taste_description = "cherry" // by popular demand var/lube_kind = TURF_WET_LUBE ///What kind of slipperiness gets added to turfs chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/lube/expose_turf(turf/open/exposed_turf, reac_volume) . = ..() @@ -550,6 +561,7 @@ description = "This \[REDACTED\] has been outlawed after the incident on \[DATA EXPUNGED\]." lube_kind = TURF_WET_SUPERLUBE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/spraytan name = "Spray Tan" @@ -562,6 +574,7 @@ fallback_icon = 'icons/obj/drinks/drink_effects.dmi' fallback_icon_state = "spraytan_fallback" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS glass_price = DRINK_PRICE_HIGH /datum/reagent/spraytan/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message = TRUE, touch_protection = 0) @@ -707,6 +720,7 @@ color = "#13BC5E" // rgb: 19, 188, 94 race = /datum/species/jelly/slime chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/mutationtoxin/felinid name = "Felinid Mutation Toxin" @@ -714,6 +728,7 @@ race = /datum/species/human/felinid taste_description = "something nyat good" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/mutationtoxin/lizard name = "Lizard Mutation Toxin" @@ -722,6 +737,7 @@ race = /datum/species/lizard taste_description = "dragon's breath but not as cool" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/mutationtoxin/fly name = "Fly Mutation Toxin" @@ -730,6 +746,7 @@ race = /datum/species/fly taste_description = "trash" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/mutationtoxin/moth name = "Moth Mutation Toxin" @@ -738,6 +755,7 @@ race = /datum/species/moth taste_description = "clothing" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/mutationtoxin/ethereal name = "Ethereal Mutation Toxin" @@ -746,6 +764,7 @@ race = /datum/species/ethereal taste_description = "static" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/mutationtoxin/pod name = "Podperson Mutation Toxin" @@ -754,6 +773,7 @@ race = /datum/species/pod taste_description = "flowers" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/mutationtoxin/jelly name = "Imperfect Mutation Toxin" @@ -762,6 +782,7 @@ race = /datum/species/jelly taste_description = "grandma's gelatin" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/mutationtoxin/jelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) if(!ishuman(affected_mob)) @@ -789,6 +810,7 @@ race = /datum/species/golem taste_description = "rocks" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/mutationtoxin/abductor name = "Abductor Mutation Toxin" @@ -797,6 +819,7 @@ race = /datum/species/abductor taste_description = "something out of this world... no, universe!" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/mutationtoxin/android name = "Android Mutation Toxin" @@ -805,6 +828,7 @@ race = /datum/species/android taste_description = "circuitry and steel" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS //BLACKLISTED RACES /datum/reagent/mutationtoxin/skeleton @@ -814,6 +838,7 @@ race = /datum/species/skeleton taste_description = "milk... and lots of it" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/mutationtoxin/zombie name = "Zombie Mutation Toxin" @@ -822,6 +847,7 @@ race = /datum/species/zombie //Not the infectious kind. The days of xenobio zombie outbreaks are long past. taste_description = "brai...nothing in particular" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/mutationtoxin/ash name = "Ash Mutation Toxin" @@ -830,6 +856,7 @@ race = /datum/species/lizard/ashwalker taste_description = "savagery" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/mutationtoxin/ghost name = "Ghost Mutation Toxin" @@ -838,6 +865,7 @@ race = /datum/species/ghost taste_description = "ectoplasm" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS //DANGEROUS RACES /datum/reagent/mutationtoxin/shadow @@ -847,6 +875,7 @@ race = /datum/species/shadow taste_description = "the night" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/mutationtoxin/plasma name = "Plasma Mutation Toxin" @@ -855,6 +884,7 @@ race = /datum/species/plasmaman taste_description = "plasma" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS #undef MUT_MSG_IMMEDIATE #undef MUT_MSG_EXTENDED @@ -871,6 +901,7 @@ metabolization_rate = INFINITY taste_description = "slime" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/mulligan/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -888,6 +919,7 @@ taste_description = "slime" penetrates_skin = NONE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/aslimetoxin/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message=TRUE, touch_protection=0) . = ..() @@ -917,6 +949,7 @@ taste_description = "bitterness" ph = 10 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/serotrotium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -930,6 +963,7 @@ taste_mult = 0 // oderless and tasteless ph = 9.2//It's acutally a huge range and very dependant on the chemistry but ph is basically a made up var in its implementation anyways chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/oxygen/expose_turf(turf/open/exposed_turf, reac_volume) @@ -945,6 +979,7 @@ taste_description = "metal" ph = 5.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/copper/expose_obj(obj/exposed_obj, reac_volume, methods=TOUCH, show_message=TRUE) . = ..() @@ -962,6 +997,7 @@ color = COLOR_GRAY taste_mult = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/nitrogen/expose_turf(turf/open/exposed_turf, reac_volume) if(istype(exposed_turf)) @@ -975,6 +1011,7 @@ taste_mult = 0 ph = 0.1//Now I'm stuck in a trap of my own design. Maybe I should make -ve phes? (not 0 so I don't get div/0 errors) chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/potassium name = "Potassium" @@ -982,6 +1019,7 @@ color = "#A0A0A0" // rgb: 160, 160, 160 taste_description = "sweetness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/mercury name = "Mercury" @@ -989,6 +1027,7 @@ color = COLOR_WEBSAFE_DARK_GRAY // rgb: 72, 72, 72A taste_mult = 0 // apparently tasteless. chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/mercury/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1006,6 +1045,7 @@ taste_description = "rotten eggs" ph = 4.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/carbon name = "Carbon" @@ -1014,6 +1054,7 @@ taste_description = "sour chalk" ph = 5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/carbon/expose_turf(turf/exposed_turf, reac_volume) . = ..() @@ -1029,6 +1070,7 @@ taste_description = "chlorine" ph = 7.4 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS // You're an idiot for thinking that one of the most corrosive and deadly gasses would be beneficial @@ -1052,6 +1094,7 @@ taste_description = "acid" ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS // You're an idiot for thinking that one of the most corrosive and deadly gasses would be beneficial /datum/reagent/fluorine/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) @@ -1072,6 +1115,7 @@ taste_description = "salty metal" ph = 11.6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/phosphorus name = "Phosphorus" @@ -1080,6 +1124,7 @@ taste_description = "vinegar" ph = 6.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS // Phosphoric salts are beneficial though. And even if the plant suffers, in the long run the tray gets some nutrients. The benefit isn't worth that much. /datum/reagent/phosphorus/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) @@ -1094,6 +1139,7 @@ taste_description = "metal" ph = 11.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/lithium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1109,6 +1155,7 @@ taste_description = "sweetness" ph = 9 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/space_cleaner/sterilizine name = "Sterilizine" @@ -1117,6 +1164,7 @@ taste_description = "bitterness" ph = 10.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_AFFECTS_WOUNDS + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/space_cleaner/sterilizine/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) . = ..() @@ -1134,6 +1182,7 @@ taste_description = "iron" material = /datum/material/iron chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS color = "#606060" //pure iron? let's make it violet of course ph = 6 @@ -1144,6 +1193,7 @@ taste_description = "expensive metal" material = /datum/material/gold chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/silver name = "Silver" @@ -1152,6 +1202,7 @@ taste_description = "expensive yet reasonable metal" material = /datum/material/silver chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/uranium name = "Uranium" @@ -1161,6 +1212,7 @@ ph = 4 material = /datum/material/uranium chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/effect/decal/cleanable/greenglow /// How much tox damage to deal per tick var/tox_damage = 0.25 @@ -1245,6 +1297,7 @@ material = null ph = 10 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS rad_power = 2 /datum/reagent/bluespace @@ -1255,6 +1308,7 @@ material = /datum/material/bluespace ph = 12 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/bluespace/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message = TRUE, touch_protection = 0) . = ..() @@ -1280,6 +1334,7 @@ color = "#A8A8A8" // rgb: 168, 168, 168 taste_description = "metal" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/silicon name = "Silicon" @@ -1289,6 +1344,7 @@ material = /datum/material/glass ph = 10 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/fuel name = "Welding Fuel" @@ -1300,6 +1356,7 @@ burning_temperature = 1725 //more refined than oil burning_volume = 0.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/alcohol = 300) /datum/glass_style/drinking_glass/fuel @@ -1358,6 +1415,7 @@ penetrates_skin = VAPOR ph = 5.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_CLEANS|REAGENT_AFFECTS_WOUNDS + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS var/clean_types = CLEAN_WASH /datum/reagent/space_cleaner/expose_obj(obj/exposed_obj, reac_volume, methods=TOUCH, show_message=TRUE) @@ -1396,6 +1454,7 @@ penetrates_skin = VAPOR ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/space_cleaner/ez_clean/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1426,6 +1485,7 @@ taste_description = "sourness" ph = 11.9 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/cryptobiolin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1447,6 +1507,7 @@ taste_description = "numbness" ph = 9.1 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/opioids = 120) /datum/reagent/impedrezene/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -1466,6 +1527,7 @@ color = "#535E66" // rgb: 83, 94, 102 taste_description = "sludge" penetrates_skin = NONE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/cyborg_mutation_nanomachines/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message = TRUE, touch_protection = 0) . = ..() @@ -1481,6 +1543,7 @@ color = "#535E66" // rgb: 83, 94, 102 taste_description = "sludge" penetrates_skin = NONE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/xenomicrobes/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message = TRUE, touch_protection = 0) . = ..() @@ -1520,6 +1583,7 @@ taste_description = "metal" ph = 11 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/foaming_agent// Metal foaming agent. This is lithium hydride. Add other recipes (e.g. LiH + H2O -> LiOH + H2) eventually. name = "Foaming Agent" @@ -1528,6 +1592,7 @@ taste_description = "metal" ph = 11.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/smart_foaming_agent //Smart foaming agent. Functions similarly to metal foam, but conforms to walls. name = "Smart Foaming Agent" @@ -1536,6 +1601,7 @@ taste_description = "metal" ph = 11.8 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/ammonia name = "Ammonia" @@ -1544,6 +1610,7 @@ taste_description = "mordant" ph = 11.6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/ammonia/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) // Ammonia is bad ass. @@ -1561,6 +1628,7 @@ taste_description = "iron" ph = 12 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS // This is more bad ass, and pests get hurt by the corrosive nature of it, not the plant. The new trade off is it culls stability. /datum/reagent/diethylamine/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) @@ -1578,6 +1646,7 @@ taste_description = "something unknowable" ph = 6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/carbondioxide/expose_turf(turf/open/exposed_turf, reac_volume) if(istype(exposed_turf)) @@ -1593,6 +1662,7 @@ taste_description = "sweetness" ph = 5.8 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/nitrous_oxide/expose_turf(turf/open/exposed_turf, reac_volume) . = ..() @@ -1659,6 +1729,7 @@ random_color_list = list("#FC7474") ph = 0.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/colorful_reagent/powder/orange name = "Orange Powder" @@ -1674,6 +1745,7 @@ random_color_list = list(COLOR_CRAYON_YELLOW) ph = 5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/colorful_reagent/powder/green name = "Green Powder" @@ -1681,6 +1753,7 @@ color = COLOR_CRAYON_GREEN random_color_list = list(COLOR_CRAYON_GREEN) chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/colorful_reagent/powder/blue name = "Blue Powder" @@ -1689,6 +1762,7 @@ random_color_list = list("#71CAE5") ph = 10 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/colorful_reagent/powder/purple name = "Purple Powder" @@ -1697,6 +1771,7 @@ random_color_list = list("#BD8FC4") ph = 13 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/colorful_reagent/powder/invisible name = "Invisible Powder" @@ -1704,6 +1779,7 @@ color = "#FFFFFF00" // white + no alpha random_color_list = list(COLOR_WHITE) //because using the powder color turns things invisible chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/colorful_reagent/powder/black name = "Black Powder" @@ -1711,6 +1787,7 @@ color = COLOR_CRAYON_BLACK random_color_list = list("#8D8D8D") //more grey than black, not enough to hide your true colors chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/colorful_reagent/powder/white name = "White Powder" @@ -1718,6 +1795,7 @@ color = COLOR_WHITE random_color_list = list(COLOR_WHITE) chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /* used by crayons, can't color living things but still used for stuff like food recipes */ @@ -1725,31 +1803,37 @@ name = "Red Crayon Powder" can_color_mobs = FALSE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/colorful_reagent/powder/orange/crayon name = "Orange Crayon Powder" can_color_mobs = FALSE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/colorful_reagent/powder/yellow/crayon name = "Yellow Crayon Powder" can_color_mobs = FALSE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/colorful_reagent/powder/green/crayon name = "Green Crayon Powder" can_color_mobs = FALSE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/colorful_reagent/powder/blue/crayon name = "Blue Crayon Powder" can_color_mobs = FALSE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/colorful_reagent/powder/purple/crayon name = "Purple Crayon Powder" can_color_mobs = FALSE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS //datum/reagent/colorful_reagent/powder/invisible/crayon @@ -1757,11 +1841,13 @@ name = "Black Crayon Powder" can_color_mobs = FALSE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/colorful_reagent/powder/white/crayon name = "White Crayon Powder" can_color_mobs = FALSE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS //////////////////////////////////Hydroponics stuff/////////////////////////////// @@ -1785,6 +1871,7 @@ color = "#376400" // RBG: 50, 100, 0 tox_prob = 5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/plantnutriment/eznutriment/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) var/obj/item/seeds/myseed = mytray.myseed @@ -1799,6 +1886,7 @@ color = "#1A1E4D" // RBG: 26, 30, 77 tox_prob = 13 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/plantnutriment/left4zednutriment/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) @@ -1811,6 +1899,7 @@ color = "#9D9D00" // RBG: 157, 157, 0 tox_prob = 8 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/plantnutriment/robustharvestnutriment/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) var/obj/item/seeds/myseed = mytray.myseed @@ -1825,6 +1914,7 @@ color = "#a06fa7" // RBG: 160, 111, 167 tox_prob = 8 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/plantnutriment/endurogrow/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) var/obj/item/seeds/myseed = mytray.myseed @@ -1839,6 +1929,7 @@ color = "#912e00" // RBG: 145, 46, 0 tox_prob = 13 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/plantnutriment/liquidearthquake/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) @@ -1860,6 +1951,7 @@ burning_temperature = 1200//Oil is crude burning_volume = 0.05 //but has a lot of hydrocarbons chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = null default_container = /obj/effect/decal/cleanable/blood/oil @@ -1871,6 +1963,7 @@ taste_mult = 1.5 ph = 1.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/stable_plasma/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1883,6 +1976,7 @@ taste_description = "metal" ph = 4.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/carpet name = "Carpet" @@ -1891,6 +1985,7 @@ taste_description = "carpet" // Your tounge feels furry. var/carpet_type = /turf/open/floor/carpet chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/carpet/expose_turf(turf/exposed_turf, reac_volume) if(isopenturf(exposed_turf) && exposed_turf.turf_flags & IS_SOLID && !istype(exposed_turf, /turf/open/floor/carpet)) @@ -1904,6 +1999,7 @@ taste_description = "licorice" carpet_type = /turf/open/floor/carpet/black chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/carpet/blue name = "Blue Carpet" @@ -1912,6 +2008,7 @@ taste_description = "frozen carpet" carpet_type = /turf/open/floor/carpet/blue chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/carpet/cyan name = "Cyan Carpet" @@ -1920,6 +2017,7 @@ taste_description = "asbestos" carpet_type = /turf/open/floor/carpet/cyan chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/carpet/green name = "Green Carpet" @@ -1928,6 +2026,7 @@ taste_description = "Green" //the caps is intentional carpet_type = /turf/open/floor/carpet/green chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/carpet/orange name = "Orange Carpet" @@ -1936,6 +2035,7 @@ taste_description = "orange juice" carpet_type = /turf/open/floor/carpet/orange chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/carpet/purple name = "Purple Carpet" @@ -1944,6 +2044,7 @@ taste_description = "jelly" carpet_type = /turf/open/floor/carpet/purple chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/carpet/red name = "Red Carpet" @@ -1952,6 +2053,7 @@ taste_description = "blood and gibs" carpet_type = /turf/open/floor/carpet/red chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/carpet/royal name = "Royal Carpet?" @@ -1980,6 +2082,7 @@ taste_description = "royalty" carpet_type = /turf/open/floor/carpet/royalblack chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/carpet/royal/blue name = "Royal Blue Carpet" @@ -1988,6 +2091,7 @@ taste_description = "blueyalty" //also intentional carpet_type = /turf/open/floor/carpet/royalblue chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/carpet/neon name = "Neon Carpet" @@ -1996,6 +2100,7 @@ taste_description = "neon" ph = 6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS carpet_type = /turf/open/floor/carpet/neon /datum/reagent/carpet/neon/simple_white @@ -2004,6 +2109,7 @@ color = LIGHT_COLOR_HALOGEN taste_description = "sodium vapor" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS carpet_type = /turf/open/floor/carpet/neon/simple/white /datum/reagent/carpet/neon/simple_red @@ -2012,6 +2118,7 @@ color = COLOR_RED taste_description = "neon hallucinations" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS carpet_type = /turf/open/floor/carpet/neon/simple/red /datum/reagent/carpet/neon/simple_orange @@ -2020,6 +2127,7 @@ color = COLOR_ORANGE taste_description = "neon spines" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS carpet_type = /turf/open/floor/carpet/neon/simple/orange /datum/reagent/carpet/neon/simple_yellow @@ -2028,6 +2136,7 @@ color = COLOR_YELLOW taste_description = "stabilized neon" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS carpet_type = /turf/open/floor/carpet/neon/simple/yellow /datum/reagent/carpet/neon/simple_lime @@ -2036,6 +2145,7 @@ color = COLOR_LIME taste_description = "neon citrus" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS carpet_type = /turf/open/floor/carpet/neon/simple/lime /datum/reagent/carpet/neon/simple_green @@ -2044,6 +2154,7 @@ color = COLOR_GREEN taste_description = "radium" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS carpet_type = /turf/open/floor/carpet/neon/simple/green /datum/reagent/carpet/neon/simple_teal @@ -2052,6 +2163,7 @@ color = COLOR_TEAL taste_description = "neon tobacco" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS carpet_type = /turf/open/floor/carpet/neon/simple/teal /datum/reagent/carpet/neon/simple_cyan @@ -2060,6 +2172,7 @@ color = COLOR_DARK_CYAN taste_description = "neon air" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS carpet_type = /turf/open/floor/carpet/neon/simple/cyan /datum/reagent/carpet/neon/simple_blue @@ -2068,6 +2181,7 @@ color = COLOR_NAVY taste_description = "neon blue" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS carpet_type = /turf/open/floor/carpet/neon/simple/blue /datum/reagent/carpet/neon/simple_purple @@ -2076,6 +2190,7 @@ color = COLOR_PURPLE taste_description = "neon hell" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS carpet_type = /turf/open/floor/carpet/neon/simple/purple /datum/reagent/carpet/neon/simple_violet @@ -2084,6 +2199,7 @@ color = COLOR_VIOLET taste_description = "neon hell" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS carpet_type = /turf/open/floor/carpet/neon/simple/violet /datum/reagent/carpet/neon/simple_pink @@ -2092,6 +2208,7 @@ color = COLOR_PINK taste_description = "neon pink" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS carpet_type = /turf/open/floor/carpet/neon/simple/pink /datum/reagent/carpet/neon/simple_black @@ -2100,6 +2217,7 @@ color = COLOR_BLACK taste_description = "neon ash" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS carpet_type = /turf/open/floor/carpet/neon/simple/black /datum/reagent/bromine @@ -2109,6 +2227,7 @@ taste_description = "chemicals" ph = 7.8 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/pentaerythritol name = "Pentaerythritol" @@ -2116,6 +2235,7 @@ color = "#EEEEEF" taste_description = "acid" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/acetaldehyde name = "Acetaldehyde" @@ -2123,6 +2243,7 @@ color = "#EEEEEF" taste_description = "dead people" //made from formaldehyde, ya get da joke ? chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/acetone_oxide name = "Acetone Oxide" @@ -2130,6 +2251,7 @@ color = "#966199cb" taste_description = "acid" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/acetone_oxide/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message = TRUE, touch_protection = 0)//Splashing people kills people! . = ..() @@ -2150,6 +2272,7 @@ taste_description = "acid" ph = 5.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/ash name = "Ash" @@ -2158,6 +2281,7 @@ taste_description = "ash" ph = 6.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS default_container = /obj/effect/decal/cleanable/ash // Ash is also used IRL in gardening, as a fertilizer enhancer and weed killer @@ -2171,6 +2295,7 @@ color = "#AF14B7" taste_description = "acid" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/colorful_reagent name = "Colorful Reagent" @@ -2179,6 +2304,7 @@ color = COLOR_GRAY taste_description = "rainbows" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS inverse_chem_val = 0.3 inverse_chem = /datum/reagent/inverse/colorful_reagent /// Whenever this reagent can color mob limbs and organs upon exposure @@ -2268,6 +2394,7 @@ taste_description = "sourness" penetrates_skin = NONE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/hair_dye/New() SSticker.OnRoundstart(CALLBACK(src, PROC_REF(UpdateColor))) @@ -2296,6 +2423,7 @@ taste_description = "sourness" penetrates_skin = NONE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/barbers_aid/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message=TRUE, touch_protection = 0) . = ..() @@ -2322,6 +2450,7 @@ taste_description = "sourness" penetrates_skin = NONE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/concentrated_barbers_aid/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message=TRUE, touch_protection = 0) . = ..() @@ -2364,6 +2493,7 @@ taste_description = "bitterness" penetrates_skin = NONE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS inverse_chem_val = 0.3 inverse_chem = /datum/reagent/inverse/baldium @@ -2388,6 +2518,7 @@ taste_description = "cool salt" ph = 11.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS // Saltpetre is used for gardening IRL, to simplify highly, it speeds up growth and strengthens plants /datum/reagent/saltpetre/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) @@ -2402,6 +2533,7 @@ taste_description = "acid" ph = 11.9 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/drying_agent name = "Drying Agent" @@ -2410,6 +2542,7 @@ taste_description = "dryness" ph = 10.7 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/drying_agent/expose_turf(turf/open/exposed_turf, reac_volume) . = ..() @@ -2433,18 +2566,21 @@ color = "#A3C00F" // rgb: 163,192,15 taste_description = "sourness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/mutagen/mutagenvirusfood/sugar name = "Sucrose Agar" color = "#41B0C0" // rgb: 65,176,192 taste_description = "sweetness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/medicine/synaptizine/synaptizinevirusfood name = "Virus Rations" color = "#D18AA5" // rgb: 209,138,165 taste_description = "bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/plasma/plasmavirusfood name = "Virus Plasma" @@ -2452,6 +2588,7 @@ taste_description = "bitterness" taste_mult = 1.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/plasma/plasmavirusfood/weak name = "Weakened Virus Plasma" @@ -2459,24 +2596,28 @@ taste_description = "bitterness" taste_mult = 1.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/uranium/uraniumvirusfood name = "Decaying Uranium Gel" color = "#67ADBA" // rgb: 103,173,186 taste_description = "the inside of a reactor" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/uranium/uraniumvirusfood/unstable name = "Unstable Uranium Gel" color = "#2FF2CB" // rgb: 47,242,203 taste_description = "the inside of a reactor" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/uranium/uraniumvirusfood/stable name = "Stable Uranium Gel" color = "#04506C" // rgb: 4,80,108 taste_description = "the inside of a reactor" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS // Bee chemicals @@ -2487,6 +2628,7 @@ taste_description = "strange honey" ph = 3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/royal_bee_jelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -2529,6 +2671,7 @@ description = "An experimental serum which causes rapid muscular growth in Hominidae. Side effects may include hypertrichosis, violent outbursts, and an unending affinity for bananas." color = "#00f041" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/magillitis/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -2543,6 +2686,7 @@ var/current_size = RESIZE_DEFAULT_SIZE taste_description = "bitterness" // apparently what viagra tastes like chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/growthserum/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -2579,6 +2723,7 @@ taste_description = "plastic" ph = 6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/glitter name = "Glitter" @@ -2587,6 +2732,7 @@ color = COLOR_WHITE //pure white taste_description = "plastic" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/glitter/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -2643,6 +2789,7 @@ description = "Tiny plastic flakes that are impossible to sweep up." color = "#7dd87b" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/confetti/expose_turf(turf/exposed_turf, reac_volume) . = ..() @@ -2658,6 +2805,7 @@ metabolization_rate = 0.25 * REAGENTS_METABOLISM ph = 15 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_PACIFISM) /datum/reagent/bz_metabolites @@ -2667,6 +2815,7 @@ taste_description = "acrid cinnamon" metabolization_rate = 0.2 * REAGENTS_METABOLISM chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/bz_metabolites/on_mob_life(mob/living/carbon/target, seconds_per_tick, metabolization_ratio) . = ..() @@ -2679,6 +2828,7 @@ description = "A colorless liquid that suppresses violence in its subjects. Cheaper to synthesize than normal Pax, but wears off faster." metabolization_rate = 1.5 * REAGENTS_METABOLISM chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/peaceborg/confuse name = "Dizzying Solution" @@ -2686,6 +2836,7 @@ metabolization_rate = 1.5 * REAGENTS_METABOLISM taste_description = "dizziness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/peaceborg/confuse/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -2701,6 +2852,7 @@ metabolization_rate = 1.5 * REAGENTS_METABOLISM taste_description = "tiredness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/peaceborg/tire/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -2740,6 +2892,7 @@ taste_mult = 4 metabolization_rate = 0.4 * REAGENTS_METABOLISM chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS var/yuck_cycle = 0 //! The `current_cycle` when puking starts. /datum/glass_style/drinking_glass/yuck @@ -2798,6 +2951,7 @@ color = "#9C5A19" taste_description = "bananas" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/plasma_oxide name = "Hyper-Plasmium Oxide" @@ -2805,6 +2959,7 @@ color = "#470750" // rgb: 255, 255, 255 taste_description = "hell" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/exotic_stabilizer name = "Exotic Stabilizer" @@ -2812,6 +2967,7 @@ color = "#180000" // rgb: 255, 255, 255 taste_description = "blood" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/wittel name = "Wittel" @@ -2819,6 +2975,7 @@ color = COLOR_WHITE // rgb: 255, 255, 255 taste_mult = 0 // oderless and tasteless chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/metalgen name = "Metalgen" @@ -2878,6 +3035,7 @@ inverse_chem_val = 0.3 inverse_chem = /datum/reagent/inverse/gravitum chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS self_consuming = TRUE //this works on objects, so it should work on skeletons and robots too /datum/reagent/gravitum/expose_obj(obj/exposed_obj, reac_volume, methods=TOUCH, show_message=TRUE) @@ -2899,6 +3057,7 @@ color = "#E6E6DA" taste_mult = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS // "Second wind" reagent generated when someone suffers a wound. Epinephrine, adrenaline, and stimulants are all already taken so here we are /datum/reagent/determination @@ -2907,6 +3066,7 @@ color = "#D2FFFA" metabolization_rate = 0.75 * REAGENTS_METABOLISM // 5u (WOUND_DETERMINATION_CRITICAL) will last for ~34 seconds chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS self_consuming = TRUE metabolized_traits = list(TRAIT_ANALGESIA) /// Whether we've had at least WOUND_DETERMINATION_SEVERE (2.5u) of determination at any given time. No damage slowdown immunity or indication we're having a second wind if it's just a single moderate wound @@ -2952,6 +3112,7 @@ color = "#1f8016" metabolization_rate = 2.5 * REAGENTS_METABOLISM //0.5u/second chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/eldritch/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, metabolization_ratio) . = ..() @@ -2991,6 +3152,7 @@ taste_description = "a strong chemical taste" color = "#1f8016" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS //Colours things by their pH /datum/reagent/universal_indicator/expose_atom(atom/exposed_atom, reac_volume) @@ -3131,6 +3293,7 @@ color = "#228f63" metabolization_rate = 0.5 * REAGENTS_METABOLISM chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/stimulants = 120) /datum/reagent/kronkus_extract/on_mob_life(mob/living/carbon/kronkus_enjoyer, seconds_per_tick, metabolization_ratio) @@ -3147,6 +3310,7 @@ color = "#522546" taste_description = "burning" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/brimdust/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -3205,6 +3369,7 @@ material = /datum/material/hauntium ph = 10 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS //gives 20 seconds of haunting effect for every unit of it that touches an item /datum/reagent/hauntium/expose_obj(obj/exposed_obj, reac_volume, methods=TOUCH, show_message=TRUE) @@ -3254,6 +3419,7 @@ metabolization_rate = 0.3 * REAGENTS_METABOLISM ph = 3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS overdose_threshold = 50 // GLOW GLOW GLOW metabolized_traits = list(TRAIT_MINOR_NIGHT_VISION) self_consuming = TRUE diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm index d5a7e2f84f0..9066ff6a28b 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm @@ -3,6 +3,7 @@ name = "Thermite" description = "Thermite produces an aluminothermic reaction known as a thermite reaction. Can be used to melt walls." chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS color = "#550000" taste_description = "sweet tasting metal" @@ -23,6 +24,7 @@ color = COLOR_GRAY taste_description = "oil" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/nitroglycerin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -39,6 +41,7 @@ color = COLOR_YELLOW taste_description = "metal" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS //It has stable IN THE NAME. IT WAS MADE FOR THIS MOMENT. /datum/reagent/stabilizing_agent/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) @@ -52,6 +55,7 @@ taste_description = "burning" penetrates_skin = NONE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/clf3/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -88,6 +92,7 @@ color = "#5A64C8" taste_description = "air and bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/sorium/on_spark_act(power_charge, spark_flags) var/range = clamp(sqrt(volume), 1, 6) @@ -100,6 +105,7 @@ color = "#210021" taste_description = "compressed bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/liquid_dark_matter/on_spark_act(power_charge, spark_flags) var/range = clamp(sqrt(volume / 2), 1, 6) @@ -113,6 +119,7 @@ metabolization_rate = 0.125 * REAGENTS_METABOLISM taste_description = "salt" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/gunpowder/on_new(data) . = ..() @@ -158,6 +165,7 @@ color = COLOR_WHITE taste_description = "salt" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/rdx/on_spark_act(power_charge, spark_flags) if (power_charge) @@ -176,6 +184,7 @@ color = COLOR_WHITE taste_description = "death" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/tatp/on_spark_act(power_charge, spark_flags) reagent_explode(holder, volume, strengthdiv = 1.5 + rand() * 1.5, clear_holder_reagents = FALSE, flame_factor = 1) @@ -187,6 +196,7 @@ color = "#C8C8C8" taste_description = "salt" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/flash_powder/on_spark_act(power_charge, spark_flags) // Even weaker version of the normal flash effect @@ -217,6 +227,7 @@ color = "#C8C8C8" taste_description = "smoke" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/smoke_powder/on_spark_act(power_charge, spark_flags) // Can't really make a cloud of smoke if we're inside of an enclosed container @@ -239,6 +250,7 @@ color = "#C8C8C8" taste_description = "loud noises" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/sonic_powder/on_spark_act(power_charge, spark_flags) // Even weaker version of the normal flash effect @@ -255,6 +267,7 @@ taste_description = "burning" self_consuming = TRUE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/phlogiston/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message = TRUE, touch_protection = 0) . = ..() @@ -290,6 +303,7 @@ self_consuming = TRUE penetrates_skin = NONE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS // why, just why /datum/reagent/napalm/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) @@ -336,6 +350,7 @@ inverse_chem = /datum/reagent/inverse/cryostylane burning_volume = 0.05 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED | REAGENT_DEAD_PROCESS + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/cryostylane/burn(datum/reagents/holder) if(holder.has_reagent(/datum/reagent/oxygen)) @@ -389,6 +404,7 @@ burning_temperature = null burning_volume = 0.05 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/pyrosium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -414,6 +430,7 @@ self_consuming = TRUE var/shock_timer = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/teslium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -456,6 +473,7 @@ color = "#CAFF43" taste_description = "jelly" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/teslium/energized_jelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) if(!isjellyperson(affected_mob)) //everyone but jellypeople get shocked as normal. @@ -474,6 +492,7 @@ color = "#A6FAFF55" taste_description = "the inside of a fire extinguisher" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/firefighting_foam/expose_turf(turf/open/exposed_turf, reac_volume) . = ..() diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 8f17c5da0ec..4c95b21afe7 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -8,6 +8,7 @@ taste_description = "bitterness" taste_mult = 1.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS ///The amount of toxin damage this will cause when metabolized (also used to calculate liver damage) var/toxpwr = 1.5 ///The amount to multiply the liver damage this toxin does by (Handled solely in liver code) @@ -37,6 +38,7 @@ taste_description = "mushroom" ph = 13 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/mutagen name = "Unstable Mutagen" @@ -49,6 +51,7 @@ taste_mult = 0.9 ph = 2.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/mutagen/expose_mob(mob/living/carbon/exposed_mob, methods=TOUCH, reac_volume, show_message = TRUE, touch_protection = 0) . = ..() @@ -98,6 +101,7 @@ burning_temperature = 4500//plasma is hot!! burning_volume = 0.3//But burns fast chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/plasma/on_new(data) . = ..() @@ -193,6 +197,7 @@ toxpwr = 3 material = /datum/material/hot_ice chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/hot_ice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -223,6 +228,7 @@ taste_description = "acid" ph = 1.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/lexorin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -254,6 +260,7 @@ taste_mult = 1.3 ph = 10 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/slimejelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -274,6 +281,7 @@ taste_description = "fish" ph = 12 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/carpotoxin/on_mob_add(mob/living/affected_mob, amount) . = ..() @@ -292,6 +300,7 @@ penetrates_skin = NONE ph = 13 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/zombiepowder/expose_mob(mob/living/exposed_mob, methods, reac_volume, show_message, touch_protection) . = ..() @@ -354,6 +363,7 @@ taste_description = "death" ph = 14.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_FAKEDEATH) /datum/reagent/toxin/ghoulpowder/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -372,6 +382,7 @@ ph = 11 inverse_chem = /datum/reagent/impurity/rosenol chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/hallucinogens = 60) metabolized_traits = list(TRAIT_RDS_SUPPRESSED) @@ -407,6 +418,7 @@ penetrates_skin = NONE ph = 2.7 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS // Plant-B-Gone is just as bad /datum/reagent/toxin/plantbgone/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) @@ -449,6 +461,7 @@ color = "#4B004B" // rgb: 75, 0, 75 ph = 3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS //Weed Spray /datum/reagent/toxin/plantbgone/weedkiller/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) @@ -462,6 +475,7 @@ toxpwr = 1 ph = 3.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/pestkiller/on_new(data) . = ..() @@ -483,6 +497,7 @@ color = "#4b2400" // rgb: 75, 0, 75 toxpwr = 1 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS //Pest Spray /datum/reagent/toxin/pestkiller/organic/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) @@ -498,6 +513,7 @@ liver_damage_multiplier = 0.7 taste_description = "spores" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/spore/expose_mob(mob/living/spore_lung_victim, methods, reac_volume, show_message, touch_protection) . = ..() @@ -526,6 +542,7 @@ taste_description = "burning" ph = 13 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/spore_burning/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -544,6 +561,7 @@ ph = 11 inverse_chem = /datum/reagent/impurity/chloralax chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/chloralhydrate/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -566,6 +584,7 @@ taste_description = "piss water" ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/glass_style/drinking_glass/fakebeer required_drink_type = /datum/reagent/toxin/fakebeer @@ -596,6 +615,7 @@ toxpwr = 0.5 ph = 4.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_STIMULATED) /datum/reagent/toxin/teapowder @@ -606,6 +626,7 @@ taste_description = "green tea" ph = 4.9 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_STIMULATED) /datum/reagent/toxin/mushroom_powder @@ -616,6 +637,7 @@ taste_description = "mushrooms" ph = 8.0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/mutetoxin //the new zombie powder. name = "Mute Toxin" @@ -628,6 +650,7 @@ taste_description = "silence" ph = 12.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/mutetoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -642,6 +665,7 @@ data = 15 toxpwr = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/staminatoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -656,6 +680,7 @@ metabolization_rate = 0.125 * REAGENTS_METABOLISM toxpwr = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /// How radioactive is this reagent var/rad_power = 3 @@ -710,6 +735,7 @@ overdose_threshold = 30 toxpwr = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/histamine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -751,6 +777,7 @@ ph = 2.0 inverse_chem = /datum/reagent/impurity/methanol chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/formaldehyde/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) var/obj/item/organ/liver/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER) @@ -776,6 +803,7 @@ metabolization_rate = 0.25 * REAGENTS_METABOLISM toxpwr = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS ///Mob Size of the current mob sprite. var/current_size = RESIZE_DEFAULT_SIZE @@ -810,6 +838,7 @@ toxpwr = 0 ph = 9 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS addiction_types = list(/datum/addiction/opioids = 25) /datum/reagent/toxin/fentanyl/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -835,6 +864,7 @@ toxpwr = 1.25 ph = 9.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/cyanide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -857,6 +887,7 @@ toxpwr = 0.5 taste_description = "bad cooking" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/itching_powder name = "Itching Powder" @@ -870,6 +901,7 @@ ph = 7 penetrates_skin = TOUCH|VAPOR chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/itching_powder/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) var/scratched = FALSE @@ -901,6 +933,7 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM toxpwr = 2.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/initropidril/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -935,6 +968,7 @@ toxpwr = 0 taste_mult = 0 // undetectable, I guess? chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/pancuronium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -952,6 +986,7 @@ metabolization_rate = 0.75 * REAGENTS_METABOLISM toxpwr = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS added_traits = list(TRAIT_ANTICONVULSANT) /datum/reagent/toxin/sodium_thiopental/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -972,6 +1007,7 @@ toxpwr = 0.5 ph = 6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/sulfonal/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -986,6 +1022,7 @@ toxpwr = 0 metabolization_rate = 0.5 * REAGENTS_METABOLISM chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS var/delayed_toxin_damage = 0 /datum/reagent/toxin/amanitin/on_mob_life(mob/living/affected_mob, seconds_per_tick, metabolization_ratio) @@ -1010,6 +1047,7 @@ ph = 6 inverse_chem = /datum/reagent/impurity/ipecacide chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/lipolicide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1026,6 +1064,7 @@ metabolization_rate = 0.06 * REAGENTS_METABOLISM toxpwr = 1.75 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/coniine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1041,6 +1080,7 @@ toxpwr = 0 taste_description = "vomit" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/spewium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1070,6 +1110,7 @@ metabolization_rate = 0.125 * REAGENTS_METABOLISM toxpwr = 1 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/curare/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1090,6 +1131,7 @@ toxpwr = 0 ph = 11.6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_BLOOD_FOUNTAIN) /datum/reagent/toxin/heparin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -1109,6 +1151,7 @@ ph = 6.2 taste_description = "spinning" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/rotatium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1138,6 +1181,7 @@ toxpwr = 0.15 ph = 8 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/anacea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) var/remove_amt = 5 @@ -1159,6 +1203,7 @@ self_consuming = TRUE ph = 2.75 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS var/acidpwr = 10 //the amount of protection removed from the armour // ...Why? I mean, clearly someone had to have done this and thought, well, @@ -1208,6 +1253,7 @@ acidpwr = 42.0 ph = 0.0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS // SERIOUSLY /datum/reagent/toxin/acid/fluacid/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) @@ -1230,6 +1276,7 @@ acidpwr = 5.0 ph = 1.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/acid/nitracid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1242,6 +1289,7 @@ metabolization_rate = 0 //stays in the system until active. toxpwr = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/delayed/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1265,6 +1313,7 @@ ph = 1.7 taste_description = "stillness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS metabolized_traits = list(TRAIT_EMOTEMUTE) /datum/reagent/toxin/bonehurtingjuice //oof ouch @@ -1279,6 +1328,7 @@ taste_description = "bone hurting" overdose_threshold = 50 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/bonehurtingjuice/on_mob_add(mob/living/carbon/affected_mob) . = ..() @@ -1327,6 +1377,7 @@ toxpwr = 0 taste_description = "tannin" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/bungotoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1351,6 +1402,7 @@ taste_mult = 1.3 taste_description = "sugary sweetness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS /datum/reagent/toxin/leadacetate/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1392,6 +1444,7 @@ toxpwr = 0 taste_mult = 0 chemical_flags = REAGENT_NO_RANDOM_RECIPE|REAGENT_CAN_BE_SYNTHESIZED + randomized_spawns = REAGENT_SPAWN_ALL_RANDOM_SPAWNS var/list/traits_not_applied = list( TRAIT_PARALYSIS_L_ARM = BODY_ZONE_L_ARM, TRAIT_PARALYSIS_R_ARM = BODY_ZONE_R_ARM, diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 85a390bacca..e2871b3b369 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -353,17 +353,22 @@ name = "maintenance pill" desc = "A strange pill found in the depths of maintenance." icon_state = "pill21" + /// From which randomisation pool to pull reagents from + var/random_reagent_flag = REAGENT_SPAWN_RANDOM_PRODUCERS var/static/list/names = list("maintenance pill", "floor pill", "mystery pill", "suspicious pill", "strange pill", "lucky pill", "ominous pill", "eerie pill") var/static/list/descs = list("Your feeling is telling you no, but...","Drugs are expensive, you can't afford not to eat any pills that you find."\ , "Surely, there's no way this could go bad.", "Winners don't do dr- oh what the heck!", "Free pills? At no cost, how could I lose?") /obj/item/reagent_containers/applicator/pill/maintenance/Initialize(mapload) - list_reagents = list(get_random_reagent_id() = rand(10,50)) //list_reagents is called before init, because init generates the reagents using list_reagents + list_reagents = list(get_random_reagent_id(random_reagent_flag) = rand(10,50)) //list_reagents is called before init, because init generates the reagents using list_reagents . = ..() name = pick(names) if(prob(30)) desc = pick(descs) +/obj/item/reagent_containers/applicator/pill/maintenance/achievement + random_reagent_flag = REAGENT_SPAWN_MAINTENANCE_PILL //none of that fake shit + /obj/item/reagent_containers/applicator/pill/maintenance/achievement/on_consumption(mob/consumer, mob/user) . = ..() consumer.client?.give_award(/datum/award/score/maintenance_pill, consumer) diff --git a/code/modules/research/relics.dm b/code/modules/research/relics.dm index d3941650c73..ff092fac4a4 100644 --- a/code/modules/research/relics.dm +++ b/code/modules/research/relics.dm @@ -184,7 +184,7 @@ /obj/item/relic/proc/dispense_drink(obj/item/reagent_containers/cup/glass/glasser) playsound(glasser, 'sound/effects/phasein.ogg', rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - glasser.reagents.add_reagent(get_random_drink_id(), rand(glasser.volume * 0.3, glasser.volume)) + glasser.reagents.add_reagent(get_random_reagent_id(whitelist = subtypesof(/datum/reagent/consumable/ethanol)), rand(glasser.volume * 0.3, glasser.volume)) throw_smoke(get_turf(glasser)) // Scrambles your organs. 33% chance to delete after use.