diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index d04c2394..794395ba 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -81807,7 +81807,7 @@ /obj/item/reagent_containers/food/drinks/beer{ desc = "Whatever it is, it reeks of foul, putrid froth."; icon_state = "beer"; - list_reagents = list("bacchus_blessing" = 15); + list_reagents = list(/datum/reagent/consumable/ethanol/bacchus_blessing = 15); name = "Delta-Down"; pixel_x = 5; pixel_y = 5 diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 2e2a4b34..e269612b 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -481,7 +481,7 @@ lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' isGlass = FALSE - list_reagents = list("pineapplejuice" = 100) + list_reagents = list(/datum/reagent/consumable/pineapplejuice = 100) foodtype = FRUIT | PINEAPPLE /obj/item/reagent_containers/food/drinks/bottle/strawberryjuice @@ -492,7 +492,7 @@ lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' isGlass = FALSE - list_reagents = list("strawberryjuice" = 100) + list_reagents = list(/datum/reagent/consumable/strawberryjuice = 100) foodtype = FRUIT /obj/item/reagent_containers/food/drinks/bottle/grenadine diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index b0644dc3..75a02d7b 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -185,8 +185,8 @@ icon = 'icons/obj/food/burgerbread.dmi' icon_state = "garlicbread" item_state = "garlicbread" - bonus_reagents = list("nutriment" = 5, "vitamin" = 2) - list_reagents = list("nutriment" = 5, "vitamin" = 4, "garlic" = 2) + bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 2) + list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/garlic = 2) bitesize = 3 tastes = list("bread" = 1, "garlic" = 1, "butter" = 1) foodtype = GRAIN diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index ba145ca2..eeb69ba8 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -542,7 +542,7 @@ desc = "A sliced piece of juicy pineapple." icon_state = "pineapple_slice" filling_color = "#F6CB0B" - juice_results = list("pineapplejuice" = 3) + juice_results = list(/datum/reagent/consumable/pineapplejuice = 3) tastes = list("pineapple" = 1) foodtype = FRUIT | PINEAPPLE diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm index 40daa8c8..7f47b238 100644 --- a/code/modules/food_and_drinks/food/snacks_vend.dm +++ b/code/modules/food_and_drinks/food/snacks_vend.dm @@ -85,7 +85,7 @@ desc = "fine print: seasoned with nanoscale mechanochemical generators. Not only does it taste good, But also self-heats when opened" icon_state = "soyfood" trash = /obj/item/trash/soy_food - list_reagents = list("nutriment" = 4, "sugar" = 2, "vitamin" = 3) + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/nutriment/vitamin = 3) junkiness = 0 filling_color = "#FFD700" tastes = list("nanomachines" = 2, "soybeans" = 5) @@ -106,7 +106,7 @@ desc = "A self-heating bag of hollowed charcoal noodles with a spicy soy sauce glaze. Does contain small traces of charcoal." icon_state = "carbonnanotube_noodles" trash = /obj/item/trash/carbonnanotube_noodles - list_reagents = list("nutriment" = 5, "charcoal" = 1, "vitamin" = 4) + list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/medicine/charcoal = 1, /datum/reagent/consumable/nutriment/vitamin = 4) junkiness = 0 filling_color = "#FFD700" tastes = list("charcoal" = 1, "spiciness" = 3, "soysauce" = 3) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index a379cdd3..8fbdf02d 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -305,13 +305,13 @@ name = "Painkiller" id = "painkiller" results = list("painkiller" = 10) - required_reagents = list("creme_de_coconut" = 5, "pineapplejuice" = 4, "orangejuice" = 1) + required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 5, /datum/reagent/consumable/pineapplejuice = 4, /datum/reagent/consumable/orangejuice = 1) /datum/chemical_reaction/pina_colada name = "Pina Colada" id = "pina_colada" results = list("pina_colada" = 5) - required_reagents = list("creme_de_coconut" = 1, "pineapplejuice" = 2, "rum" = 1, "limejuice" = 1) + required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 1, /datum/reagent/consumable/pineapplejuice = 2, /datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/limejuice = 1) ////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri///// @@ -497,13 +497,13 @@ name = "Cherry Shake" id = "cherryshake" results = list("cherryshake" = 3) - required_reagents = list("cherryjelly" = 1, "ice" = 1, "cream" = 1) + required_reagents = list(/datum/reagent/consumable/cherryjelly = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1) /datum/chemical_reaction/bluecherryshake name = "Blue Cherry Shake" id = "bluecherryshake" results = list("bluecherryshake" = 3) - required_reagents = list("bluecherryjelly" = 1, "ice" = 1, "cream" = 1) + required_reagents = list(/datum/reagent/consumable/bluecherryjelly = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1) /datum/chemical_reaction/drunkenblumpkin name = "Drunken Blumpkin" @@ -837,54 +837,54 @@ /datum/chemical_reaction/gunfire name = "Gunfire" - id = "gunfire" - results = list("gunfire" = 4) - required_reagents = list("rum" = 1, "tea" = 3) + id = /datum/reagent/consumable/ethanol/gunfire + results = list(/datum/reagent/consumable/ethanol/gunfire = 4) + required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/tea = 3) mix_message = "A loud popping begins to fill the air as the drink is mixed." /datum/chemical_reaction/hellfire name = "Hellfire" - id = "hellfire" - results = list("hellfire" = 4) - required_reagents = list("rum" = 2, "ice" = 1, "crevice_spike" = 1) + id = /datum/reagent/consumable/ethanol/hellfire + results = list(/datum/reagent/consumable/ethanol/hellfire = 4) + required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/ethanol/crevice_spike = 1) mix_message = "The liquid begins to churn as it changes to an amber orange and catches on fire." /datum/chemical_reaction/sins_delight name = "Sins Delight" - id = "sins_delight" - results = list("sins_delight" = 5) - required_reagents = list("demonsblood" = 2, "triple_sec" = 1, "martini" = 1, "changelingsting" = 1) + id = /datum/reagent/consumable/ethanol/sins_delight + results = list(/datum/reagent/consumable/ethanol/sins_delight = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/demonsblood = 2, /datum/reagent/consumable/ethanol/triple_sec = 1, /datum/reagent/consumable/ethanol/martini = 1, /datum/reagent/consumable/ethanol/changelingsting = 1) mix_message = "The liquid starts swirling, before forming a pink cloud that dissipates in the air." /datum/chemical_reaction/strawberry_daiquiri name = "Strawberry Daiquiri" - id = "strawberry_daiquiri" - results = list("strawberry_daiquiri" = 7) - required_reagents = list("rum" = 2, "limejuice" = 1, "sugar" = 1, "strawberryjuice" = 2, "ice" = 1) + id = /datum/reagent/consumable/ethanol/strawberry_daiquiri + results = list(/datum/reagent/consumable/ethanol/strawberry_daiquiri = 7) + required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/strawberryjuice = 2, /datum/reagent/consumable/ice = 1) /datum/chemical_reaction/miami_vice name = "Miami Vice" - id = "miami_vice" - results = list("miami_vice" = 2) - required_reagents = list("pina_colada" = 1, "strawberry_daiquiri" = 1) + id = /datum/reagent/consumable/ethanol/miami_vice + results = list(/datum/reagent/consumable/ethanol/miami_vice = 2) + required_reagents = list(/datum/reagent/consumable/ethanol/pina_colada = 1, /datum/reagent/consumable/ethanol/strawberry_daiquiri = 1) /datum/chemical_reaction/malibu_sunset name = "Malibu Sunset" - id = "malibu_sunset" - results = list("malibu_sunset" = 5) - required_reagents = list("creme_de_coconut" = 1, "pineapplejuice" = 1, "grenadine" = 1, "orangejuice" = 1, "ice" = 1) + id = /datum/reagent/consumable/ethanol/malibu_sunset + results = list(/datum/reagent/consumable/ethanol/malibu_sunset = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 1, /datum/reagent/consumable/pineapplejuice = 1, /datum/reagent/consumable/grenadine = 1, /datum/reagent/consumable/orangejuice = 1, /datum/reagent/consumable/ice = 1) /datum/chemical_reaction/liz_fizz name = "Liz Fizz" - id = "liz_fizz" - results = list("liz_fizz" = 5) - required_reagents = list("triple_citrus" = 3, "ice" = 1, "cream" = 1) + id = /datum/reagent/consumable/ethanol/liz_fizz + results = list(/datum/reagent/consumable/ethanol/liz_fizz = 5) + required_reagents = list(/datum/reagent/consumable/triple_citrus = 3, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1) /datum/chemical_reaction/hotlime_miami name = "Hotlime Miami" - id = "hotlime_miami" - results = list("hotlime_miami" = 2) - required_reagents = list("ephedrine" = 1, "pina_colada" = 1) + id = /datum/reagent/consumable/ethanol/hotlime_miami + results = list(/datum/reagent/consumable/ethanol/hotlime_miami = 2) + required_reagents = list(/datum/reagent/medicine/ephedrine = 1, /datum/reagent/consumable/ethanol/pina_colada = 1) /datum/chemical_reaction/commander_and_chief name = "Commander and Chief" diff --git a/code/modules/hydroponics/grown/pineapple.dm b/code/modules/hydroponics/grown/pineapple.dm index 7dc25392..40cd3911 100644 --- a/code/modules/hydroponics/grown/pineapple.dm +++ b/code/modules/hydroponics/grown/pineapple.dm @@ -30,6 +30,6 @@ filling_color = "#F6CB0B" w_class = WEIGHT_CLASS_NORMAL foodtype = FRUIT | PINEAPPLE - juice_results = list("pineapplejuice" = 0) + juice_results = list(/datum/reagent/consumable/pineapplejuice = 1) tastes = list("pineapple" = 1) wine_power = 40 diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 0cc1df51..f3175495 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -365,7 +365,7 @@ desc = "Finally, a bottle as proportionate as you. Incredible!" icon = 'icons/obj/drinks.dmi' icon_state = "wataur" - list_reagents = list("water" = 100) //robust ass wataur + list_reagents = list(/datum/reagent/water = 100) //robust ass wataur volume = 100 amount_per_transfer_from_this = 20 container_HP = 1 diff --git a/modular_citadel/code/modules/mob/living/simple_animal/banana_spider.dm b/modular_citadel/code/modules/mob/living/simple_animal/banana_spider.dm index 0705d2e4..78851321 100644 --- a/modular_citadel/code/modules/mob/living/simple_animal/banana_spider.dm +++ b/modular_citadel/code/modules/mob/living/simple_animal/banana_spider.dm @@ -15,7 +15,7 @@ icon_dead = "banana-dead" mutatelist = list() genes = list(/datum/plant_gene/trait/slip) - reagents_add = list("banana" = 0.1, "potassium" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02) + reagents_add = list(/datum/reagent/consumable/banana = 0.1, /datum/reagent/potassium = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.02) /obj/item/reagent_containers/food/snacks/grown/banana/banana_spider_spawnable @@ -26,10 +26,10 @@ icon_state = "banana" item_state = "banana" filling_color = "#FFFF00" - list_reagents = list("nutriment" = 3, "vitamin" = 2) + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2) foodtype = GROSS | MEAT | RAW | FRUIT - grind_results = list("blood" = 20, "liquidgibs" = 5) - juice_results = list("banana" = 0) + grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5) + juice_results = list(/datum/reagent/consumable/banana = 0) var/awakening = 0