From f648c2ba96e54767e759cec329ed47db8a835bee Mon Sep 17 00:00:00 2001 From: Heroman Date: Thu, 30 Jun 2022 06:11:32 +1000 Subject: [PATCH] Fixes some reagent dispenser fuckery --- .../machinery/dispenser/cartridge_presets.dm | 2 ++ .../machinery/dispenser/dispenser2_energy.dm | 5 ++-- .../machinery/dispenser/dispenser_presets.dm | 6 +++-- .../reagents/machinery/dispenser/supply.dm | 23 ++++++++++++++++--- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm index bc1a199498a..f0515d3904c 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm @@ -115,6 +115,8 @@ spawn_reagent = "watermelonjuice" /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon spawn_reagent = "lemonjuice" +/obj/item/weapon/reagent_containers/chem_disp_cartridge/grapesoda + spawn_reagent = "grapesoda" // Bar, coffee /obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee diff --git a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm index accbeab4f61..91c24d77068 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm @@ -31,7 +31,8 @@ dispense_reagents = list( "hydrogen", "lithium", "carbon", "nitrogen", "oxygen", "fluorine", "sodium", "aluminum", "silicon", "phosphorus", "sulfur", "chlorine", "potassium", "iron", - "copper", "mercury", "radium", "water", "ethanol", "sugar", "sacid", "tungsten" + "copper", "mercury", "radium", "water", "ethanol", "sugar", "sacid", "tungsten", + "calcium" ) /obj/machinery/chemical_dispenser/ert @@ -58,5 +59,5 @@ /obj/machinery/chemical_dispenser/bar_coffee dispense_reagents = list( "coffee", "cafe_latte", "soy_latte", "hot_coco", "milk", "cream", "tea", "ice", - "orangejuice", "lemonjuice", "limejuice", "berryjuice", "mint", "decaf" + "orangejuice", "lemonjuice", "limejuice", "berryjuice", "mint", "decaf", "greentea" ) diff --git a/code/modules/reagents/machinery/dispenser/dispenser_presets.dm b/code/modules/reagents/machinery/dispenser/dispenser_presets.dm index 727720f3a63..ab54cd06b40 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser_presets.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser_presets.dm @@ -84,7 +84,8 @@ /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, /obj/item/weapon/reagent_containers/chem_disp_cartridge/watermelon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon + /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/grapesoda ) /obj/machinery/chemical_dispenser/bar_alc @@ -115,7 +116,8 @@ /obj/item/weapon/reagent_containers/chem_disp_cartridge/cognac, /obj/item/weapon/reagent_containers/chem_disp_cartridge/cider, /obj/item/weapon/reagent_containers/chem_disp_cartridge/ale, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/mead + /obj/item/weapon/reagent_containers/chem_disp_cartridge/mead, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/bitters ) /obj/machinery/chemical_dispenser/bar_coffee diff --git a/code/modules/reagents/machinery/dispenser/supply.dm b/code/modules/reagents/machinery/dispenser/supply.dm index e62e3bbb5dc..254daacba26 100644 --- a/code/modules/reagents/machinery/dispenser/supply.dm +++ b/code/modules/reagents/machinery/dispenser/supply.dm @@ -52,7 +52,8 @@ /obj/item/weapon/reagent_containers/chem_disp_cartridge/ethanol, /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, /obj/item/weapon/reagent_containers/chem_disp_cartridge/sacid, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tungsten + /obj/item/weapon/reagent_containers/chem_disp_cartridge/tungsten, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/calcium ) cost = 150 containertype = /obj/structure/closet/crate/secure @@ -63,6 +64,12 @@ /datum/supply_pack/alcohol_reagents name = "Bar alcoholic dispenser refill" contains = list( + /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon_lime, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/sodawater, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/tonic, /obj/item/weapon/reagent_containers/chem_disp_cartridge/beer, /obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua, /obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey, @@ -74,6 +81,7 @@ /obj/item/weapon/reagent_containers/chem_disp_cartridge/tequila, /obj/item/weapon/reagent_containers/chem_disp_cartridge/vermouth, /obj/item/weapon/reagent_containers/chem_disp_cartridge/cognac, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/cider, /obj/item/weapon/reagent_containers/chem_disp_cartridge/ale, /obj/item/weapon/reagent_containers/chem_disp_cartridge/mead, /obj/item/weapon/reagent_containers/chem_disp_cartridge/bitters @@ -104,7 +112,8 @@ /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, /obj/item/weapon/reagent_containers/chem_disp_cartridge/watermelon, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon + /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/grapesoda ) cost = 50 containertype = /obj/structure/closet/crate @@ -120,8 +129,16 @@ /obj/item/weapon/reagent_containers/chem_disp_cartridge/hot_coco, /obj/item/weapon/reagent_containers/chem_disp_cartridge/milk, /obj/item/weapon/reagent_containers/chem_disp_cartridge/cream, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, /obj/item/weapon/reagent_containers/chem_disp_cartridge/tea, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/ice + /obj/item/weapon/reagent_containers/chem_disp_cartridge/ice, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/mint, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/berry, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/greentea, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/decaf ) cost = 50 containertype = /obj/structure/closet/crate