cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-08 15:19:48 +00: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

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

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

4
code/modules/reagents/machinery/dispenser/reagent_tank.dm
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"

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

6
code/modules/reagents/reactions/distilling/distilling.dm
View File

@@ -130,7 +130,7 @@
/decl/chemical_reaction/distilling/beer
name = "Distilling Beer"
id = "distill_beer"
result = "beer"
result = REAGENT_ID_BEER
required_reagents = list(REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_WATER = 1, REAGENT_ID_SUGAR = 1)
result_amount = 2
@@ -141,8 +141,8 @@
/decl/chemical_reaction/distilling/ale
name = "Distilling Ale"
id = "distill_ale"
result = "ale"
required_reagents = list(REAGENT_ID_NUTRIMENT = 1, "beer" = 1)
result = REAGENT_ID_ALE
required_reagents = list(REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_BEER = 1)
inhibitors = list(REAGENT_ID_WATER = 1)
result_amount = 2

1008
code/modules/reagents/reactions/instant/drinks.dm
View File

File diff suppressed because it is too large Load Diff

46
code/modules/reagents/reactions/instant/drinks_vr.dm
View File

@@ -8,31 +8,31 @@
result_amount = 30
/decl/chemical_reaction/instant/drinks/deathbell
name = "Deathbell"
id = "deathbell"
result = "deathbell"
required_reagents = list("antifreeze" = 1, "gargleblaster" = 1, "syndicatebomb" =1)
name = REAGENT_DEATHBELL
id = REAGENT_ID_DEATHBELL
result = REAGENT_ID_DEATHBELL
required_reagents = list(REAGENT_ID_ANTIFREEZE = 1, REAGENT_ID_GARGLEBLASTER = 1, REAGENT_ID_SYNDICATEBOMB =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/burnout
name = REAGENT_BURNOUT
id = REAGENT_ID_BURNOUT
result = REAGENT_ID_BURNOUT
required_reagents = list("antifreeze" = 1, "deathbell" = 1, REAGENT_ID_LOVEMAKER =1)
required_reagents = list(REAGENT_ID_ANTIFREEZE = 1, REAGENT_ID_DEATHBELL = 1, REAGENT_ID_LOVEMAKER =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/monstertamer
name = REAGENT_MONSTERTAMER
id = REAGENT_ID_MONSTERTAMER
result = REAGENT_ID_MONSTERTAMER
required_reagents = list("whiskey" = 1, REAGENT_ID_PROTEIN = 1)
required_reagents = list(REAGENT_ID_WHISKEY = 1, REAGENT_ID_PROTEIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/bigbeer
name = REAGENT_BIGBEER
id = REAGENT_ID_BIGBEER
result = REAGENT_ID_BIGBEER
required_reagents = list("syndicatebomb" = 1, "manlydorf" = 1, "grog" =1)
required_reagents = list(REAGENT_ID_SYNDICATEBOMB = 1, REAGENT_ID_MANLYDORF = 1, REAGENT_ID_GROG =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/sweettea
@@ -53,21 +53,21 @@
name = REAGENT_GALACTICPANIC
id = REAGENT_ID_GALACTICPANIC
result = REAGENT_ID_GALACTICPANIC
required_reagents = list("gargleblaster" = 1, "singulo" = 1, "phoronspecial" =1, "neurotoxin" = 1, "atomicbomb" = 1, "hippiesdelight" = 1)
required_reagents = list(REAGENT_ID_GARGLEBLASTER = 1, REAGENT_ID_SINGULO = 1, REAGENT_ID_PHORONSPECIAL =1, REAGENT_ID_NEUROTOXIN = 1, REAGENT_ID_ATOMICBOMB = 1, REAGENT_ID_HIPPIESDELIGHT = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/bulldog
name = REAGENT_BULLDOG
id = REAGENT_ID_BULLDOG
result = REAGENT_ID_BULLDOG
required_reagents = list("whiterussian" = 4, REAGENT_ID_COLA =1)
required_reagents = list(REAGENT_ID_WHITERUSSIAN = 4, REAGENT_ID_COLA =1)
result_amount = 4
/decl/chemical_reaction/instant/drinks/sbagliato
name = REAGENT_SBAGLIATO
id = REAGENT_ID_SBAGLIATO
result = REAGENT_ID_SBAGLIATO
required_reagents = list("redwine" = 1, "vermouth" = 1, REAGENT_ID_SODAWATER =1)
required_reagents = list(REAGENT_ID_REDWINE = 1, REAGENT_ID_VERMOUTH = 1, REAGENT_ID_SODAWATER =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/italiancrisis
@@ -81,7 +81,7 @@
name = REAGENT_SUGARRUSH
id = REAGENT_ID_SUGARRUSH
result = REAGENT_ID_SUGARRUSH
required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_SODAWATER = 1, "vodka" =1)
required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_SODAWATER = 1, REAGENT_ID_VODKA =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/lotus
@@ -102,28 +102,28 @@
name = REAGENT_RUSSIANROULETTE
id =REAGENT_ID_RUSSIANROULETTE
result =REAGENT_ID_RUSSIANROULETTE
required_reagents = list("whiterussian" = 5, REAGENT_ID_IRON = 1)
required_reagents = list(REAGENT_ID_WHITERUSSIAN = 5, REAGENT_ID_IRON = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/lovemaker
name = REAGENT_LOVEMAKER
id = REAGENT_ID_LOVEMAKER
result = REAGENT_ID_LOVEMAKER
required_reagents = list(REAGENT_ID_HONEY = 1, "sexonthebeach" = 5)
required_reagents = list(REAGENT_ID_HONEY = 1, REAGENT_ID_SEXONTHEBEACH = 5)
result_amount = 6
/decl/chemical_reaction/instant/drinks/honeyshot
name = REAGENT_HONEYSHOT
id = REAGENT_ID_HONEYSHOT
result = REAGENT_ID_HONEYSHOT
required_reagents = list(REAGENT_ID_HONEY = 1, "vodka" = 1, REAGENT_ID_GRENADINE =1)
required_reagents = list(REAGENT_ID_HONEY = 1, REAGENT_ID_VODKA = 1, REAGENT_ID_GRENADINE =1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/appletini
name = REAGENT_APPLETINI
id = REAGENT_ID_APPLETINIT
result = REAGENT_ID_APPLETINIT
required_reagents = list(REAGENT_ID_APPLEJUICE = 2, "vodka" = 1)
required_reagents = list(REAGENT_ID_APPLEJUICE = 2, REAGENT_ID_VODKA = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/glowingappletini
@@ -137,7 +137,7 @@
name = REAGENT_SCSATW
id = REAGENT_ID_SCSATW
result = REAGENT_ID_SCSATW
required_reagents = list("screwdrivercocktail" = 3, "rum" =1, "whiskey" =1, "gin" =1)
required_reagents = list(REAGENT_ID_SCREWDRIVERCOCKTAIL = 3, REAGENT_ID_RUM =1, REAGENT_ID_WHISKEY =1, REAGENT_ID_GIN =1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/choccymilk
@@ -152,7 +152,7 @@
name = "Redspace Flush"
id = REAGENT_ID_REDSPACEFLUSH
result = REAGENT_ID_REDSPACEFLUSH
required_reagents = list("rum" = 2, "whiskey" = 2, REAGENT_ID_BLOOD =1, REAGENT_ID_PHORON =1)
required_reagents = list(REAGENT_ID_RUM = 2, REAGENT_ID_WHISKEY = 2, REAGENT_ID_BLOOD =1, REAGENT_ID_PHORON =1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/graveyard
@@ -173,14 +173,14 @@
name = REAGENT_PINKRUSSIAN
id = REAGENT_ID_PINKRUSSIAN
result = REAGENT_ID_PINKRUSSIAN
required_reagents = list("blackrussian" = 2, REAGENT_ID_BERRYSHAKE = 1)
required_reagents = list(REAGENT_ID_BLACKRUSSIAN = 2, REAGENT_ID_BERRYSHAKE = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/originalsin
name = REAGENT_ORIGINALSIN
id = REAGENT_ID_ORIGINALSIN
result = REAGENT_ID_ORIGINALSIN
required_reagents = list("holywine" = 1)
required_reagents = list(REAGENT_ID_HOLYWINE = 1)
catalysts = list(REAGENT_ID_APPLEJUICE = 1)
result_amount = 1
@@ -188,21 +188,21 @@
name = REAGENT_WINDGARITA
id = REAGENT_ID_WINDGARITA
result = REAGENT_ID_WINDGARITA
required_reagents = list("margarita" = 3, REAGENT_ID_SPACEMOUNTAINWIND = 2, "melonliquor" = 1)
required_reagents = list(REAGENT_ID_MARGARITA = 3, REAGENT_ID_SPACEMOUNTAINWIND = 2, REAGENT_ID_MELONLIQUOR = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/newyorksour
name = REAGENT_NEWYORKSOUR
id = REAGENT_ID_NEWYORKSOUR
result = REAGENT_ID_NEWYORKSOUR
required_reagents = list("whiskeysour" = 3, "redwine" = 2, REAGENT_ID_EGG = 1)
required_reagents = list(REAGENT_ID_WHISKEYSOUR = 3, REAGENT_ID_REDWINE = 2, REAGENT_ID_EGG = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/mudslide
name = REAGENT_MUDSLIDE
id = REAGENT_ID_MUDSLIDE
result = REAGENT_ID_MUDSLIDE
required_reagents = list("blackrussian" = 1, "irishcream" = 1)
required_reagents = list(REAGENT_ID_BLACKRUSSIAN = 1, REAGENT_ID_IRISHCREAM = 1)
result_amount = 2
/decl/chemical_reaction/instant/drinks/protein_shake
@@ -244,5 +244,5 @@
name = REAGENT_MANAGERSUMMONER
id = REAGENT_ID_MANAGERSUMMONER
result = REAGENT_ID_MANAGERSUMMONER
required_reagents = list("margarita" = 1, "redwine" = 1, REAGENT_ID_ESSENTIALOIL = 1)
required_reagents = list(REAGENT_ID_MARGARITA = 1, REAGENT_ID_REDWINE = 1, REAGENT_ID_ESSENTIALOIL = 1)
result_amount = 3

18
code/modules/reagents/reactions/instant/food.dm
View File

@@ -1,15 +1,15 @@
/decl/chemical_reaction/instant/food/hot_ramen
name = "Hot Ramen"
id = "hot_ramen"
result = "hot_ramen"
name = REAGENT_HOTRAMEN
id = REAGENT_ID_HOTRAMEN
result = REAGENT_ID_HOTRAMEN
required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_DRYRAMEN = 3)
result_amount = 3
/decl/chemical_reaction/instant/food/hell_ramen
name = "Hell Ramen"
id = "hell_ramen"
result = "hell_ramen"
required_reagents = list(REAGENT_ID_CAPSAICIN = 1, "hot_ramen" = 6)
name = REAGENT_HELLRAMEN
id = REAGENT_ID_HELLRAMEN
result = REAGENT_ID_HELLRAMEN
required_reagents = list(REAGENT_ID_CAPSAICIN = 1, REAGENT_ID_HOTRAMEN = 6)
result_amount = 6
/decl/chemical_reaction/instant/food/tofu
@@ -140,7 +140,7 @@
id = "dough"
result = null
required_reagents = list(REAGENT_ID_EGG = 3, REAGENT_ID_FLOUR = 10)
inhibitors = list(REAGENT_ID_WATER = 1, "beer" = 1, REAGENT_ID_SUGAR = 1) //To prevent it messing with batter recipes
inhibitors = list(REAGENT_ID_WATER = 1, REAGENT_ID_BEER = 1, REAGENT_ID_SUGAR = 1) //To prevent it messing with batter recipes
result_amount = 1
/decl/chemical_reaction/instant/food/dough/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -179,7 +179,7 @@
name = "Beer Batter"
id = REAGENT_ID_BEERBATTER
result = REAGENT_ID_BEERBATTER
required_reagents = list(REAGENT_ID_EGG = 3, REAGENT_ID_FLOUR = 10, "beer" = 5, REAGENT_ID_SODIUMCHLORIDE = 2)
required_reagents = list(REAGENT_ID_EGG = 3, REAGENT_ID_FLOUR = 10, REAGENT_ID_BEER = 5, REAGENT_ID_SODIUMCHLORIDE = 2)
result_amount = 20
/decl/chemical_reaction/instant/food/browniemix

10
code/modules/reagents/reactions/instant/instant.dm
View File

@@ -537,10 +537,10 @@
result_amount = 3
/decl/chemical_reaction/instant/neurotoxin
name = "Neurotoxin"
id = "neurotoxin"
result = "neurotoxin"
required_reagents = list("gargleblaster" = 1, REAGENT_ID_STOXIN = 1)
name = REAGENT_NEUROTOXIN
id = REAGENT_ID_NEUROTOXIN
result = REAGENT_ID_NEUROTOXIN
required_reagents = list(REAGENT_ID_GARGLEBLASTER = 1, REAGENT_ID_STOXIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/luminol
@@ -1152,7 +1152,7 @@
name = "Silver Blue Carpet Dyeing"
id = "carpetdyesblu"
result = REAGENT_ID_LIQUIDCARPETSBLU
required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, "ice" = 1)
required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_ICE = 1)
/decl/chemical_reaction/instant/carpetdye/clown
name = "Clown Carpet Dyeing"

34
code/modules/reagents/reagent_containers/borghypo.dm
View File

@@ -132,49 +132,49 @@
recharge_time = 3
volume = 60
possible_transfer_amounts = list(5, 10, 20, 30)
reagent_ids = list("ale",
"beer",
reagent_ids = list(REAGENT_ID_ALE,
REAGENT_ID_BEER,
REAGENT_ID_BERRYJUICE,
"bitters",
"cider",
REAGENT_ID_BITTERS,
REAGENT_ID_CIDER,
REAGENT_ID_COFFEE,
"cognac",
REAGENT_ID_COGNAC,
REAGENT_ID_COLA,
REAGENT_ID_CREAM,
REAGENT_ID_DRGIBB,
REAGENT_ID_EGG,
"gin",
REAGENT_ID_GIN,
REAGENT_ID_GINGERALE,
REAGENT_ID_HOTCOCO,
"ice",
REAGENT_ID_ICE,
REAGENT_ID_ICETEA,
"kahlua",
REAGENT_ID_KAHLUA,
REAGENT_ID_LEMONJUICE,
REAGENT_ID_LEMONLIME,
REAGENT_ID_LIMEJUICE,
"mead",
REAGENT_ID_MEAD,
REAGENT_ID_MILK,
REAGENT_ID_MINT,
REAGENT_ID_ORANGEJUICE,
"redwine",
"rum",
"sake",
REAGENT_ID_REDWINE,
REAGENT_ID_RUM,
REAGENT_ID_SAKE,
REAGENT_ID_SODAWATER,
REAGENT_ID_SOYMILK,
REAGENT_ID_SPACEUP,
REAGENT_ID_SPACEMOUNTAINWIND,
REAGENT_ID_SPACESPICE,
"specialwhiskey",
REAGENT_ID_SPECIALWHISKEY,
REAGENT_ID_SUGAR,
REAGENT_ID_TEA,
"tequilla",
REAGENT_ID_TEQUILLA,
REAGENT_ID_TOMATOJUICE,
REAGENT_ID_TONIC,
"vermouth",
"vodka",
REAGENT_ID_VERMOUTH,
REAGENT_ID_VODKA,
REAGENT_ID_WATER,
REAGENT_ID_WATERMELONJUICE,
"whiskey")
REAGENT_ID_WHISKEY)
/obj/item/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user)
return

2
code/modules/reagents/reagent_containers/glass_vr.dm
View File

@@ -1,5 +1,5 @@
/obj/item/reagent_containers/glass/beaker/neurotoxin
prefill = list("neurotoxin" = 50)
prefill = list(REAGENT_ID_NEUROTOXIN = 50)
/obj/item/reagent_containers/glass/beaker/vial/bicaridine
name = "vial (" + REAGENT_ID_BICARIDINE + ")"

967
code/modules/reagents/reagents/food_drinks.dm
View File

File diff suppressed because it is too large Load Diff

2
code/modules/reagents/reagents/toxins.dm
View File

@@ -757,7 +757,7 @@
reagent_state = LIQUID
color = "#FFD300"
glass_name = "beer"
glass_name = REAGENT_ID_BEER
glass_desc = "A freezing pint of beer"
/* Drugs */