mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-30 07:28:53 +01:00
Merge branch 'master' into reagentToDefines
This commit is contained in:
Kashargul
@@ -117,10 +117,14 @@
|
||||
spawn_reagent = "lemonjuice"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/grapesoda
|
||||
spawn_reagent = "grapesoda"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/pineapple
|
||||
spawn_reagent = "pineapplejuice"
|
||||
|
||||
// Bar, coffee
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/coffee
|
||||
spawn_reagent = "coffee"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/drip_coffee
|
||||
spawn_reagent = "drip_coffee"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/cafe_latte
|
||||
spawn_reagent = "cafe_latte"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/soy_latte
|
||||
@@ -129,6 +133,8 @@
|
||||
spawn_reagent = "hot_coco"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/milk
|
||||
spawn_reagent = "milk"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/milk_foam
|
||||
spawn_reagent = "milk_foam"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/cream
|
||||
spawn_reagent = "cream"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/mint
|
||||
@@ -144,6 +150,48 @@
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/decafchai
|
||||
spawn_reagent = "chaiteadecaf"
|
||||
|
||||
// syrups
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_pumpkin
|
||||
spawn_reagent = "syrup_pumpkin"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_caramel
|
||||
spawn_reagent = "syrup_caramel"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_scaramel
|
||||
spawn_reagent = "syrup_salted_caramel"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_irish
|
||||
spawn_reagent = "syrup_irish"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_almond
|
||||
spawn_reagent = "syrup_almond"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_cinnamon
|
||||
spawn_reagent = "syrup_cinnamon"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_pistachio
|
||||
spawn_reagent = "syrup_pistachio"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_vanilla
|
||||
spawn_reagent = "syrup_vanilla"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_toffee
|
||||
spawn_reagent = "syrup_toffee"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_cherry
|
||||
spawn_reagent = "syrup_cherry"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/grenadine
|
||||
spawn_reagent = "grenadine"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_butterscotch
|
||||
spawn_reagent = "syrup_butterscotch"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_chocolate
|
||||
spawn_reagent = "syrup_chocolate"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_wchocolate
|
||||
spawn_reagent = "syrup_white_chocolate"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_strawberry
|
||||
spawn_reagent = "syrup_strawberry"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_coconut
|
||||
spawn_reagent = "syrup_coconut"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_ginger
|
||||
spawn_reagent = "syrup_ginger"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_gingerbread
|
||||
spawn_reagent = "syrup_gingerbread"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_peppermint
|
||||
spawn_reagent = "syrup_peppermint"
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_birthday
|
||||
spawn_reagent = "syrup_birthday"
|
||||
|
||||
// ERT
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/inaprov
|
||||
spawn_reagent = "inaprovaline"
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
/obj/machinery/chemical_dispenser/bar_soft
|
||||
dispense_reagents = list(
|
||||
REAGENT_ID_WATER, "ice", "coffee", "cream", "tea", "icetea", "cola", "spacemountainwind", "dr_gibb", "space_up", "tonic",
|
||||
"sodawater", "lemonjuice", "lemon_lime", REAGENT_ID_SUGAR, "orangejuice", "limejuice", "watermelonjuice", "thirteenloko", "grapesoda"
|
||||
"sodawater", "lemonjuice", "lemon_lime", REAGENT_ID_SUGAR, "orangejuice", "limejuice", "watermelonjuice", "thirteenloko", "grapesoda", "pineapplejuice"
|
||||
)
|
||||
|
||||
/obj/machinery/chemical_dispenser/bar_alc
|
||||
@@ -58,6 +58,13 @@
|
||||
|
||||
/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", "greentea"
|
||||
"coffee", "cafe_latte", "soy_latte", "hot_coco", "milk", "cream", "tea", "ice", "water",
|
||||
"orangejuice", "lemonjuice", "limejuice", "berryjuice", "mint", "decaf", "greentea", "milk_foam", "drip_coffee"
|
||||
)
|
||||
|
||||
/obj/machinery/chemical_dispenser/bar_syrup
|
||||
dispense_reagents = list(
|
||||
"syrup_pumpkin", "syrup_caramel", "syrup_salted_caramel", "syrup_irish", "syrup_almond", "syrup_cinnamon", "syrup_pistachio",
|
||||
"syrup_vanilla", "syrup_toffee", "grenadine", "syrup_cherry", "syrup_butterscotch", "syrup_chocolate", "syrup_white_chocolate", "syrup_strawberry",
|
||||
"syrup_coconut", "syrup_ginger", "syrup_gingerbread", "syrup_peppermint", "syrup_birthday"
|
||||
)
|
||||
|
||||
@@ -85,7 +85,8 @@
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/lime,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/watermelon,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/lemon,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/grapesoda
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/grapesoda,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/pineapple
|
||||
)
|
||||
|
||||
/obj/machinery/chemical_dispenser/bar_alc
|
||||
@@ -130,11 +131,14 @@
|
||||
/obj/machinery/chemical_dispenser/bar_coffee/full
|
||||
spawn_cartridges = list(
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/coffee,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/drip_coffee,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/cafe_latte,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/soy_latte,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/hot_coco,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/milk,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/cream,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/milk_foam,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/water,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/sugar,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/tea,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/ice,
|
||||
@@ -148,3 +152,34 @@
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/chaitea,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/decafchai
|
||||
)
|
||||
|
||||
/obj/machinery/chemical_dispenser/bar_syrup
|
||||
name = "syrup dispenser"
|
||||
desc = "Allow your customers to test your patience to the extremes."
|
||||
icon_state = "syrup_dispenser"
|
||||
ui_title = "Syrup Dispenser"
|
||||
accept_drinking = 1
|
||||
|
||||
/obj/machinery/chemical_dispenser/bar_syrup/full
|
||||
spawn_cartridges = list(
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_pumpkin,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_caramel,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_scaramel,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_irish,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_almond,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_cinnamon,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_pistachio,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_vanilla,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_toffee,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_cherry,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/grenadine,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_butterscotch,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_chocolate,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_wchocolate,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_strawberry,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_coconut,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_ginger,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_gingerbread,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_peppermint,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_birthday
|
||||
)
|
||||
|
||||
@@ -38,6 +38,16 @@
|
||||
containername = "coffee dispenser crate"
|
||||
group = "Reagents"
|
||||
|
||||
/datum/supply_pack/syrup_dispenser
|
||||
name = "Syrup dispenser"
|
||||
contains = list(
|
||||
/obj/machinery/chemical_dispenser/bar_syrup{anchored = FALSE}
|
||||
)
|
||||
cost = 25
|
||||
containertype = /obj/structure/largecrate
|
||||
containername = "Syrup dispenser crate"
|
||||
group = "Reagents"
|
||||
|
||||
/datum/supply_pack/reagents
|
||||
name = "Chemistry dispenser refill"
|
||||
contains = list(
|
||||
@@ -123,7 +133,8 @@
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/lime,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/watermelon,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/lemon,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/grapesoda
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/grapesoda,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/pineapple
|
||||
)
|
||||
cost = 50
|
||||
containertype = /obj/structure/closet/crate
|
||||
@@ -134,11 +145,14 @@
|
||||
name = "Coffee machine dispenser refill"
|
||||
contains = list(
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/coffee,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/drip_coffee,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/cafe_latte,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/soy_latte,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/hot_coco,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/milk,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/cream,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/milk_foam,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/water,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/sugar,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/tea,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/ice,
|
||||
@@ -148,13 +162,44 @@
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/lime,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/berry,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/greentea,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/decaf
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/decaf,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/chaitea,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/decafchai
|
||||
)
|
||||
cost = 50
|
||||
containertype = /obj/structure/closet/crate
|
||||
containername = "coffee drinks crate"
|
||||
group = "Reagents"
|
||||
|
||||
/datum/supply_pack/syrup_reagents
|
||||
name = "Syrup machine dispenser refill"
|
||||
contains = list(
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_pumpkin,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_caramel,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_scaramel,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_irish,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_almond,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_cinnamon,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_pistachio,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_vanilla,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_toffee,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_cherry,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/grenadine,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_butterscotch,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_chocolate,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_wchocolate,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_strawberry,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_coconut,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_ginger,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_gingerbread,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_peppermint,
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/syrup_birthday
|
||||
)
|
||||
cost = 50
|
||||
containertype = /obj/structure/closet/crate
|
||||
containername = "Syrup crate"
|
||||
group = "Reagents"
|
||||
|
||||
/datum/supply_pack/dispenser_cartridges
|
||||
name = "Empty dispenser cartridges"
|
||||
contains = list(
|
||||
|
||||
Reference in New Issue
Block a user