cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 06:00:23 +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/food/drinkingglass/drinkingglass.dm
+2 -2
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
code/modules/food/food/cans.dm
+4 -4
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/////////////////////////
code/modules/food/food/drinks.dm
+1 -1
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"
code/modules/food/food/drinks/bottle.dm
+33 -33
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///////////////////////
code/modules/food/food/superfoods.dm
+2 -2
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,
code/modules/food/kitchen/icecream.dm
+5 -5
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)
code/modules/food/recipes_microwave.dm
+5 -5
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