diff --git a/code/game/objects/items/cigarettes.dm b/code/game/objects/items/cigarettes.dm index 92f43fc9906..5275f69df20 100644 --- a/code/game/objects/items/cigarettes.dm +++ b/code/game/objects/items/cigarettes.dm @@ -668,8 +668,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM chem_volume = 60 lung_harm = 2.5 list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/consumable/menthol = 6, /datum/reagent/medicine/oculine = 1) + +/obj/item/cigarette/greytide/Initialize(mapload) + . = ..() /// Weighted list of random reagents to add - var/static/list/possible_reagents = list( + var/list/possible_reagents = list( /datum/reagent/toxin/fentanyl = 2, /datum/reagent/glitter/random = 2, /datum/reagent/drug/aranesp = 2, @@ -685,9 +688,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM /datum/reagent/consumable/mintextract = 2, /datum/reagent/pax = 1, ) - -/obj/item/cigarette/greytide/Initialize(mapload) - . = ..() if(prob(40)) reagents.add_reagent(pick_weight(possible_reagents), rand(10, 15)) diff --git a/code/game/objects/items/robot/items/hypo.dm b/code/game/objects/items/robot/items/hypo.dm index 2c80fdc35e4..cbee8cd55d2 100644 --- a/code/game/objects/items/robot/items/hypo.dm +++ b/code/game/objects/items/robot/items/hypo.dm @@ -6,7 +6,7 @@ /datum/reagent/medicine/c2/libital,\ /datum/reagent/medicine/c2/multiver,\ /datum/reagent/medicine/salglu_solution,\ - /datum/reagent/medicine/spaceacillin\ + /datum/reagent/medicine/spaceacillin,\ ) #define EXPANDED_MEDICAL_REAGENTS list(\ /datum/reagent/medicine/haloperidol,\ @@ -17,7 +17,7 @@ /datum/reagent/medicine/oxandrolone,\ /datum/reagent/medicine/pen_acid,\ /datum/reagent/medicine/rezadone,\ - /datum/reagent/medicine/sal_acid\ + /datum/reagent/medicine/sal_acid,\ ) #define HACKED_MEDICAL_REAGENTS list(\ /datum/reagent/toxin/cyanide,\ @@ -25,31 +25,31 @@ /datum/reagent/toxin/heparin,\ /datum/reagent/toxin/lexorin,\ /datum/reagent/toxin/mutetoxin,\ - /datum/reagent/toxin/sodium_thiopental\ + /datum/reagent/toxin/sodium_thiopental,\ ) #define BASE_PEACE_REAGENTS list(\ /datum/reagent/peaceborg/confuse,\ /datum/reagent/pax/peaceborg,\ - /datum/reagent/peaceborg/tire\ + /datum/reagent/peaceborg/tire,\ ) #define HACKED_PEACE_REAGENTS list(\ /datum/reagent/toxin/cyanide,\ /datum/reagent/toxin/fentanyl,\ /datum/reagent/toxin/sodium_thiopental,\ /datum/reagent/toxin/staminatoxin,\ - /datum/reagent/toxin/sulfonal\ + /datum/reagent/toxin/sulfonal,\ ) #define BASE_CLOWN_REAGENTS list(\ - /datum/reagent/consumable/laughter\ + /datum/reagent/consumable/laughter,\ ) #define HACKED_CLOWN_REAGENTS list(\ - /datum/reagent/consumable/superlaughter\ + /datum/reagent/consumable/superlaughter,\ ) #define BASE_SYNDICATE_REAGENTS list(\ /datum/reagent/medicine/inacusiate,\ /datum/reagent/medicine/morphine,\ /datum/reagent/medicine/potass_iodide,\ - /datum/reagent/medicine/syndicate_nanites\ + /datum/reagent/medicine/syndicate_nanites,\ ) #define BASE_SERVICE_REAGENTS list(/datum/reagent/consumable/applejuice, /datum/reagent/consumable/banana,\ /datum/reagent/consumable/berryjuice, /datum/reagent/consumable/cherryjelly, /datum/reagent/consumable/coffee,\ diff --git a/code/modules/antagonists/abductor/equipment/glands/chem.dm b/code/modules/antagonists/abductor/equipment/glands/chem.dm index 5bd5a618e16..9f06fcf13da 100644 --- a/code/modules/antagonists/abductor/equipment/glands/chem.dm +++ b/code/modules/antagonists/abductor/equipment/glands/chem.dm @@ -6,12 +6,14 @@ icon_state = "viral" mind_control_uses = 3 mind_control_duration = 1200 - var/list/possible_reagents = list() + var/static/list/possible_reagents /obj/item/organ/heart/gland/chem/Initialize(mapload) . = ..() - for(var/R in subtypesof(/datum/reagent/drug) + subtypesof(/datum/reagent/medicine) + typesof(/datum/reagent/toxin)) - possible_reagents += R + if(!LAZYLEN(possible_reagents)) + LAZYINITLIST(possible_reagents) + for(var/reagent_path in subtypesof(/datum/reagent/drug) + subtypesof(/datum/reagent/medicine) + typesof(/datum/reagent/toxin)) + possible_reagents += reagent_path /obj/item/organ/heart/gland/chem/activate() var/chem_to_add = pick(possible_reagents) diff --git a/code/modules/bitrunning/objects/gimmick_disks/dungeon_disk.dm b/code/modules/bitrunning/objects/gimmick_disks/dungeon_disk.dm index b0968de86dd..fac8110c90f 100644 --- a/code/modules/bitrunning/objects/gimmick_disks/dungeon_disk.dm +++ b/code/modules/bitrunning/objects/gimmick_disks/dungeon_disk.dm @@ -30,8 +30,9 @@ name = "unlabeled bottle" desc = "A small bottle. You don't remember what you put in it." +/obj/item/reagent_containers/cup/bottle/alchemist_basic/add_initial_reagents() /// List of possible reagents we may pick from - var/static/list/possible_reagents = list( + var/list/possible_reagents = list( /datum/reagent/aluminium, // Basic chems /datum/reagent/bromine, /datum/reagent/carbon, @@ -63,7 +64,6 @@ /datum/reagent/consumable/coffee, ) -/obj/item/reagent_containers/cup/bottle/alchemist_basic/add_initial_reagents() var/our_reagent = pick(possible_reagents) reagents.add_reagent(our_reagent, 50) diff --git a/code/modules/cargo/bounties/reagent.dm b/code/modules/cargo/bounties/reagent.dm index 88d416621ec..4f34ee452a8 100644 --- a/code/modules/cargo/bounties/reagent.dm +++ b/code/modules/cargo/bounties/reagent.dm @@ -32,58 +32,59 @@ /datum/bounty/reagent/simple_drink/New() // Don't worry about making this comprehensive. It doesn't matter if some drinks are skipped. - var/static/list/possible_reagents = list(\ - /datum/reagent/consumable/ethanol/antifreeze,\ - /datum/reagent/consumable/ethanol/andalusia,\ - /datum/reagent/consumable/tea/arnold_palmer,\ - /datum/reagent/consumable/ethanol/b52,\ - /datum/reagent/consumable/ethanol/bananahonk,\ - /datum/reagent/consumable/ethanol/beepsky_smash,\ - /datum/reagent/consumable/ethanol/between_the_sheets,\ - /datum/reagent/consumable/ethanol/bilk,\ - /datum/reagent/consumable/ethanol/black_russian,\ - /datum/reagent/consumable/ethanol/bloody_mary,\ - /datum/reagent/consumable/ethanol/brave_bull,\ - /datum/reagent/consumable/ethanol/martini,\ - /datum/reagent/consumable/ethanol/cuba_libre,\ - /datum/reagent/consumable/ethanol/eggnog,\ - /datum/reagent/consumable/ethanol/erikasurprise,\ - /datum/reagent/consumable/ethanol/ginfizz,\ - /datum/reagent/consumable/ethanol/gintonic,\ - /datum/reagent/consumable/ethanol/grappa,\ - /datum/reagent/consumable/ethanol/grog,\ - /datum/reagent/consumable/ethanol/hooch,\ - /datum/reagent/consumable/ethanol/iced_beer,\ - /datum/reagent/consumable/ethanol/irishcarbomb,\ - /datum/reagent/consumable/ethanol/manhattan,\ - /datum/reagent/consumable/ethanol/margarita,\ - /datum/reagent/consumable/ethanol/gargle_blaster,\ - /datum/reagent/consumable/ethanol/rum_coke,\ - /datum/reagent/consumable/ethanol/screwdrivercocktail,\ - /datum/reagent/consumable/ethanol/snowwhite,\ - /datum/reagent/consumable/soy_latte,\ - /datum/reagent/consumable/cafe_latte,\ - /datum/reagent/consumable/ethanol/syndicatebomb,\ - /datum/reagent/consumable/ethanol/tequila_sunrise,\ - /datum/reagent/consumable/ethanol/manly_dorf,\ - /datum/reagent/consumable/ethanol/thirteenloko,\ - /datum/reagent/consumable/triple_citrus,\ - /datum/reagent/consumable/ethanol/vodkamartini,\ - /datum/reagent/consumable/ethanol/whiskeysoda,\ - /datum/reagent/consumable/ethanol/beer/green,\ - /datum/reagent/consumable/ethanol/demonsblood,\ - /datum/reagent/consumable/ethanol/crevice_spike,\ - /datum/reagent/consumable/ethanol/singulo,\ - /datum/reagent/consumable/ethanol/whiskey_sour,\ - /datum/reagent/consumable/ethanol/boston_sour,\ - /datum/reagent/consumable/ethanol/old_fashioned,\ - /datum/reagent/consumable/ethanol/sazerac,\ - /datum/reagent/consumable/ethanol/hot_toddy,\ - /datum/reagent/consumable/ethanol/daiquiri,\ - /datum/reagent/consumable/ethanol/blue_blazer,\ - /datum/reagent/consumable/ethanol/flip_cocktail,\ - /datum/reagent/consumable/ethanol/bitters_soda,\ - /datum/chemical_reaction/drink/star) + var/list/possible_reagents = list( + /datum/reagent/consumable/ethanol/antifreeze, + /datum/reagent/consumable/ethanol/andalusia, + /datum/reagent/consumable/tea/arnold_palmer, + /datum/reagent/consumable/ethanol/b52, + /datum/reagent/consumable/ethanol/bananahonk, + /datum/reagent/consumable/ethanol/beepsky_smash, + /datum/reagent/consumable/ethanol/between_the_sheets, + /datum/reagent/consumable/ethanol/bilk, + /datum/reagent/consumable/ethanol/black_russian, + /datum/reagent/consumable/ethanol/bloody_mary, + /datum/reagent/consumable/ethanol/brave_bull, + /datum/reagent/consumable/ethanol/martini, + /datum/reagent/consumable/ethanol/cuba_libre, + /datum/reagent/consumable/ethanol/eggnog, + /datum/reagent/consumable/ethanol/erikasurprise, + /datum/reagent/consumable/ethanol/ginfizz, + /datum/reagent/consumable/ethanol/gintonic, + /datum/reagent/consumable/ethanol/grappa, + /datum/reagent/consumable/ethanol/grog, + /datum/reagent/consumable/ethanol/hooch, + /datum/reagent/consumable/ethanol/iced_beer, + /datum/reagent/consumable/ethanol/irishcarbomb, + /datum/reagent/consumable/ethanol/manhattan, + /datum/reagent/consumable/ethanol/margarita, + /datum/reagent/consumable/ethanol/gargle_blaster, + /datum/reagent/consumable/ethanol/rum_coke, + /datum/reagent/consumable/ethanol/screwdrivercocktail, + /datum/reagent/consumable/ethanol/snowwhite, + /datum/reagent/consumable/soy_latte, + /datum/reagent/consumable/cafe_latte, + /datum/reagent/consumable/ethanol/syndicatebomb, + /datum/reagent/consumable/ethanol/tequila_sunrise, + /datum/reagent/consumable/ethanol/manly_dorf, + /datum/reagent/consumable/ethanol/thirteenloko, + /datum/reagent/consumable/triple_citrus, + /datum/reagent/consumable/ethanol/vodkamartini, + /datum/reagent/consumable/ethanol/whiskeysoda, + /datum/reagent/consumable/ethanol/beer/green, + /datum/reagent/consumable/ethanol/demonsblood, + /datum/reagent/consumable/ethanol/crevice_spike, + /datum/reagent/consumable/ethanol/singulo, + /datum/reagent/consumable/ethanol/whiskey_sour, + /datum/reagent/consumable/ethanol/boston_sour, + /datum/reagent/consumable/ethanol/old_fashioned, + /datum/reagent/consumable/ethanol/sazerac, + /datum/reagent/consumable/ethanol/hot_toddy, + /datum/reagent/consumable/ethanol/daiquiri, + /datum/reagent/consumable/ethanol/blue_blazer, + /datum/reagent/consumable/ethanol/flip_cocktail, + /datum/reagent/consumable/ethanol/bitters_soda, + /datum/chemical_reaction/drink/star, + ) var/reagent_type = pick(possible_reagents) wanted_reagent = new reagent_type @@ -97,30 +98,31 @@ /datum/bounty/reagent/complex_drink/New() // Don't worry about making this comprehensive. It doesn't matter if some drinks are skipped. - var/static/list/possible_reagents = list(\ - /datum/reagent/consumable/ethanol/atomicbomb,\ - /datum/reagent/consumable/ethanol/bacchus_blessing,\ - /datum/reagent/consumable/ethanol/bastion_bourbon,\ - /datum/reagent/consumable/ethanol/booger,\ - /datum/reagent/consumable/ethanol/hippies_delight,\ - /datum/reagent/consumable/ethanol/drunkenblumpkin,\ - /datum/reagent/consumable/ethanol/fetching_fizz,\ - /datum/reagent/consumable/ethanol/goldschlager,\ - /datum/reagent/consumable/ethanol/manhattan_proj,\ - /datum/reagent/consumable/ethanol/narsour,\ - /datum/reagent/consumable/ethanol/neurotoxin,\ - /datum/reagent/consumable/ethanol/patron,\ - /datum/reagent/consumable/ethanol/quadruple_sec,\ - /datum/reagent/consumable/bluecherryshake,\ - /datum/reagent/consumable/doctor_delight,\ - /datum/reagent/consumable/ethanol/silencer,\ - /datum/reagent/consumable/ethanol/peppermint_patty,\ - /datum/reagent/consumable/ethanol/aloe,\ - /datum/reagent/consumable/pumpkin_latte,\ - /datum/reagent/consumable/ethanol/ramos_gin_fizz,\ - /datum/reagent/consumable/ethanol/sangria,\ - /datum/reagent/consumable/ethanol/tizirian_sour,\ - /datum/chemical_reaction/drink/suffering_bastard) + var/list/possible_reagents = list( + /datum/reagent/consumable/ethanol/atomicbomb, + /datum/reagent/consumable/ethanol/bacchus_blessing, + /datum/reagent/consumable/ethanol/bastion_bourbon, + /datum/reagent/consumable/ethanol/booger, + /datum/reagent/consumable/ethanol/hippies_delight, + /datum/reagent/consumable/ethanol/drunkenblumpkin, + /datum/reagent/consumable/ethanol/fetching_fizz, + /datum/reagent/consumable/ethanol/goldschlager, + /datum/reagent/consumable/ethanol/manhattan_proj, + /datum/reagent/consumable/ethanol/narsour, + /datum/reagent/consumable/ethanol/neurotoxin, + /datum/reagent/consumable/ethanol/patron, + /datum/reagent/consumable/ethanol/quadruple_sec, + /datum/reagent/consumable/bluecherryshake, + /datum/reagent/consumable/doctor_delight, + /datum/reagent/consumable/ethanol/silencer, + /datum/reagent/consumable/ethanol/peppermint_patty, + /datum/reagent/consumable/ethanol/aloe, + /datum/reagent/consumable/pumpkin_latte, + /datum/reagent/consumable/ethanol/ramos_gin_fizz, + /datum/reagent/consumable/ethanol/sangria, + /datum/reagent/consumable/ethanol/tizirian_sour, + /datum/chemical_reaction/drink/suffering_bastard, + ) var/reagent_type = pick(possible_reagents) wanted_reagent = new reagent_type @@ -135,29 +137,30 @@ /datum/bounty/reagent/chemical_simple/New() // Chemicals that can be mixed by a single skilled Chemist. - var/static/list/possible_reagents = list(\ - /datum/reagent/medicine/leporazine,\ - /datum/reagent/medicine/mine_salve,\ - /datum/reagent/medicine/c2/convermol,\ - /datum/reagent/medicine/ephedrine,\ - /datum/reagent/medicine/diphenhydramine,\ - /datum/reagent/drug/space_drugs,\ - /datum/reagent/drug/blastoff,\ - /datum/reagent/gunpowder,\ - /datum/reagent/napalm,\ - /datum/reagent/firefighting_foam,\ - /datum/reagent/consumable/mayonnaise,\ - /datum/reagent/toxin/itching_powder,\ - /datum/reagent/toxin/cyanide,\ - /datum/reagent/toxin/heparin,\ - /datum/reagent/medicine/pen_acid,\ - /datum/reagent/medicine/atropine,\ - /datum/reagent/drug/aranesp,\ - /datum/reagent/drug/krokodil,\ - /datum/reagent/drug/methamphetamine,\ - /datum/reagent/teslium,\ - /datum/reagent/toxin/anacea,\ - /datum/reagent/pax) + var/list/possible_reagents = list( + /datum/reagent/medicine/leporazine, + /datum/reagent/medicine/mine_salve, + /datum/reagent/medicine/c2/convermol, + /datum/reagent/medicine/ephedrine, + /datum/reagent/medicine/diphenhydramine, + /datum/reagent/drug/space_drugs, + /datum/reagent/drug/blastoff, + /datum/reagent/gunpowder, + /datum/reagent/napalm, + /datum/reagent/firefighting_foam, + /datum/reagent/consumable/mayonnaise, + /datum/reagent/toxin/itching_powder, + /datum/reagent/toxin/cyanide, + /datum/reagent/toxin/heparin, + /datum/reagent/medicine/pen_acid, + /datum/reagent/medicine/atropine, + /datum/reagent/drug/aranesp, + /datum/reagent/drug/krokodil, + /datum/reagent/drug/methamphetamine, + /datum/reagent/teslium, + /datum/reagent/toxin/anacea, + /datum/reagent/pax, + ) var/reagent_type = pick(possible_reagents) wanted_reagent = new reagent_type @@ -172,23 +175,24 @@ /datum/bounty/reagent/chemical_complex/New() // Reagents that require interaction with multiple departments or are a pain to mix. Lower required_volume since acquiring 30u of some is unrealistic - var/static/list/possible_reagents = list(\ - /datum/reagent/medicine/pyroxadone,\ - /datum/reagent/medicine/rezadone,\ - /datum/reagent/medicine/regen_jelly,\ - /datum/reagent/drug/bath_salts,\ - /datum/reagent/hair_dye,\ - /datum/reagent/consumable/honey,\ - /datum/reagent/consumable/frostoil,\ - /datum/reagent/toxin/slimejelly,\ - /datum/reagent/teslium/energized_jelly,\ - /datum/reagent/toxin/mimesbane,\ - /datum/reagent/medicine/strange_reagent,\ - /datum/reagent/nitroglycerin,\ - /datum/reagent/medicine/rezadone,\ - /datum/reagent/toxin/zombiepowder,\ - /datum/reagent/toxin/ghoulpowder,\ - /datum/reagent/mulligan) + var/list/possible_reagents = list( + /datum/reagent/medicine/pyroxadone, + /datum/reagent/medicine/rezadone, + /datum/reagent/medicine/regen_jelly, + /datum/reagent/drug/bath_salts, + /datum/reagent/hair_dye, + /datum/reagent/consumable/honey, + /datum/reagent/consumable/frostoil, + /datum/reagent/toxin/slimejelly, + /datum/reagent/teslium/energized_jelly, + /datum/reagent/toxin/mimesbane, + /datum/reagent/medicine/strange_reagent, + /datum/reagent/nitroglycerin, + /datum/reagent/medicine/rezadone, + /datum/reagent/toxin/zombiepowder, + /datum/reagent/toxin/ghoulpowder, + /datum/reagent/mulligan, + ) var/reagent_type = pick(possible_reagents) wanted_reagent = new reagent_type @@ -230,22 +234,23 @@ /datum/bounty/pill/simple_pill/New() //reagent that are possible to be chem factory'd - var/static/list/possible_reagents = list(\ - /datum/reagent/medicine/spaceacillin,\ - /datum/reagent/medicine/c2/synthflesh,\ - /datum/reagent/medicine/pen_acid,\ - /datum/reagent/medicine/atropine,\ - /datum/reagent/medicine/cryoxadone,\ - /datum/reagent/medicine/salbutamol,\ - /datum/reagent/medicine/c2/hercuri,\ - /datum/reagent/medicine/c2/probital,\ - /datum/reagent/drug/methamphetamine,\ - /datum/reagent/nitrous_oxide,\ - /datum/reagent/barbers_aid,\ - /datum/reagent/pax,\ - /datum/reagent/flash_powder,\ - /datum/reagent/phlogiston,\ - /datum/reagent/firefighting_foam) + var/list/possible_reagents = list( + /datum/reagent/medicine/spaceacillin, + /datum/reagent/medicine/c2/synthflesh, + /datum/reagent/medicine/pen_acid, + /datum/reagent/medicine/atropine, + /datum/reagent/medicine/cryoxadone, + /datum/reagent/medicine/salbutamol, + /datum/reagent/medicine/c2/hercuri, + /datum/reagent/medicine/c2/probital, + /datum/reagent/drug/methamphetamine, + /datum/reagent/nitrous_oxide, + /datum/reagent/barbers_aid, + /datum/reagent/pax, + /datum/reagent/flash_powder, + /datum/reagent/phlogiston, + /datum/reagent/firefighting_foam, + ) var/datum/reagent/reagent_type = pick(possible_reagents) wanted_reagent = new reagent_type