cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4454 from CHOMPStation2/upstream-merge-13207

Browse Source 
[MIRROR] Fixes some reagent dispenser fuckery
This commit is contained in:
Razgriz
2022-07-03 17:03:14 -07:00
committed by GitHub
parent acb9521a80 5033e705f2
commit f46bacf1da
5 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/reagents/machinery/dispenser/cartridge_presets.dm
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

1
code/modules/reagents/machinery/dispenser/cartridge_presets_ch.dm
View File

@@ -1,7 +1,6 @@
/obj/item/weapon/reagent_containers/chem_disp_cartridge
//CHOMP - Chems that are used but not meant for cargo supplies, at least for now. - Jack
champagne spawn_reagent = "champagne"
grapesoda spawn_reagent = "grapesoda"
singulo spawn_reagent = "singulo"
doctorsdelight spawn_reagent = "doctorsdelight"
nothing spawn_reagent = "nothing"

5
code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
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"
)

6
code/modules/reagents/machinery/dispenser/dispenser_presets.dm
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

23
code/modules/reagents/machinery/dispenser/supply.dm
View File

@@ -62,7 +62,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
@@ -73,6 +74,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,
@@ -84,6 +91,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
@@ -114,7 +122,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
@@ -130,8 +139,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