cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 22:00:18 +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

6
code/modules/casino/casino_prize_vendor.dm
View File

@@ -157,10 +157,10 @@
item_list["Drinks"] = list(
CASINO_PRIZE("Redeemer's brew", /obj/item/reagent_containers/food/drinks/bottle/redeemersbrew, 1, 150, "drinks"),
CASINO_PRIZE("Poison wine", /obj/item/reagent_containers/food/drinks/bottle/pwine, 1, 150, "drinks"),
CASINO_PRIZE("Patron", /obj/item/reagent_containers/food/drinks/bottle/patron, 1, 150, "drinks"),
CASINO_PRIZE(REAGENT_PATRON, /obj/item/reagent_containers/food/drinks/bottle/patron, 1, 150, "drinks"),
CASINO_PRIZE("Holy water", /obj/item/reagent_containers/food/drinks/bottle/holywater, 1, 150, "drinks"),
CASINO_PRIZE("Goldschlager", /obj/item/reagent_containers/food/drinks/bottle/goldschlager, 1, 150, "drinks"),
CASINO_PRIZE("Champagne", /obj/item/reagent_containers/food/drinks/bottle/champagne, 1, 150, "drinks"),
CASINO_PRIZE(REAGENT_GOLDSCHLAGER, /obj/item/reagent_containers/food/drinks/bottle/goldschlager, 1, 150, "drinks"),
CASINO_PRIZE(REAGENT_CHAMPAGNE, /obj/item/reagent_containers/food/drinks/bottle/champagne, 1, 150, "drinks"),
CASINO_PRIZE("Bottle of Nothing", /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing, 1, 150, "drinks"),
CASINO_PRIZE("Whiskey bliss", /obj/item/reagent_containers/food/drinks/bottle/specialwhiskey, 1, 150, "drinks"),
)

4
code/modules/food/drinkingglass/drinkingglass.dm
View File

@@ -45,8 +45,8 @@
/obj/item/reagent_containers/food/drinks/glass2/proc/has_ice()
if(reagents.reagent_list.len > 0)
var/datum/reagent/R = reagents.get_master_reagent()
if(!((R.id == "ice") || ("ice" in R.glass_special))) // if it's not a cup of ice, and it's not already supposed to have ice in, see if the bartender's put ice in it
if(reagents.has_reagent("ice", reagents.total_volume / 10)) // 10% ice by volume
if(!((R.id == REAGENT_ID_ICE) || (REAGENT_ID_ICE in R.glass_special))) // if it's not a cup of ice, and it's not already supposed to have ice in, see if the bartender's put ice in it
if(reagents.has_reagent(REAGENT_ID_ICE, reagents.total_volume / 10)) // 10% ice by volume
return 1
return 0

8
code/modules/food/food/cans.dm
View File

@@ -206,7 +206,7 @@
/obj/item/reagent_containers/food/drinks/cans/kvass/Initialize()
. = ..()
reagents.add_reagent("kvass", 30)
reagents.add_reagent(REAGENT_ID_KVASS, 30)
/obj/item/reagent_containers/food/drinks/cans/kompot
name = "\improper Kompot"
@@ -217,7 +217,7 @@
/obj/item/reagent_containers/food/drinks/cans/kompot/Initialize()
. = ..()
reagents.add_reagent("kompot", 30)
reagents.add_reagent(REAGENT_ID_KOMPOT, 30)
/obj/item/reagent_containers/food/drinks/cans/boda
name = "\improper Boda"
@@ -437,7 +437,7 @@
/obj/item/reagent_containers/food/drinks/cans/beercan/Initialize()
. = ..()
reagents.add_reagent("beer", 30)
reagents.add_reagent(REAGENT_ID_BEER, 30)
/obj/item/reagent_containers/food/drinks/cans/alecan
name = "\improper Spacecastle Pale Ale"
@@ -447,7 +447,7 @@
/obj/item/reagent_containers/food/drinks/cans/alecan/Initialize()
. = ..()
reagents.add_reagent("ale", 30)
reagents.add_reagent(REAGENT_ID_ALE, 30)
/////////////////////////ENERGY DRINKS/////////////////////////

2
code/modules/food/food/drinks.dm
View File

@@ -349,7 +349,7 @@
center_of_mass = list("x"=15, "y"=10)
/obj/item/reagent_containers/food/drinks/ice/Initialize()
. = ..()
reagents.add_reagent("ice", 30)
reagents.add_reagent(REAGENT_ID_ICE, 30)
/obj/item/reagent_containers/food/drinks/h_chocolate
name = "cup of Counselor's Choice hot cocoa"

66
code/modules/food/food/drinks/bottle.dm
View File

@@ -228,7 +228,7 @@
/obj/item/reagent_containers/food/drinks/bottle/gin/Initialize()
. = ..()
reagents.add_reagent("gin", 100)
reagents.add_reagent(REAGENT_ID_GIN, 100)
/obj/item/reagent_containers/food/drinks/bottle/whiskey
name = "Uncle Git's Special Reserve"
@@ -238,17 +238,17 @@
/obj/item/reagent_containers/food/drinks/bottle/whiskey/Initialize()
. = ..()
reagents.add_reagent("whiskey", 100)
reagents.add_reagent(REAGENT_ID_WHISKEY, 100)
/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey
name = "Special Blend Whiskey"
name = REAGENT_SPECIALWHISKEY
desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything."
icon_state = "whiskeybottle2"
center_of_mass = list("x"=16, "y"=3)
/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey/Initialize()
. = ..()
reagents.add_reagent("specialwhiskey", 100)
reagents.add_reagent(REAGENT_ID_SPECIALWHISKEY, 100)
/obj/item/reagent_containers/food/drinks/bottle/vodka
name = "Tunguska Triple Distilled"
@@ -258,7 +258,7 @@
/obj/item/reagent_containers/food/drinks/bottle/vodka/Initialize()
. = ..()
reagents.add_reagent("vodka", 100)
reagents.add_reagent(REAGENT_ID_VODKA, 100)
/obj/item/reagent_containers/food/drinks/bottle/tequilla
name = "Caccavo Guaranteed Quality Tequilla"
@@ -268,7 +268,7 @@
/obj/item/reagent_containers/food/drinks/bottle/tequilla/Initialize()
. = ..()
reagents.add_reagent("tequilla", 100)
reagents.add_reagent(REAGENT_ID_TEQUILLA, 100)
/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing
name = "Bottle of Nothing"
@@ -278,7 +278,7 @@
/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing/Initialize()
. = ..()
reagents.add_reagent("nothing", 100)
reagents.add_reagent(REAGENT_ID_NOTHING, 100)
/obj/item/reagent_containers/food/drinks/bottle/patron
name = "Wrapp Artiste Patron"
@@ -288,7 +288,7 @@
/obj/item/reagent_containers/food/drinks/bottle/patron/Initialize()
. = ..()
reagents.add_reagent("patron", 100)
reagents.add_reagent(REAGENT_ID_PATRON, 100)
/obj/item/reagent_containers/food/drinks/bottle/rum
name = "Captain Pete's Cuban Spiced Rum"
@@ -298,7 +298,7 @@
/obj/item/reagent_containers/food/drinks/bottle/rum/Initialize()
. = ..()
reagents.add_reagent("rum", 100)
reagents.add_reagent(REAGENT_ID_RUM, 100)
/obj/item/reagent_containers/food/drinks/bottle/holywater
name = "Flask of Holy Water"
@@ -318,7 +318,7 @@
/obj/item/reagent_containers/food/drinks/bottle/vermouth/Initialize()
. = ..()
reagents.add_reagent("vermouth", 100)
reagents.add_reagent(REAGENT_ID_VERMOUTH, 100)
/obj/item/reagent_containers/food/drinks/bottle/kahlua
name = "Robert Robust's Coffee Liqueur"
@@ -328,7 +328,7 @@
/obj/item/reagent_containers/food/drinks/bottle/kahlua/Initialize()
. = ..()
reagents.add_reagent("kahlua", 100)
reagents.add_reagent(REAGENT_ID_KAHLUA, 100)
/obj/item/reagent_containers/food/drinks/bottle/goldschlager
name = "College Girl Goldschlager"
@@ -338,7 +338,7 @@
/obj/item/reagent_containers/food/drinks/bottle/goldschlager/Initialize()
. = ..()
reagents.add_reagent("goldschlager", 100)
reagents.add_reagent(REAGENT_ID_GOLDSCHLAGER, 100)
/obj/item/reagent_containers/food/drinks/bottle/cognac
name = "Chateau De Baton Premium Cognac"
@@ -348,7 +348,7 @@
/obj/item/reagent_containers/food/drinks/bottle/cognac/Initialize()
. = ..()
reagents.add_reagent("cognac", 100)
reagents.add_reagent(REAGENT_ID_COGNAC, 100)
/obj/item/reagent_containers/food/drinks/bottle/absinthe
name = "Jailbreaker Verte"
@@ -358,7 +358,7 @@
/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize()
. = ..()
reagents.add_reagent("absinthe", 100)
reagents.add_reagent(REAGENT_ID_ABSINTHE, 100)
/obj/item/reagent_containers/food/drinks/bottle/melonliquor //MODIFIED ON 04/21/2021
name = "Emeraldine Melon Liqueur"
@@ -368,7 +368,7 @@
/obj/item/reagent_containers/food/drinks/bottle/melonliquor/Initialize()
. = ..()
reagents.add_reagent("melonliquor", 100)
reagents.add_reagent(REAGENT_ID_MELONLIQUOR, 100)
/obj/item/reagent_containers/food/drinks/bottle/bluecuracao //MODIFIED ON 04/21/2021
name = "Miss Blue Curacao"
@@ -378,17 +378,17 @@
/obj/item/reagent_containers/food/drinks/bottle/bluecuracao/Initialize()
. = ..()
reagents.add_reagent("bluecuracao", 100)
reagents.add_reagent(REAGENT_ID_BLUECURACAO, 100)
/obj/item/reagent_containers/food/drinks/bottle/redeemersbrew
name = "Redeemer's Brew"
name = REAGENT_UNATHILIQUOR
desc = "Just opening the top of this bottle makes you feel a bit tipsy. Not for the faint of heart."
icon_state = "redeemersbrew"
center_of_mass = list("x"=16, "y"=3)
/obj/item/reagent_containers/food/drinks/bottle/redeemersbrew/Initialize()
. = ..()
reagents.add_reagent("unathiliquor", 100)
reagents.add_reagent(REAGENT_ID_UNATHILIQUOR, 100)
/obj/item/reagent_containers/food/drinks/bottle/peppermintschnapps
name = "Dr. Bone's Peppermint Schnapps"
@@ -398,7 +398,7 @@
/obj/item/reagent_containers/food/drinks/bottle/peppermintschnapps/Initialize()
. = ..()
reagents.add_reagent("schnapps_pep", 100)
reagents.add_reagent(REAGENT_ID_SCHNAPPSPEP, 100)
/obj/item/reagent_containers/food/drinks/bottle/peachschnapps
name = "Dr. Bone's Peach Schnapps"
@@ -408,7 +408,7 @@
/obj/item/reagent_containers/food/drinks/bottle/peachschnapps/Initialize()
. = ..()
reagents.add_reagent("schnapps_pea", 100)
reagents.add_reagent(REAGENT_ID_SCHNAPPSPEA, 100)
/obj/item/reagent_containers/food/drinks/bottle/lemonadeschnapps
name = "Dr. Bone's Lemonade Schnapps"
@@ -418,7 +418,7 @@
/obj/item/reagent_containers/food/drinks/bottle/lemonadeschnapps/Initialize()
. = ..()
reagents.add_reagent("schnapps_lem", 100)
reagents.add_reagent(REAGENT_ID_SCHNAPPSLEM, 100)
/obj/item/reagent_containers/food/drinks/bottle/jager
name = "Schusskonig"
@@ -428,7 +428,7 @@
/obj/item/reagent_containers/food/drinks/bottle/jager/Initialize()
. = ..()
reagents.add_reagent("jager", 100)
reagents.add_reagent(REAGENT_ID_JAGER, 100)
/////////////////////////WINES/////////////////////////
@@ -440,7 +440,7 @@
/obj/item/reagent_containers/food/drinks/bottle/wine/Initialize()
. = ..()
reagents.add_reagent("redwine", 100)
reagents.add_reagent(REAGENT_ID_REDWINE, 100)
/obj/item/reagent_containers/food/drinks/bottle/whitewine
name = "Doublebeard Bearded Special White"
@@ -450,7 +450,7 @@
/obj/item/reagent_containers/food/drinks/bottle/whitewine/Initialize()
. = ..()
reagents.add_reagent("whitewine", 100)
reagents.add_reagent(REAGENT_ID_WHITEWINE, 100)
/obj/item/reagent_containers/food/drinks/bottle/carnoth //anagram of 'ntcahors' where the bottle sprite originated from
name = "NanoTrasen Carnoth Red"
@@ -460,7 +460,7 @@
/obj/item/reagent_containers/food/drinks/bottle/carnoth/Initialize()
. = ..()
reagents.add_reagent("carnoth", 100)
reagents.add_reagent(REAGENT_ID_CARNOTH, 100)
/obj/item/reagent_containers/food/drinks/bottle/pwine
name = "Warlock's Velvet"
@@ -470,7 +470,7 @@
/obj/item/reagent_containers/food/drinks/bottle/pwine/Initialize()
. = ..()
reagents.add_reagent("pwine", 100)
reagents.add_reagent(REAGENT_ID_PWINE, 100)
/obj/item/reagent_containers/food/drinks/bottle/champagne
name = "Gilthari Luxury Champagne"
@@ -480,7 +480,7 @@
/obj/item/reagent_containers/food/drinks/bottle/champagne/Initialize()
. = ..()
reagents.add_reagent("champagne", 100)
reagents.add_reagent(REAGENT_ID_CHAMPAGNE, 100)
/obj/item/reagent_containers/food/drinks/bottle/sake
name = "Mono-No-Aware Luxury Sake"
@@ -490,7 +490,7 @@
/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize()
. = ..()
reagents.add_reagent("sake", 100)
reagents.add_reagent(REAGENT_ID_SAKE, 100)
//////////////////////////JUICES AND STUFF///////////////////////
@@ -665,7 +665,7 @@
/obj/item/reagent_containers/food/drinks/bottle/small/beer/Initialize()
. = ..()
reagents.add_reagent("beer", 50)
reagents.add_reagent(REAGENT_ID_BEER, 50)
/obj/item/reagent_containers/food/drinks/bottle/small/beer/silverdragon
name = "Silver Dragon pilsner"
@@ -687,7 +687,7 @@
/obj/item/reagent_containers/food/drinks/bottle/small/litebeer/Initialize()
. = ..()
reagents.add_reagent("litebeer", 50)
reagents.add_reagent(REAGENT_ID_LITEBEER, 50)
/obj/item/reagent_containers/food/drinks/bottle/small/cider
name = "Crisp's Cider"
@@ -697,7 +697,7 @@
/obj/item/reagent_containers/food/drinks/bottle/small/cider/Initialize()
. = ..()
reagents.add_reagent("cider", 50)
reagents.add_reagent(REAGENT_ID_CIDER, 50)
/obj/item/reagent_containers/food/drinks/bottle/small/ale
name = "\improper Magm-Ale"
@@ -708,7 +708,7 @@
/obj/item/reagent_containers/food/drinks/bottle/small/ale/Initialize()
. = ..()
reagents.add_reagent("ale", 50)
reagents.add_reagent(REAGENT_ID_ALE, 50)
/obj/item/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper
name = "Hushed Whisper IPA"
@@ -718,7 +718,7 @@
/obj/item/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper/Initialize()
. = ..()
reagents.add_reagent("ale", 50)
reagents.add_reagent(REAGENT_ID_ALE, 50)
//////////////////////////SMALL BOTTLED SODA///////////////////////

4
code/modules/food/food/superfoods.dm
View File

@@ -23,7 +23,7 @@
result = /obj/item/chaoscake_layer
/datum/recipe/chaoscake_layerthree
reagents = list(REAGENT_ID_FLOUR = 25, REAGENT_ID_MILK = 15, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, "deathbell" = 10)
reagents = list(REAGENT_ID_FLOUR = 25, REAGENT_ID_MILK = 15, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, REAGENT_ID_DEATHBELL = 10)
fruit = list("grapes" = 3)
items = list(
/obj/item/reagent_containers/food/snacks/dough,
@@ -62,7 +62,7 @@
result = /obj/item/chaoscake_layer/six
/datum/recipe/chaoscake_layerseven
reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3, "devilskiss" = 20)
reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3, REAGENT_ID_DEVILSKISS = 20)
fruit = list("potato" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/dough,

10
code/modules/food/kitchen/icecream.dm
View File

@@ -24,17 +24,17 @@
/obj/machinery/icecream_vat/proc/get_ingredient_list(var/type)
switch(type)
if(ICECREAM_CHOCOLATE)
return list(REAGENT_ID_MILK, "ice", REAGENT_ID_COCO)
return list(REAGENT_ID_MILK, REAGENT_ID_ICE, REAGENT_ID_COCO)
if(ICECREAM_STRAWBERRY)
return list(REAGENT_ID_MILK, "ice", REAGENT_ID_BERRYJUICE)
return list(REAGENT_ID_MILK, REAGENT_ID_ICE, REAGENT_ID_BERRYJUICE)
if(ICECREAM_BLUE)
return list(REAGENT_ID_MILK, "ice", "singulo")
return list(REAGENT_ID_MILK, REAGENT_ID_ICE, REAGENT_ID_SINGULO)
if(CONE_WAFFLE)
return list(REAGENT_ID_FLOUR, REAGENT_ID_SUGAR)
if(CONE_CHOC)
return list(REAGENT_ID_FLOUR, REAGENT_ID_SUGAR, REAGENT_ID_COCO)
else
return list(REAGENT_ID_MILK, "ice")
return list(REAGENT_ID_MILK, REAGENT_ID_ICE)
/obj/machinery/icecream_vat/proc/get_flavour_name(var/flavour_type)
switch(flavour_type)
@@ -59,7 +59,7 @@
reagents.add_reagent(REAGENT_ID_MILK, 5)
reagents.add_reagent(REAGENT_ID_FLOUR, 5)
reagents.add_reagent(REAGENT_ID_SUGAR, 5)
reagents.add_reagent("ice", 5)
reagents.add_reagent(REAGENT_ID_ICE, 5)
/obj/machinery/icecream_vat/attack_hand(mob/user as mob)
user.set_machine(src)

10
code/modules/food/recipes_microwave.dm
View File

@@ -170,11 +170,11 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/meatsteak
/datum/recipe/spacylibertyduff
reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, REAGENT_ID_PSILOCYBIN = 5)
reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_VODKA = 5, REAGENT_ID_PSILOCYBIN = 5)
result = /obj/item/reagent_containers/food/snacks/spacylibertyduff
/datum/recipe/amanitajelly
reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, REAGENT_ID_AMATOXIN = 5)
reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_VODKA = 5, REAGENT_ID_AMATOXIN = 5)
result = /obj/item/reagent_containers/food/snacks/amanitajelly
/datum/recipe/amanitajelly/make_food(var/obj/container as obj)
@@ -352,7 +352,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/caramelapple
/datum/recipe/twobread
reagents = list("redwine" = 5)
reagents = list(REAGENT_ID_REDWINE = 5)
items = list(
/obj/item/reagent_containers/food/snacks/slice/bread,
/obj/item/reagent_containers/food/snacks/slice/bread,
@@ -502,7 +502,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/mashedpotato
/datum/recipe/icecreamsandwich
reagents = list(REAGENT_ID_MILK = 5, "ice" = 5)
reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_ICE = 5)
items = list(
/obj/item/reagent_containers/food/snacks/icecream
)
@@ -833,7 +833,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/chilicheesefries
/datum/recipe/risotto
reagents = list("redwine" = 5, REAGENT_ID_RICE = 10, REAGENT_ID_SPACESPICE = 1)
reagents = list(REAGENT_ID_REDWINE = 5, REAGENT_ID_RICE = 10, REAGENT_ID_SPACESPICE = 1)
fruit = list("mushroom" = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //Get that rice and wine outta here
result = /obj/item/reagent_containers/food/snacks/risotto

2
code/modules/hydroponics/seed.dm
View File

@@ -467,7 +467,7 @@
REAGENT_ID_MACROCILLIN,
REAGENT_ID_MICROCILLIN,
REAGENT_ID_NORMALCILLIN,
"magicdust"
REAGENT_ID_MAGICDUST
)
// VOREStation Edit End: Modified exclusion list

2
code/modules/hydroponics/seedtypes/gnomes.dm
View File

@@ -4,7 +4,7 @@
seed_name = "gnomes"
display_name = "gnomes"
force_layer = 3
chems = list("magicdust" = list(5,20))
chems = list(REAGENT_ID_MAGICDUST = list(5,20))
/datum/seed/gnomes/New()
..()

2
code/modules/hydroponics/seedtypes/telriis.dm
View File

@@ -3,7 +3,7 @@
seed_name = "telriis"
display_name = "telriis grass"
kitchen_tag = "telriis"
chems = list("pwine" = list(1,5), REAGENT_ID_NUTRIMENT = list(1,6))
chems = list(REAGENT_ID_PWINE = list(1,5), REAGENT_ID_NUTRIMENT = list(1,6))
/datum/seed/telriis/New()
..()

2
code/modules/hydroponics/seedtypes/tomatoes.dm
View File

@@ -65,7 +65,7 @@
seed_name = "bluespace tomato"
display_name = "bluespace tomato plant"
mutants = null
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "singulo" = list(10,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_SINGULO = list(10,5))
/datum/seed/tomato/blue/teleport/New()
..()

6
code/modules/hydroponics/trays/tray.dm
View File

@@ -67,7 +67,7 @@
)
var/static/list/nutrient_reagents = list(
REAGENT_ID_MILK = 0.1,
"beer" = 0.25,
REAGENT_ID_BEER = 0.25,
REAGENT_ID_PHOSPHORUS = 0.1,
REAGENT_ID_SUGAR = 0.1,
REAGENT_ID_SODAWATER = 0.1,
@@ -98,7 +98,7 @@
REAGENT_ID_WATER = 1,
REAGENT_ID_ADMINORDRAZINE = 1,
REAGENT_ID_MILK = 0.9,
"beer" = 0.7,
REAGENT_ID_BEER = 0.7,
REAGENT_ID_FLUORINE = -0.5,
REAGENT_ID_CHLORINE = -0.5,
REAGENT_ID_PHOSPHORUS = -0.5,
@@ -108,7 +108,7 @@
// Beneficial reagents also have values for modifying health, yield_mod and mut_mod (in that order).
var/static/list/beneficial_reagents = list(
"beer" = list( -0.05, 0, 0 ),
REAGENT_ID_BEER = list( -0.05, 0, 0 ),
REAGENT_ID_FLUORINE = list( -2, 0, 0 ),
REAGENT_ID_CHLORINE = list( -1, 0, 0 ),
REAGENT_ID_PHOSPHORUS = list( -0.75, 0, 0 ),

8
code/modules/mining/ore_redemption_machine/equipment_vendor.dm
View File

@@ -19,8 +19,8 @@
new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 10),
new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 100),
new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 300),
new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125),
new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125),
new /datum/data/mining_equipment(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125),
new /datum/data/mining_equipment(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125),
new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 150),
new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 200),
new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 900),
@@ -153,7 +153,7 @@
EQUIPMENT("Hardsuit - Proto-Kinetic Gauntlets", /obj/item/rig_module/gauntlets, 2000),
)
prize_list["Miscellaneous"] = list(
EQUIPMENT("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125),
EQUIPMENT(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125),
EQUIPMENT("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 150),
EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 500),
EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 1000),
@@ -165,7 +165,7 @@
EQUIPMENT("Thalers - 100", /obj/item/spacecash/c100, 1000),
EQUIPMENT("Thalers - 1000", /obj/item/spacecash/c1000, 10000),
EQUIPMENT("Umbrella", /obj/item/melee/umbrella/random, 200),
EQUIPMENT("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125),
EQUIPMENT(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125),
EQUIPMENT("Mining PSG Upgrade Disk", /obj/item/borg/upgrade/shield_upgrade, 2500),
)
prize_list["Extra"] = list() // Used in child vendors

8
code/modules/mining/ore_redemption_machine/survey_vendor.dm
View File

@@ -12,8 +12,8 @@
new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 1),
new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 10),
new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 30),
new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 120),
new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 120),
new /datum/data/mining_equipment(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 120),
new /datum/data/mining_equipment(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 120),
new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 15),
new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 20),
new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 90),
@@ -96,8 +96,8 @@
EQUIPMENT("Survey Tools - Binoculars", /obj/item/binoculars,40),
)
prize_list["Miscellaneous"] = list(
EQUIPMENT("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 10),
EQUIPMENT("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 10),
EQUIPMENT(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 10),
EQUIPMENT(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 10),
EQUIPMENT("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 15),
EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 50),
EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 100),

4
code/modules/mob/living/silicon/robot/sprites/civilian.dm
View File

@@ -206,12 +206,12 @@
rest_sprite_options = list("Default")
has_extra_customization = TRUE
var/list/booze_options = list("Beer" = "booze",
var/list/booze_options = list(REAGENT_BEER = "booze",
"Space Mountain Wind" = "boozegreen",
"Curacao" = "boozeblue",
REAGENT_GRAPESODA = "boozepurple",
"Demon's Blood" = "boozered",
"Whiskey Soda" = "boozeorange",
REAGENT_WHISKEYSODA = "boozeorange",
REAGENT_COFFEE = "boozebrown")
/datum/robot_sprite/dogborg/service/booze/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg)

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 */

2
code/modules/vore/fluffstuff/custom_items_vr.dm
View File

@@ -1160,7 +1160,7 @@
/obj/item/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor/Initialize()
. = ..()
reagents.add_reagent("pwine", 60)
reagents.add_reagent(REAGENT_ID_PWINE, 60)
//RadiantAurora: Tiemli Kroto
/obj/item/clothing/glasses/welding/tiemgogs

4
code/modules/xenoarcheaology/effect_master.dm
View File

@@ -305,7 +305,7 @@
else if(W.reagents.has_reagent(REAGENT_ID_PHORON, 1) || W.reagents.has_reagent(REAGENT_ID_THERMITE, 1))
if(my_effect.trigger == TRIGGER_VOLATILE)
my_effect.ToggleActivate()
else if(W.reagents.has_reagent(REAGENT_ID_TOXIN, 1) || W.reagents.has_reagent(REAGENT_ID_CYANIDE, 1) || W.reagents.has_reagent(REAGENT_ID_AMATOXIN, 1) || W.reagents.has_reagent("neurotoxin", 1))
else if(W.reagents.has_reagent(REAGENT_ID_TOXIN, 1) || W.reagents.has_reagent(REAGENT_ID_CYANIDE, 1) || W.reagents.has_reagent(REAGENT_ID_AMATOXIN, 1) || W.reagents.has_reagent(REAGENT_ID_NEUROTOXIN, 1))
if(my_effect.trigger == TRIGGER_TOXIN)
my_effect.ToggleActivate()
else if(istype(W,/obj/item/melee/baton) && W:status ||\
@@ -330,7 +330,7 @@
var/list/water = list(REAGENT_ID_HYDROGEN, REAGENT_ID_WATER)
var/list/acid = list(REAGENT_ID_SACID, REAGENT_ID_PACID, REAGENT_ID_DIETHYLAMINE)
var/list/volatile = list(REAGENT_ID_PHORON,REAGENT_ID_THERMITE)
var/list/toxic = list(REAGENT_ID_TOXIN,REAGENT_ID_CYANIDE,REAGENT_ID_AMATOXIN,"neurotoxin")
var/list/toxic = list(REAGENT_ID_TOXIN,REAGENT_ID_CYANIDE,REAGENT_ID_AMATOXIN,REAGENT_ID_NEUROTOXIN)
for(var/datum/artifact_effect/my_effect in my_effects)
if(Touching.id in water)

2
code/modules/xenoarcheaology/finds/special.dm
View File

@@ -8,7 +8,7 @@
/obj/item/reagent_containers/glass/replenishing/Initialize()
. = ..()
START_PROCESSING(SSobj, src)
spawning_id = pick(REAGENT_ID_BLOOD,REAGENT_ID_HOLYWATER,REAGENT_ID_LUBE,REAGENT_ID_STOXIN,REAGENT_ID_ETHANOL,"ice",REAGENT_ID_GLYCEROL,REAGENT_ID_FUEL,REAGENT_ID_CLEANER)
spawning_id = pick(REAGENT_ID_BLOOD,REAGENT_ID_HOLYWATER,REAGENT_ID_LUBE,REAGENT_ID_STOXIN,REAGENT_ID_ETHANOL,REAGENT_ID_ICE,REAGENT_ID_GLYCEROL,REAGENT_ID_FUEL,REAGENT_ID_CLEANER)
/obj/item/reagent_containers/glass/replenishing/process()
reagents.add_reagent(spawning_id, 0.3)

2
code/modules/xenobio/items/extracts_vr.dm
View File

@@ -801,7 +801,7 @@
/decl/chemical_reaction/instant/slime/dark_blue_ice
name = "Slime Ice"
id = "m_darkblue_ice"
result = "ice"
result = REAGENT_ID_ICE
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 5
required = /obj/item/slime_extract/dark_blue

2
code/modules/xenobio2/_xeno_setup_vr.dm
View File

@@ -61,5 +61,5 @@
xenoChemList += REAGENT_ID_FROSTOIL
xenoChemList += REAGENT_ID_CAPSAICIN
xenoChemList += REAGENT_ID_CONDENSEDCAPSAICIN
xenoChemList += "neurotoxin"
xenoChemList += REAGENT_ID_NEUROTOXIN
return 1

2
code/modules/xenobio2/mob/slime/slime.dm
View File

@@ -56,7 +56,7 @@ Slime definitions, Life and New live here.
REAGENT_ID_CHLORINE = list(XENO_CHEM_TOXIC = 0.5),
REAGENT_ID_AMMONIA = list(XENO_CHEM_TOXIC = 0.5),
REAGENT_ID_SODAWATER = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_NUTRI = -0.1),
"beer" = list(XENO_CHEM_NUTRI = 0.6),
REAGENT_ID_BEER = list(XENO_CHEM_NUTRI = 0.6),
REAGENT_ID_DIETHYLAMINE = list(XENO_CHEM_NUTRI = 0.9),
REAGENT_ID_SUGAR = list(XENO_CHEM_TOXIC = 0.4, XENO_CHEM_NUTRI = 0.2),
REAGENT_ID_EZNUTRIENT = list(XENO_CHEM_NUTRI = 0.8),