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

food.dm

Browse Source
This commit is contained in:
Kashargul
2024-12-08 04:26:19 +01:00
parent e9550345d2
commit 4e7742e3c8
37 changed files with 1536 additions and 1218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/machinery/dispenser/cartridge_presets.dm
+35 -35
View File
@@ -56,39 +56,39 @@
// Bar, alcoholic
/obj/item/reagent_containers/chem_disp_cartridge/beer
spawn_reagent = "beer"
spawn_reagent = REAGENT_ID_BEER
/obj/item/reagent_containers/chem_disp_cartridge/kahlua
spawn_reagent = "kahlua"
spawn_reagent = REAGENT_ID_KAHLUA
/obj/item/reagent_containers/chem_disp_cartridge/whiskey
spawn_reagent = "whiskey"
spawn_reagent = REAGENT_ID_WHISKEY
/obj/item/reagent_containers/chem_disp_cartridge/redwine
spawn_reagent = "redwine"
spawn_reagent = REAGENT_ID_REDWINE
/obj/item/reagent_containers/chem_disp_cartridge/whitewine
spawn_reagent = "whitewine"
spawn_reagent = REAGENT_ID_WHITEWINE
/obj/item/reagent_containers/chem_disp_cartridge/vodka
spawn_reagent = "vodka"
spawn_reagent = REAGENT_ID_VODKA
/obj/item/reagent_containers/chem_disp_cartridge/gin
spawn_reagent = "gin"
spawn_reagent = REAGENT_ID_GIN
/obj/item/reagent_containers/chem_disp_cartridge/rum
spawn_reagent = "rum"
spawn_reagent = REAGENT_ID_RUM
/obj/item/reagent_containers/chem_disp_cartridge/tequila
spawn_reagent = "tequilla"
spawn_reagent = REAGENT_ID_TEQUILLA
/obj/item/reagent_containers/chem_disp_cartridge/vermouth
spawn_reagent = "vermouth"
spawn_reagent = REAGENT_ID_VERMOUTH
/obj/item/reagent_containers/chem_disp_cartridge/cognac
spawn_reagent = "cognac"
spawn_reagent = REAGENT_ID_COGNAC
/obj/item/reagent_containers/chem_disp_cartridge/ale
spawn_reagent = "ale"
spawn_reagent = REAGENT_ID_ALE
/obj/item/reagent_containers/chem_disp_cartridge/mead
spawn_reagent = "mead"
spawn_reagent = REAGENT_ID_MEAD
/obj/item/reagent_containers/chem_disp_cartridge/bitters
spawn_reagent = "bitters"
spawn_reagent = REAGENT_ID_BITTERS
/obj/item/reagent_containers/chem_disp_cartridge/cider
spawn_reagent = "cider"
spawn_reagent = REAGENT_ID_CIDER
// Bar, soft
/obj/item/reagent_containers/chem_disp_cartridge/ice
spawn_reagent = "ice"
spawn_reagent = REAGENT_ID_ICE
/obj/item/reagent_containers/chem_disp_cartridge/tea
spawn_reagent = REAGENT_ID_TEA
/obj/item/reagent_containers/chem_disp_cartridge/icetea
@@ -152,45 +152,45 @@
// syrups
/obj/item/reagent_containers/chem_disp_cartridge/syrup_pumpkin
spawn_reagent = "syrup_pumpkin"
spawn_reagent = REAGENT_ID_SYRUPPUMPKIN
/obj/item/reagent_containers/chem_disp_cartridge/syrup_caramel
spawn_reagent = "syrup_caramel"
spawn_reagent = REAGENT_ID_SYRUPCARAMEL
/obj/item/reagent_containers/chem_disp_cartridge/syrup_scaramel
spawn_reagent = "syrup_salted_caramel"
spawn_reagent = REAGENT_ID_SYRUPSALTEDCARAMEL
/obj/item/reagent_containers/chem_disp_cartridge/syrup_irish
spawn_reagent = "syrup_irish"
spawn_reagent = REAGENT_ID_SYRUPIRISH
/obj/item/reagent_containers/chem_disp_cartridge/syrup_almond
spawn_reagent = "syrup_almond"
spawn_reagent = REAGENT_ID_SYRUPALMOND
/obj/item/reagent_containers/chem_disp_cartridge/syrup_cinnamon
spawn_reagent = "syrup_cinnamon"
spawn_reagent = REAGENT_ID_SYRUPCINNAMON
/obj/item/reagent_containers/chem_disp_cartridge/syrup_pistachio
spawn_reagent = "syrup_pistachio"
spawn_reagent = REAGENT_ID_SYRUPPISTACHIO
/obj/item/reagent_containers/chem_disp_cartridge/syrup_vanilla
spawn_reagent = "syrup_vanilla"
spawn_reagent = REAGENT_ID_SYRUPVANILLA
/obj/item/reagent_containers/chem_disp_cartridge/syrup_toffee
spawn_reagent = "syrup_toffee"
spawn_reagent = REAGENT_ID_SYRUPTOFFEE
/obj/item/reagent_containers/chem_disp_cartridge/syrup_cherry
spawn_reagent = "syrup_cherry"
spawn_reagent = REAGENT_ID_SYRUPCHERRY
/obj/item/reagent_containers/chem_disp_cartridge/grenadine
spawn_reagent = REAGENT_ID_GRENADINE
/obj/item/reagent_containers/chem_disp_cartridge/syrup_butterscotch
spawn_reagent = "syrup_butterscotch"
spawn_reagent = REAGENT_ID_SYRUPBUTTERSCOTCH
/obj/item/reagent_containers/chem_disp_cartridge/syrup_chocolate
spawn_reagent = "syrup_chocolate"
spawn_reagent = REAGENT_ID_SYRUPCHOCOLATE
/obj/item/reagent_containers/chem_disp_cartridge/syrup_wchocolate
spawn_reagent = "syrup_white_chocolate"
spawn_reagent = REAGENT_ID_SYRUPWHITECHOCOLATE
/obj/item/reagent_containers/chem_disp_cartridge/syrup_strawberry
spawn_reagent = "syrup_strawberry"
spawn_reagent = REAGENT_ID_SYRUPSTRAWBERRY
/obj/item/reagent_containers/chem_disp_cartridge/syrup_coconut
spawn_reagent = "syrup_coconut"
spawn_reagent = REAGENT_ID_SYRUPCOCONUT
/obj/item/reagent_containers/chem_disp_cartridge/syrup_ginger
spawn_reagent = "syrup_ginger"
spawn_reagent = REAGENT_ID_SYRUPGINGER
/obj/item/reagent_containers/chem_disp_cartridge/syrup_gingerbread
spawn_reagent = "syrup_gingerbread"
spawn_reagent = REAGENT_ID_SYRUPGINGERBREAD
/obj/item/reagent_containers/chem_disp_cartridge/syrup_peppermint
spawn_reagent = "syrup_peppermint"
spawn_reagent = REAGENT_ID_SYRUPPEPPERMINT
/obj/item/reagent_containers/chem_disp_cartridge/syrup_birthday
spawn_reagent = "syrup_birthday"
spawn_reagent = REAGENT_ID_SYRUPBIRTHDAY
// ERT
/obj/item/reagent_containers/chem_disp_cartridge/inaprov
code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
+8 -8
View File
@@ -46,25 +46,25 @@
/obj/machinery/chemical_dispenser/bar_soft
dispense_reagents = list(
REAGENT_ID_WATER, "ice", REAGENT_ID_COFFEE, REAGENT_ID_CREAM, REAGENT_ID_TEA, REAGENT_ID_ICETEA, REAGENT_ID_COLA, REAGENT_ID_SPACEMOUNTAINWIND, REAGENT_ID_DRGIBB, REAGENT_ID_SPACEUP, REAGENT_ID_TONIC,
REAGENT_ID_SODAWATER, REAGENT_ID_LEMONJUICE, REAGENT_ID_LEMONLIME, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_WATERMELONJUICE, "thirteenloko", REAGENT_ID_GRAPESODA, REAGENT_ID_PINEAPPLEJUICE
REAGENT_ID_WATER, REAGENT_ID_ICE, REAGENT_ID_COFFEE, REAGENT_ID_CREAM, REAGENT_ID_TEA, REAGENT_ID_ICETEA, REAGENT_ID_COLA, REAGENT_ID_SPACEMOUNTAINWIND, REAGENT_ID_DRGIBB, REAGENT_ID_SPACEUP, REAGENT_ID_TONIC,
REAGENT_ID_SODAWATER, REAGENT_ID_LEMONJUICE, REAGENT_ID_LEMONLIME, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_WATERMELONJUICE,REAGENT_ID_THIRTEENLOKO, REAGENT_ID_GRAPESODA, REAGENT_ID_PINEAPPLEJUICE
)
/obj/machinery/chemical_dispenser/bar_alc
dispense_reagents = list(
REAGENT_ID_LEMONLIME, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_SODAWATER, REAGENT_ID_TONIC, "beer", "kahlua",
"whiskey", "redwine", "whitewine", "vodka", "cider", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "bitters"
REAGENT_ID_LEMONLIME, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_SODAWATER, REAGENT_ID_TONIC, REAGENT_ID_BEER, REAGENT_ID_KAHLUA,
REAGENT_ID_WHISKEY, REAGENT_ID_REDWINE, REAGENT_ID_WHITEWINE, REAGENT_ID_VODKA, REAGENT_ID_CIDER, REAGENT_ID_GIN, REAGENT_ID_RUM, REAGENT_ID_TEQUILLA, REAGENT_ID_VERMOUTH, REAGENT_ID_COGNAC, REAGENT_ID_ALE, REAGENT_ID_MEAD, REAGENT_ID_BITTERS
)
/obj/machinery/chemical_dispenser/bar_coffee
dispense_reagents = list(
REAGENT_ID_COFFEE, REAGENT_ID_CAFELATTE, REAGENT_ID_SOYLATTE, REAGENT_ID_HOTCOCO, REAGENT_ID_MILK, REAGENT_ID_CREAM, REAGENT_ID_TEA, "ice", "water",
REAGENT_ID_COFFEE, REAGENT_ID_CAFELATTE, REAGENT_ID_SOYLATTE, REAGENT_ID_HOTCOCO, REAGENT_ID_MILK, REAGENT_ID_CREAM, REAGENT_ID_TEA, REAGENT_ID_ICE, "water",
REAGENT_ID_ORANGEJUICE, REAGENT_ID_LEMONJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_BERRYJUICE, REAGENT_ID_MINT, REAGENT_ID_DECAF, REAGENT_ID_GREENTEA, REAGENT_ID_MILKFOAM, REAGENT_ID_DRIPCOFFEE
)
/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", REAGENT_ID_GRENADINE, "syrup_cherry", "syrup_butterscotch", "syrup_chocolate", "syrup_white_chocolate", "syrup_strawberry",
"syrup_coconut", "syrup_ginger", "syrup_gingerbread", "syrup_peppermint", "syrup_birthday"
REAGENT_ID_SYRUPPUMPKIN, REAGENT_ID_SYRUPCARAMEL, REAGENT_ID_SYRUPSALTEDCARAMEL, REAGENT_ID_SYRUPIRISH, REAGENT_ID_SYRUPALMOND, REAGENT_ID_SYRUPCINNAMON, REAGENT_ID_SYRUPPISTACHIO,
REAGENT_ID_SYRUPVANILLA, REAGENT_ID_SYRUPTOFFEE, REAGENT_ID_GRENADINE, REAGENT_ID_SYRUPCHERRY, REAGENT_ID_SYRUPBUTTERSCOTCH, REAGENT_ID_SYRUPCHOCOLATE, REAGENT_ID_SYRUPWHITECHOCOLATE, REAGENT_ID_SYRUPSTRAWBERRY,
REAGENT_ID_SYRUPCOCONUT, REAGENT_ID_SYRUPGINGER, REAGENT_ID_SYRUPGINGERBREAD, REAGENT_ID_SYRUPPEPPERMINT, REAGENT_ID_SYRUPBIRTHDAY
)
code/modules/reagents/machinery/dispenser/reagent_tank.dm
+2 -2
View File
@@ -495,7 +495,7 @@
/obj/structure/reagent_dispensers/beerkeg/Initialize()
. = ..()
reagents.add_reagent("beer",1000)
reagents.add_reagent(REAGENT_ID_BEER,1000)
/obj/structure/reagent_dispensers/beerkeg/wood
name = "beer keg"
@@ -509,7 +509,7 @@
/obj/structure/reagent_dispensers/beerkeg/wine/Initialize()
. = ..()
reagents.add_reagent("redwine",1000)
reagents.add_reagent(REAGENT_ID_REDWINE,1000)
/obj/structure/reagent_dispensers/beerkeg/fakenuke
name = "nuclear beer keg"
code/modules/reagents/machinery/pump.dm
+1 -1
View File
@@ -194,7 +194,7 @@
var/datum/gas_mixture/air = return_air() // v
if(air.temperature <= T0C) // Uses the current air temp, instead of the turf starting temp
R.add_reagent("ice", round(volume / 2, 0.1))
R.add_reagent(REAGENT_ID_ICE, round(volume / 2, 0.1))
for(var/turf/simulated/mineral/M in orange(5,src)) // Uses the turf as center instead of an unset usr
if(M.mineral && prob(40)) // v