cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 03:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some reagent dispenser fuckery

Browse Source
This commit is contained in:
Heroman
2022-06-30 06:11:32 +10:00
parent 0bb4a58dea
commit f648c2ba96
4 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/machinery/dispenser/cartridge_presets.dm
+2
View File
@@ -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
code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
+3 -2
View File
@@ -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"
)
code/modules/reagents/machinery/dispenser/dispenser_presets.dm
+4 -2
View File
@@ -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
code/modules/reagents/machinery/dispenser/supply.dm
+20 -3
View File
@@ -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