diff --git a/code/game/machinery/vending_items.dm b/code/game/machinery/vending_items.dm index 7fe06ced116..767763ae0d3 100644 --- a/code/game/machinery/vending_items.dm +++ b/code/game/machinery/vending_items.dm @@ -99,6 +99,11 @@ vend_id = "zora" charges = 40 +/obj/item/device/vending_refill/frontiervend + name = "frontiervend resupply canister" + vend_id = "frontiervend" + charges = 220 + /obj/item/device/vending_refill/battlemonsters name = "Battlemonsters resupply canister" vend_id = "battlemonsters" diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 2e0339ef1f0..b4bc29c6567 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -32,6 +32,8 @@ /obj/item/device/vending_refill/coffee = 1, /obj/item/device/vending_refill/snack = 1, /obj/item/device/vending_refill/cola = 1, + /obj/item/device/vending_refill/zora = 1, + /obj/item/device/vending_refill/frontiervend = 1, /obj/item/device/vending_refill/smokes = 1, /obj/item/device/vending_refill/meds = 1, /obj/item/device/vending_refill/robust = 1, @@ -108,6 +110,8 @@ /obj/item/reagent_containers/food/drinks/bottle/kvass = 3, /obj/item/reagent_containers/food/drinks/bottle/tarasun = 3, /obj/item/reagent_containers/food/drinks/bottle/valokki_wine = 3, + /obj/item/reagent_containers/food/drinks/bottle/twentytwoseventyfive = 3, + /obj/item/reagent_containers/food/drinks/bottle/saintjacques = 1, /obj/item/reagent_containers/food/drinks/bottle/hooch = 1, /obj/item/reagent_containers/food/drinks/cans/grape_juice = 6, /obj/item/reagent_containers/food/drinks/cans/beetle_milk = 2, @@ -1645,6 +1649,87 @@ /obj/item/reagent_containers/food/drinks/bottle/champagne = 100 ) +/obj/machinery/vending/frontiervend + name = "\improper FrontierVend" + desc = "A vending machine specialized in snacks from the Coalition of Colonies." + desc_extended = "Almost rebranded to the 'Coalition of Snackolonies', the FrontierVend brand is owned by a now-subsidiary of Orion Express specialized in food exports. These machines \ + are omnipresent throughout the settled regions of human space, forming a sort of Coalition superculture; it's easier to sympathize with someone if you eat the same snacks." + icon_state = "frontiervend" + icon_vend = "frontiervend-vend" + product_slogans = "At least 85 billion served!;A new frontier of flavors!;Snacking for a free frontier!;Every purchase made supports the efforts of the Frontier Protection Bureau!" + product_ads = "Roundhouse kick a Solarian into the concrete.;Slam-dunk Solarians into the trashcan.;Launch Solarians into the sun.;Frost got what he deserved." + vend_id = "frontiervend" + + products = list( + /obj/item/reagent_containers/food/drinks/cans/himeokvass = 8, + /obj/item/reagent_containers/food/drinks/cans/boch = 8, + /obj/item/reagent_containers/food/drinks/cans/boch/buckthorn = 8, + /obj/item/reagent_containers/food/drinks/cans/xanuchai = 6, + /obj/item/reagent_containers/food/drinks/cans/xanuchai/creme = 8, + /obj/item/reagent_containers/food/drinks/cans/xanuchai/chocolate = 8, + /obj/item/reagent_containers/food/drinks/cans/xanuchai/neapolitan = 8, + /obj/item/reagent_containers/food/drinks/cans/galatea = 8, + /obj/item/reagent_containers/food/drinks/bottle/bestblend = 6, + /obj/item/reagent_containers/food/snacks/fishjerky = 8, + /obj/item/reagent_containers/food/snacks/pepperoniroll = 8, + /obj/item/reagent_containers/food/snacks/salmiak = 6, + /obj/item/reagent_containers/food/snacks/hakhspam = 6, + /obj/item/reagent_containers/food/snacks/pemmicanbar = 8, + /obj/item/reagent_containers/food/snacks/choctruffles = 6, + /obj/item/reagent_containers/food/snacks/peanutsnack = 8, + /obj/item/reagent_containers/food/snacks/peanutsnack/pepper = 6, + /obj/item/reagent_containers/food/snacks/peanutsnack/choc = 6, + /obj/item/reagent_containers/food/snacks/peanutsnack/masala = 6, + /obj/item/reagent_containers/food/snacks/chana = 8, + /obj/item/reagent_containers/food/snacks/chana/wild = 8, + /obj/item/reagent_containers/food/snacks/papad = 8, + /obj/item/reagent_containers/food/snacks/papad/garlic = 8, + /obj/item/reagent_containers/food/snacks/papad/ginger = 8, + /obj/item/reagent_containers/food/snacks/papad/apple = 8, + /obj/item/storage/box/fancy/foysnack = 4 + ) + prices = list( + /obj/item/reagent_containers/food/drinks/cans/himeokvass = 20, + /obj/item/reagent_containers/food/drinks/cans/boch = 15, + /obj/item/reagent_containers/food/drinks/cans/boch/buckthorn = 15, + /obj/item/reagent_containers/food/drinks/cans/xanuchai = 15, + /obj/item/reagent_containers/food/drinks/cans/xanuchai/creme = 15, + /obj/item/reagent_containers/food/drinks/cans/xanuchai/chocolate = 15, + /obj/item/reagent_containers/food/drinks/cans/xanuchai/neapolitan = 15, + /obj/item/reagent_containers/food/drinks/cans/galatea = 25, + /obj/item/reagent_containers/food/drinks/bottle/bestblend = 20, + /obj/item/reagent_containers/food/snacks/fishjerky = 20, + /obj/item/reagent_containers/food/snacks/pepperoniroll = 20, + /obj/item/reagent_containers/food/snacks/salmiak = 20, + /obj/item/reagent_containers/food/snacks/hakhspam = 25, + /obj/item/reagent_containers/food/snacks/pemmicanbar = 15, + /obj/item/reagent_containers/food/snacks/choctruffles = 20, + /obj/item/reagent_containers/food/snacks/peanutsnack = 15, + /obj/item/reagent_containers/food/snacks/peanutsnack/pepper = 15, + /obj/item/reagent_containers/food/snacks/peanutsnack/choc = 15, + /obj/item/reagent_containers/food/snacks/peanutsnack/masala = 15, + /obj/item/reagent_containers/food/snacks/chana = 18, + /obj/item/reagent_containers/food/snacks/chana/wild = 18, + /obj/item/reagent_containers/food/snacks/papad = 15, + /obj/item/reagent_containers/food/snacks/papad/garlic = 15, + /obj/item/reagent_containers/food/snacks/papad/ginger = 15, + /obj/item/reagent_containers/food/snacks/papad/apple = 15, + /obj/item/storage/box/fancy/foysnack = 25 + ) + contraband = list() + premium = list( + /obj/item/toy/comic/inspector = 2, + /obj/item/toy/comic/stormman = 2, + /obj/item/toy/plushie/greimorian = 2 + ) + random_itemcount = 0 + light_color = COLOR_BABY_BLUE + +/obj/machinery/vending/frontiervend/hacked + name = "hacked FrontierVend" + desc = "A complimentary FrontierVend machine. No money? No worries." + prices = list() + /obj/machinery/vending/rental_bikes name = "\improper Rental Bikes self-service vendor" desc = "Rent-a-bike, for a day!" diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index b3ad683f1b7..3d1f30dc669 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -338,3 +338,65 @@ icon_state = "custard_bowl" drop_sound = 'sound/items/drop/glass.ogg' pickup_sound = 'sound/items/pickup/glass.ogg' + +/obj/item/trash/fishjerky + name = "Go-Go Gwok! Great Grouper" + icon_state = "fishjerky_trash" + +/obj/item/trash/pepperoniroll + name = "roll wrapper" + icon_state = "rollwrapper" + +/obj/item/trash/salmiakpack + name = "salmiak packet" + icon_state = "salmiak_pack" + +/obj/item/trash/hakhmaps + name = "maps tin" + icon_state = "hakhmaps_trash" + +/obj/item/trash/pemmican + name = "pemmican bar wrapper" + icon_state = "pemmican_trash" + +/obj/item/trash/trufflebag + name = "truffle bag" + icon_state = "trufflebag_trash" + +/obj/item/trash/peanutsnack + name = "peanut bag" + icon_state = "nuts_trash" + +/obj/item/trash/peanutsnack/pepper + icon_state = "peppernuts_trash" + +/obj/item/trash/peanutsnack/choc + icon_state = "chocnuts_trash" + +/obj/item/trash/peanutsnack/masala + icon_state = "masalanuts_trash" + +/obj/item/trash/chana + name = "chana wrapper" + icon_state = "chanamild_trash" + +/obj/item/trash/chana/wild + icon_state = "chanawild_trash" + +/obj/item/trash/foysnack + name = "cookie wrapper" + icon_state = "foysnack_trash" + +/obj/item/trash/papad + name = "empty papad box" + icon_state = "papad_trash" + +/obj/item/trash/papad/garlic + icon_state = "papadgarlic_trash" + +/obj/item/trash/papad/ginger + icon_state = "papadginger_trash" + +/obj/item/trash/papad/apple + icon_state = "papadapple_trash" + diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index 275f760c06b..3daf5ac085a 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -93,6 +93,8 @@ coffeecups["Idris coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/idris coffeecups["Zeng-Hu coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/zeng coffeecups["TCFL coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tcfl + coffeecups["All-Xanu Republic cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/xanu + coffeecups["Galatea cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/galatea coffeecups["#1 coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/one coffeecups["#1 monkey coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/puni coffeecups["heart coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/heart diff --git a/code/modules/cooking/recipes/cultural/recipes_human.dm b/code/modules/cooking/recipes/cultural/recipes_human.dm index d61ec49cfe0..e5eca483dc8 100644 --- a/code/modules/cooking/recipes/cultural/recipes_human.dm +++ b/code/modules/cooking/recipes/cultural/recipes_human.dm @@ -358,3 +358,105 @@ ) reagent_mix = RECIPE_REAGENT_REPLACE //Simplify and replace result = /obj/item/reagent_containers/food/snacks/traumwurst + +// Xanu Prime + +/singleton/recipe/steakxanu + appliance = SKILLET + reagents = list(/singleton/reagent/blackpepper = 2, /singleton/reagent/spacespice = 2, /singleton/reagent/drink/milk/cream = 5) + items = list( + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/steakxanu + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/xanu_curry + appliance = SAUCEPAN | POT + reagents = list(/singleton/reagent/spacespice = 4, /singleton/reagent/drink/milk = 5, /singleton/reagent/nutriment/rice = 10) + fruit = list("garlic" = 1 , "chickpeas" = 1, "onion" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/xanu_curry + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/bunkerbuster + appliance = MIX + reagents = list(/singleton/reagent/spacespice = 3) + items = list( + /obj/item/reagent_containers/food/snacks/friedegg/overeasy, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/flatbread + ) + result = /obj/item/reagent_containers/food/snacks/bunkerbuster + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/crozets + appliance = SAUCEPAN | POT + reagents = list(/singleton/reagent/blackpepper = 2, /singleton/reagent/spacespice = 2) + fruit = list("tomato" = 1, "chili" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/spaghetti, + /obj/item/reagent_containers/food/snacks/spreads/lard, + /obj/item/reagent_containers/food/snacks/fish/fishfillet + ) + result = /obj/item/reagent_containers/food/snacks/crozets + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/seafoodplatter + appliance = MIX + reagents = list(/singleton/reagent/blackpepper = 2, /singleton/reagent/spacespice = 2, /singleton/reagent/alcohol/beer = 5) + items = list( + /obj/item/reagent_containers/food/snacks/fish/fishfillet, + /obj/item/reagent_containers/food/snacks/clam, + /obj/item/reagent_containers/food/snacks/crabmeat + + ) + result = /obj/item/reagent_containers/food/snacks/seafoodplatter + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/xanuvindaloo + appliance = SAUCEPAN | POT + fruit = list("tomato" = 1, "chili" = 1) + reagents = list(/singleton/reagent/blackpepper = 2, /singleton/reagent/spacespice = 2, /singleton/reagent/drink/milk/cream = 5, /singleton/reagent/nutriment/vanilla = 3) + items = list( + /obj/item/reagent_containers/food/snacks/meat/chicken + ) + result = /obj/item/reagent_containers/food/snacks/xanuvindaloo + reagent_mix = RECIPE_REAGENT_REPLACE + +// Himeo + +/singleton/recipe/minerpie + appliance = SKILLET + reagents = list(/singleton/reagent/blackpepper = 2, /singleton/reagent/spacespice = 2, /singleton/reagent/drink/milk/cream = 5) + fruit = list("onion" = 1, "plumphelmet" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/meat, + /obj/item/reagent_containers/food/snacks/dough + ) + result = /obj/item/reagent_containers/food/snacks/minerpie + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/hakhmaparm + appliance = SKILLET + fruit = list("tomato" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/meat/hakhma, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/bun, + ) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/hakhmaparm + +/singleton/recipe/steelworkersandwich + appliance = SKILLET + fruit = list("cabbage" = 1, "tomato" = 1) + reagents = list(/singleton/reagent/blackpepper = 2, /singleton/reagent/spacespice = 2) + items = list( + /obj/item/reagent_containers/food/snacks/meatsteak, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/fries + ) + result = /obj/item/reagent_containers/food/snacks/steelworkersandwich + reagent_mix = RECIPE_REAGENT_REPLACE diff --git a/code/modules/cooking/recipes/recipes_burger.dm b/code/modules/cooking/recipes/recipes_burger.dm index 239c17ef06a..894c778fdeb 100644 --- a/code/modules/cooking/recipes/recipes_burger.dm +++ b/code/modules/cooking/recipes/recipes_burger.dm @@ -110,6 +110,18 @@ /obj/item/reagent_containers/food/snacks/bun ) result = /obj/item/reagent_containers/food/snacks/chickenfillet + +/singleton/recipe/chickenparm + appliance = SKILLET + fruit = list("tomato" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/meat/chicken, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/bun, + ) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/chickenparm + /singleton/recipe/sloppyjoe appliance = SKILLET items = list( diff --git a/code/modules/mob/living/simple_animal/friendly/hakhma.dm b/code/modules/mob/living/simple_animal/friendly/hakhma.dm index 001aa65a10d..d0886722f2a 100644 --- a/code/modules/mob/living/simple_animal/friendly/hakhma.dm +++ b/code/modules/mob/living/simple_animal/friendly/hakhma.dm @@ -1,6 +1,6 @@ /mob/living/simple_animal/hakhma name = "hakhma" - desc = "An oversized insect breed by Scarab colony ships, known for their milk." + desc = "An oversized insect bred by Scarab colony ships, known for their milk." icon = 'icons/mob/npc/livestock.dmi' icon_state = "hakhma" icon_living = "hakhma" @@ -12,6 +12,7 @@ speak_chance = 1 turns_per_move = 5 meat_amount = 35 + meat_type = /obj/item/reagent_containers/food/snacks/meat/hakhma organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg") response_help = "pets" response_disarm = "gently pushes aside" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 312212ad5e6..6bb143dc0d6 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1551,6 +1551,16 @@ glass_name = "cup of chocolate chai tea" glass_desc = "A surprisingly pleasant mix of chocolate and spice." +/singleton/reagent/drink/tea/neapolitan_chaitea + name = "Neapolitan Chai" + description = "A Xanan innovation; spiced tea with notes of vanilla, chocolate, and strawberry." + color = "#DBAD81" + taste_description = "neapolitan ice cream" + + glass_icon_state = "chaitea" + glass_name = "cup of neapolitan chai tea" + glass_desc = "A Xanan innovation; spiced tea with notes of vanilla, chocolate, and strawberry." + /singleton/reagent/drink/tea/chaitealatte name = "Chai Latte" description = "A frothy spiced tea." @@ -2465,6 +2475,63 @@ glass_name = "mug of apple cider juice" glass_desc = "It's just spiced up apple juice. Sometimes the barista can't work miracles." +/singleton/reagent/drink/mushroom_kvass + name = "Mushroom Kvass" + description = "A fermented drink derived from mushroom bread. Contains too little alcohol to get anyone drunk." + color = "#c7882a" + taste_description = "tangy, earthy fruitiness" + + glass_icon_state = "mushroomkvass" + glass_name = "glass of mushroom kvass" + glass_desc = "Mushroom vodka's non-alcoholic cousin. For fellow workers of all ages." + glass_center_of_mass = list("x"=16, "y"=9) + +/singleton/reagent/drink/bochbrew + name = "Boch Brew" + description = "A soft drink derived from the digestive sacs of the boch-kivir." + color = "#b325b3" + adj_sleepy = -1 + caffeine = 0.2 + taste_description = "fizzy fruit" + carbonated = TRUE + + glass_icon_state = "berryjuice" + glass_name = "glass of berry boch brew" + glass_desc = "A soft drink derived from the digestive sacs of the boch-kivir." + +/singleton/reagent/drink/bochbrew/buckthorn + name = "Buckthorn Boch Brew" + description = "A soft drink derived from the digestive sacs of the boch-kivir. This one is buckthorn flavored." + color = "#cf7e14" + taste_description = "fizzy sweet-tart candy" + + glass_icon_state = "orangejuice" + glass_name = "glass of buckthorn boch brew" + glass_desc = "A soft drink derived from the digestive sacs of the boch-kivir." + +/singleton/reagent/drink/sugarcane + name = "Mahendru's Best Blend" + description = "All-natural sugarcane juice mixed with apple flavorings." + color = "#dacfc6" + taste_description = "flowery honey and apples" + +/singleton/reagent/drink/galatea + name = "Gala-Tea energy drink" + description = "An extremely potent energy drink. The Ministry of Food Safety assures the public that drinking thirty standard units a week is perfectly safe." + color = "#1bda9a" + taste_description = "saccharine and formaldehyde" + +/singleton/reagent/drink/galatea/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) + if(alien != IS_DIONA) + if(prob(2)) + to_chat(M, SPAN_GOOD(pick("You feel utterly focused.", "You have a sudden fit of creativity.", "You feel alert and focused."))) + +/singleton/reagent/drink/galatea/overdose(var/mob/living/carbon/M, var/alien, var/datum/reagents/holder) + if(!(alien in list(IS_DIONA))) + M.make_jittery(5) + if(prob(2)) + to_chat(M, SPAN_GOOD(pick("You find it difficult to tear yourself away from your current task.", "Your mind refuses to wander."))) + /singleton/reagent/drink/ntella_milkshake name = "NTella Milkshake" description = "An intensely sweet chocolatey concoction with whipped cream on top." @@ -3181,6 +3248,36 @@ glass_name = "glass of tarasun" glass_desc = "An incredibly potent alcoholic beverage, distilled and fermented from tenelote milk." +/singleton/reagent/alcohol/twentytwo + name = "Twenty-Two Seventy Five" + description = "The king of brandy. Found in every bar on Xanu Prime, and every capital ship in the Coalition of Colonies." + taste_description = "subtly sweet wine, with notes of oak and fruit" + strength = 35 + + glass_icon_state = "brandyglass" + glass_name = "glass of 2275" + glass_desc = "A classy liquor from the All-Xanu Republic. A longtime favorite of the Xanan everyman." + +/singleton/reagent/alcohol/saintjacques + name = "Saint-Jacques Black Label" + description = "The gold standard of Xanan liquor, Saint-Jacques Black Label reigns supreme in the Coalition of Colonies. Expensive, but you'll understand why." + taste_description = "rich, smooth autumn nights" + strength = 45 + + glass_icon_state = "cognacglass" + glass_name = "glass of saint-jacques black label cognac" + glass_desc = "A glass of premium Xanan cognac." + +/singleton/reagent/alcohol/feni + name = "Gadpathurian Feni" + description = "The only liquor manufactured on Gadpathur, feni is a liquor originating in the Goa region of India and typically brewed from coconut sap, palm sap, or cashews. Typically issued as a morale supplement on celebratory occasions, the Planetary Defense Council has yet to disclose what this is precisely made from." + taste_description = "fruity biodiesel" + strength = 55 + + glass_icon_state = "ginvodkaglass" + glass_name = "glass of feni" + glass_desc = "A glass of strong-smelling feni." + /singleton/reagent/alcohol/triplesec name = "Triple Sec" description = "An orangey liqueur made from bitter, dried orange peels. Usually mixed with cocktails." @@ -4239,6 +4336,17 @@ glass_center_of_mass = list("x"=16, "y"=9) +/singleton/reagent/alcohol/staghunt + name = "Stag Hunt" + description = "The beloved cocktail of the Coalition's capital world, the All-Xanu Republic. Typically enjoyed outdoors, after a hunt or hike." + color = "#ddb638" + strength = 35 + taste_description = "brandy and lemonade" + + glass_icon_state = "staghunt" + glass_name = "glass of Stag Hunt" + glass_desc = "The national drink of the All-Xanu Republic. Brandy, tea, and lemonade, over ice. A perfect pairing with wild game, the setting sun, and a warm breeze." + /singleton/reagent/alcohol/internationale name = "Solarian White" description = "The subversive's choice." diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index f13392b8187..b2ed7f6383a 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -4173,6 +4173,12 @@ required_reagents = list(/singleton/reagent/alcohol/absinthe = 1, /singleton/reagent/alcohol/vodka/mushroom = 1) result_amount = 2 +/datum/chemical_reaction/drink/staghunt + name = "Stag Hunt" + result = /singleton/reagent/alcohol/staghunt + required_reagents = list(/singleton/reagent/drink/ice = 1, /singleton/reagent/alcohol/twentytwo = 3, /singleton/reagent/drink/lemonjuice = 1, /singleton/reagent/drink/tea = 2) + result_amount = 7 + /datum/chemical_reaction/drink/internationale name = "Internationale" id = "internationale" diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 5ca3f1e9c47..fa51b18a624 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -516,9 +516,87 @@ icon_state = "moonlabor" item_state = "moonlabor" +/obj/item/reagent_containers/food/drinks/cans/beer/earthmover + name = "\improper Inverkeithing Imports Earthmover" + desc = "Himeo's favorite brand of non-mushroom liquor, according to the 2264 Consumer's Census. Rising prices on the import of Virklunder, which held the top point for several years, are probably to blame. \ + Luckily for Himeo- and the Coalition, where it is exported under the Inverkeithing Import name- this hydroponically-grown dry stout is of a reasonably high quality." + icon_state = "earthmover" + item_state = "earthmover" + reagents_to_add = list(/singleton/reagent/alcohol/ale = 40) // mushroom guinness + +/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest + name = "\improper Whistling Forest Pale Ale" + desc = "A proud product of the All-Xanu Republic, the Whistling Forest family of pale ales boast a rich history in the coke mines of Himavat City. Tourists take it with ice; locals know better." + desc_extended = "A Markhor Interstellar Logistics Group product. Move Mountains with Markhor!" + icon_state = "whistlingforest" + item_state = "whistlingforest" + /obj/item/reagent_containers/food/drinks/cans/melon_soda name = "Kansumi Melon Soda" desc = "Konyang's favourite melon soda, now available in can form!" icon_state = "melon_soda" item_state = "melon_soda" reagents_to_add = list(/singleton/reagent/drink/melon_soda = 30) + +/obj/item/reagent_containers/food/drinks/cans/himeokvass + name = "Dorshafen Deluxe" + desc = "A can of Himean mushroom kvass. Non-alcoholic, unlike its Fisanduhian cousin, which makes it a workday favorite of railyard workers." + icon_state = "dorshdeluxe" + reagents_to_add = list(/singleton/reagent/drink/mushroom_kvass = 30) + +/obj/item/reagent_containers/food/drinks/cans/galatea + name = "Svarog Presents: Gala-Tea!" + desc = "A Galatean energy drink, highly regarded among college students. A warning on the can notes that the maximum dosage of this beverage is forty-five units per cycle." + icon_state = "galateadrink" + reagents_to_add = list(/singleton/reagent/drink/galatea = 30) + +/obj/item/reagent_containers/food/drinks/cans/boch + name = "Boch Brew Berry Bounty" + desc = "A can of Vysokan energy drink, derived from the digestive sac of the boch-zivir. This one is in the typical berry flavor." + icon = 'icons/obj/item/reagent_containers/food/drinks/bottle.dmi' // we're not animals + icon_state = "bochbrew" + drop_sound = 'sound/items/drop/shoes.ogg' + pickup_sound = 'sound/items/pickup/shoes.ogg' + reagents_to_add = list(/singleton/reagent/drink/bochbrew = 30) + +/obj/item/reagent_containers/food/drinks/cans/boch/attack(mob/living/M, mob/user, var/target_zone) // modified can reaction; have you ever seen someone crush a plastic bottle on their head? + if(iscarbon(M) && !reagents.total_volume && user.a_intent == I_HURT && target_zone == BP_HEAD) + if(M == user) + user.visible_message(SPAN_WARNING("[user] smacks the bottle of [src.name] against [user.get_pronoun("his")] forehead!"), SPAN_NOTICE("You smack the bottle of [src.name] on your forehead.")) + else + user.visible_message(SPAN_WARNING("[user] smacks the bottle of [src.name] against [M]'s forehead!"), SPAN_NOTICE("You whack the bottle of [src.name] on [M]'s forehead.")) + M.apply_damage(2,DAMAGE_BRUTE,BP_HEAD) // quoth the copy-paste code, 'ouch.' + return TRUE + . = ..() + +/obj/item/reagent_containers/food/drinks/cans/boch/buckthorn + name = "Boch Brew Buckthorn Buckwild" + desc = "A can of Vysokan energy drink, derived from the digestive sac of the boch-zivir. This one is buckthorn flavored." + icon = 'icons/obj/item/reagent_containers/food/drinks/bottle.dmi' // if it looks like a bottle it's a bottle + icon_state = "bochbrew_buck" + reagents_to_add = list(/singleton/reagent/drink/bochbrew/buckthorn = 30) + +/obj/item/reagent_containers/food/drinks/cans/xanuchai + name = "Brown Palace Champion Chai" + desc = "A Xanan brand of canned chai tea. This one is the standard chai flavor." + icon_state = "xanuchai" + reagents_to_add = list(/singleton/reagent/drink/tea/chaitea = 30) + +/obj/item/reagent_containers/food/drinks/cans/xanuchai/creme + name = "Brown Palace Champion Chai Creme" + desc = "A Xanan brand of canned chai tea. This one is a chai latte flavor." + icon_state = "xanucreme" + reagents_to_add = list(/singleton/reagent/drink/tea/chaitealatte = 30) + +/obj/item/reagent_containers/food/drinks/cans/xanuchai/chocolate + name = "Brown Palace Champion Chocolate Chai" + desc = "A Xanan brand of canned chai tea. This one is a chocolate chai flavor." + icon_state = "xanuchoc" + reagents_to_add = list(/singleton/reagent/drink/tea/coco_chaitea = 30) + +/obj/item/reagent_containers/food/drinks/cans/xanuchai/neapolitan + name = "Brown Palace New Neapolitan" + desc = "A Xanan brand of canned chai tea. This one is neapolitan flavored; vanilla, chocolate, and strawberry." + icon_state = "xanuneap" + reagents_to_add = list(/singleton/reagent/drink/tea/neapolitan_chaitea = 30) + diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 6795cace044..a73b099034e 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -954,6 +954,43 @@ center_of_mass = list("x"=16, "y"=5) reagents_to_add = list(/singleton/reagent/alcohol/wine/valokki = 100) +/obj/item/reagent_containers/food/drinks/bottle/twentytwoseventyfive + name = "2275 Classic" + desc = "A bottle of Xanan mid-range brandy." + desc_extended = "The Xanan brandy industry boasts a rich history, centered around the unique climatological conditions of Foy-Niljen brandy country. The 2275's main claim to fame is the Stag Hunt cocktail, \ + the most popular cocktail on Xanu Prime and one of the most consumed in the entire Coalition. It is often said that to make a Stag Hunt without 2275 is to visit the Coalition without seeing Xanu Prime." + icon_state = "2275bottle" + center_of_mass = list("x"=16, "y"=5) + reagents_to_add = list(/singleton/reagent/alcohol/twentytwo = 100) + +/obj/item/reagent_containers/food/drinks/bottle/saintjacques + name = "Saint-Jacques Black Label" + desc = "An expensive bottle of Saint-Jacques Black Label, a Xanan luxury cognac." + desc_extended = "The Xanan brandy industry boasts a rich history, centered around the unique climatological conditions of Foy-Niljen brandy country. None hold a candle to the sheer quality- or sheer price- of \ + the highly esteemed Saint-Jacques Black Label, a limited-quantity cognac with a price point somewhere around a small hovercar on a middlingly populated world. Some say it can only be distilled on the yearly anniversary of the formation \ + of the Frontier Alliance; others that each bottle is personally inspected by a panel of Xanan artisans." + icon_state = "stjacquesbottle" + center_of_mass = list("x"=16, "y"=5) + reagents_to_add = list(/singleton/reagent/alcohol/saintjacques = 100) + +/obj/item/reagent_containers/food/drinks/bottle/bestblend + name = "Mahendru's Best Blend" + desc = "A jar of sugarcane juice. Apple flavored!" + desc_extended = "Popular in Xanan circles, sugarcane juice competes with tea for the refreshment of choice at summertime gatherings and in the Republic's fridges. Some consider it more 'posh' and 'artisanal', which Mahendru's Best Blend \ + encourages with a glass 'mason jar' design and a lid of authentic Xanan cork." + icon_state = "sugarcanejuice" + volume = 45 + reagents_to_add = list(/singleton/reagent/drink/sugarcane = 45) + +/obj/item/reagent_containers/food/drinks/bottle/feni + name = "Morale Supplement VII Feni, Standard, Type I" + desc = "A bottle of Gadpathurian liquor, issued and manufactured by the United Planetary Defense Council. By nature, this is probably surplus." + desc_extended = "The product of several decades of research by a half-dozen different cadres, Morale Supplement VII- Feni, Standard- was adopted by decree of the United Planetary Defense Councils Board of Quartermasters for use in purposes \ + relating to celebration, morale improvement, or deployment extension. All non-medical personnel are entitled to one twenty-unit serving of the drink, often regarded as 'Supplement Seven', per celebratory period. It remains an obscure drink \ + outside Gadpathur, not by virtue of its rarity- several thousand bottles are sold off as surplus to fund the UPDCG every year- but by being an extremely acquired taste." + icon_state = "fenibottle" + reagents_to_add = list(/singleton/reagent/alcohol/feni = 100) + /obj/item/reagent_containers/food/drinks/bottle/hooch name = "hooch bottle" desc = "A bottle of rotgut. Its owner has applied some street wisdom to cleverly disguise it as a brown paper bag." diff --git a/code/modules/reagents/reagent_containers/food/drinks/yoke.dm b/code/modules/reagents/reagent_containers/food/drinks/yoke.dm index 1ccf5d9e98a..0ab4de7c908 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/yoke.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/yoke.dm @@ -78,7 +78,9 @@ /obj/item/reagent_containers/food/drinks/cans/root_beer, /obj/item/reagent_containers/food/drinks/cans/diet_cola, /obj/item/reagent_containers/food/drinks/cans/peach_soda, - /obj/item/reagent_containers/food/drinks/cans/melon_soda + /obj/item/reagent_containers/food/drinks/cans/melon_soda, + /obj/item/reagent_containers/food/drinks/cans/himeokvass, + /obj/item/reagent_containers/food/drinks/cans/xanuchai ) var/path = pick(soda_options) if(starts_with[path]) @@ -93,7 +95,9 @@ /obj/item/reagent_containers/food/drinks/cans/beer, /obj/item/reagent_containers/food/drinks/cans/beer/rice, /obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma, - /obj/item/reagent_containers/food/drinks/cans/beer/rice/moonlabor + /obj/item/reagent_containers/food/drinks/cans/beer/rice/moonlabor, + /obj/item/reagent_containers/food/drinks/cans/beer/earthmover, + /obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest ) var/path = pick(soda_options) if(starts_with[path]) @@ -114,6 +118,11 @@ /obj/item/storage/box/fancy/yoke/moonlabor starts_with = list(/obj/item/reagent_containers/food/drinks/cans/beer/rice/moonlabor = 6) +/obj/item/storage/box/fancy/yoke/earthmover + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/beer/earthmover = 6) + +/obj/item/storage/box/fancy/yoke/whistlingforest + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest = 6) /obj/item/storage/box/fancy/yoke/energy icon_state = "yoke_energy" //energy drinks are 2 pixels taller diff --git a/code/modules/reagents/reagent_containers/food/snacks/burger.dm b/code/modules/reagents/reagent_containers/food/snacks/burger.dm index 1d34a0c5880..b7cbbd68b80 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/burger.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/burger.dm @@ -209,6 +209,16 @@ reagent_data = list(/singleton/reagent/nutriment = list("buns" = 2)) bitesize = 3 +/obj/item/reagent_containers/food/snacks/chickenparm + name = "chicken parm hero" + desc = "Fried chicken with cheese and tomato sauce, served on a bread roll." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "parmsandwich" + filling_color = "#7e4118" + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/nutriment/protein = 4, /singleton/reagent/nutriment/protein/cheese = 2) + reagent_data = list(/singleton/reagent/nutriment = list("tomato sauce" = 2), /singleton/reagent/nutriment/protein = list("fried chicken" = 4)) + bitesize = 3 + /obj/item/reagent_containers/food/snacks/sloppyjoe name = "sloppy joe" desc = "Yum yum! Hope you brought a napkin!... or ten." diff --git a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm index 2df1f98d438..297ecc170e3 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm @@ -629,6 +629,7 @@ bitesize = 2 reagent_data = list(/singleton/reagent/nutriment = list("dough" = 5, "chickpeas" = 3, "onion" = 3, "tomato" = 3)) + /obj/item/reagent_containers/food/snacks/pazillo/update_icon() var/percent_pazillo = round((reagents.total_volume / 8) * 100) switch(percent_pazillo) @@ -659,3 +660,95 @@ icon_state = "traumwurst_half" if(50 to INFINITY) icon_state = "traumwurst" + +// Xanu Prime +/obj/item/reagent_containers/food/snacks/steakxanu + name = "steak xanu" + desc = "The official dish of the city of Nouvelle-Rochelle, capital of the All-Xanu Republic. A piece of steak, marinated in a warm broth mixture before being pan-fried in ghee and spices and topped with a rich cream sauce." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "steakxanu" + filling_color = "#dacb47" + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/nutriment/protein = 4, /singleton/reagent/spacespice = 2) + bitesize = 3 + reagent_data = list(/singleton/reagent/nutriment = list("creamy sauce" = 2, "savory spices" = 2), /singleton/reagent/nutriment/protein = list("tender steak" = 6)) + +/obj/item/reagent_containers/food/snacks/xanu_curry + name = "pataliputra curried rice" + desc = "Xanu Prime's most enduring cultural export. A rice-and-peanut curry, made from a thick buttermilk-spice sauce, typically served with some sort of meat or seafood. The official dish of Pataliputra, though every cook has their own take on the true 'best' recipe for this particular curry." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "xanucurry" + filling_color = "#dacb47" + reagents_to_add = list(/singleton/reagent/nutriment = 8, /singleton/reagent/spacespice = 2) + bitesize = 4 + reagent_data = list(/singleton/reagent/nutriment = list("rice" = 4, "rich spices" = 4)) + +/obj/item/reagent_containers/food/snacks/bunkerbuster + name = "bunker buster sandwich" + desc = "A renowned All-Xanu street food, the bunker buster is an open-faced egg sandwich with mustard, garam masala, mayo, and shredded cheese, served over naan bread. Born of necessity, it earned its name from the workers responsible for rebuilding Xanu Prime after the Interstellar War, who often bunked together in the underground complexes of Kshatragarh." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "bunkerbuster" + filling_color = "#dacb47" + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/protein/egg = 2, /singleton/reagent/spacespice = 2) + bitesize = 3 + reagent_data = list(/singleton/reagent/nutriment = list("dijon mustard" = 2, "cheese" = 2, "fluffy bread" = 2)) + +/obj/item/reagent_containers/food/snacks/crozets + name = "naya khyber crozets" + desc = "The official dish of the Xanan city of Foy-Nijlen, this is typically a sort of buckwheat pasta served in a spicy tomato-basil sauce alongside the city's usual seafoods, like penguin or shellfish. Tradition dictates this to be served in a stoneware bowl, but it is often an accepted casualty of interstellar travel." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "crozets" + bitesize = 2 + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/protein/seafood = 2, /singleton/reagent/spacespice = 2, ) + reagent_data = list(/singleton/reagent/nutriment = list("buckwheat pasta" = 3, "spicy tomato bisque" = 3)) + +/obj/item/reagent_containers/food/snacks/seafoodplatter + name = "north sixty sea platter" + desc = "While it lacks a traditional 'recipe', the North Sixty Sea Platter is a Xanan seafood platter focused on fresh, local seafood- fried, grilled, stewed, or raw- caught north of sixty degrees latitude. While there is no ocean on the Horizon, a faithful recreation of the famous side sauce can help adhere a few, more alien ingredients." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "seafoodplatter" + reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/nutriment/protein/seafood = 4, /singleton/reagent/nutriment/protein/seafood/mollusc = 4) + bitesize = 2 + reagent_data = list(/singleton/reagent/nutriment = list("malted vinegar" = 1, "creamy garlic sauce" = 1)) + +/obj/item/reagent_containers/food/snacks/xanuvindaloo + name = "paaskraan vindaloo" + desc = "Traditionally made with the meat of the Paaskraan, a waterfowl native to Xanu Prime, this version uses chicken, instead. Unlike a typical vindaloo, paaskraani vindaloo only adds the meat at the end, after pan-frying it to a crunchy crisp in a sweet vanilla sauce. Served over rice, this is the official dish of Paastad." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "xanuvindaloo" + bitesize = 2 + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/nutriment/protein = 4, /singleton/reagent/spacespice = 2, ) + reagent_data = list(/singleton/reagent/nutriment = list("vanilla" = 2, "fresh herbs" = 2), /singleton/reagent/nutriment/protein = list("sweet-and-savory chicken" = 4)) + +// Himeo + +/obj/item/reagent_containers/food/snacks/minerpie + name = "miner's pie" + desc = "A Himean traditional recipe, consisting mainly of mushrooms, meat, and gravy, served inside a crisp pastry crust. Could feed you for a thousand years." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "minerpie" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/protein = 4) + bitesize = 3 + reagent_data = list(/singleton/reagent/nutriment = list("savory gravy" = 2, "vegetables" = 2, "pastry" = 2)) + +/obj/item/reagent_containers/food/snacks/hakhmaparm + name = "hakhma parm hero" + desc = "A fried hakhma cutlet, served on a toasted hoagie roll with cheese and tomato sauce. The unofficial sandwich of Horner Station." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "parmsandwich" + filling_color = "#d47d2b" + center_of_mass = list("x"=16, "y"=16) + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/protein = 4) + bitesize = 3 + reagent_data = list(/singleton/reagent/nutriment = list("cheese" = 3, "tomato sauce" = 3), /singleton/reagent/nutriment/protein = list("chicken" = 4)) + +/obj/item/reagent_containers/food/snacks/steelworkersandwich + name = "steelworker's sandwich" + desc = "Popular in the foundries of Rautakaivos Kaupunki, this is a helping of grilled meat buried under coleslaw, french fries, deli mustard, and pickled tomatoes, typically served on a mushroom roll." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "steelworkersandwich" + filling_color = "#d47d2b" + center_of_mass = list("x"=16, "y"=16) + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/protein = 4) + bitesize = 3 + reagent_data = list(/singleton/reagent/nutriment = list("mustard" = 2, "french fries" = 2, "coleslaw" = 2)) diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm index 862c9551c24..91bd988b4b3 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm @@ -205,6 +205,12 @@ contained_sprite = TRUE reagents_to_add = list(/singleton/reagent/nutriment/protein = 6, /singleton/reagent/drugs/mindbreaker = 6) +/obj/item/reagent_containers/food/snacks/meat/hakhma + name = "hakhma meat" + desc = "A slab of purple bug-meat. Still tastes like chicken." + icon_state = "hakhmeat" + reagents_to_add = list(/singleton/reagent/nutriment/protein = 6, /singleton/reagent/nutriment/triglyceride = 4) // pork of the stars! insects do, in fact, get fat. + /obj/item/reagent_containers/food/snacks/meat/bat name = "bat wings" desc = "Like chicken wings, but with even less meat!" diff --git a/code/modules/reagents/reagent_containers/food/snacks/processed.dm b/code/modules/reagents/reagent_containers/food/snacks/processed.dm index 2cbe667a5f0..9b333e2b83f 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/processed.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/processed.dm @@ -632,3 +632,194 @@ reagent_data = list(/singleton/reagent/nutriment = list("fruit cake" = 4)) bitesize = 2 +// coalition snax go here + +/obj/item/reagent_containers/food/snacks/fishjerky + name = "Go-Go Gwok! Great Grouper" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "fishjerky" + desc = "Ethically-sourced Konyang fish, seasoned with the classic Go-Go Gwok! spice blend." + filling_color = "#a7633f" + center_of_mass = list("x"=15, "y"=9) + trash = /obj/item/trash/fishjerky + reagents_to_add = list(/singleton/reagent/nutriment/protein = 4, /singleton/reagent/sodiumchloride = 3) + bitesize = 3 + reagent_data = list(/singleton/reagent/nutriment/protein = list("dried fish" = 2, "gwok spices" = 2)) + +/obj/item/reagent_containers/food/snacks/pepperoniroll + name = "Inverkeithing Imports Number-Nine Roll" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "pepperoniroll" + desc = "A warm bread roll stuffed with meat and cheese. A classic miner's lunch." + filling_color = "#a7633f" + center_of_mass = list("x"=15, "y"=9) + trash = /obj/item/trash/pepperoniroll + reagents_to_add = list(/singleton/reagent/nutriment/protein = 4, /singleton/reagent/sodiumchloride = 2) + bitesize = 2 + reagent_data = list(/singleton/reagent/nutriment/protein = list("pepperoni" = 2, "cheesy bread" = 2)) + +/obj/item/reagent_containers/food/snacks/salmiak + name = "Inverkeithing Imports Viipuri Salmiak" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "saltyliquorice" + desc = "A generous portion of salted mushroom licorice. An incredibly difficult-to-acquire taste. Traditionally found on the desks of unpleasant Himean government workers." + filling_color = "#1d141f" + trash = /obj/item/trash/salmiakpack + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/sodiumchloride = 4) + bitesize = 1 + reagent_data = list(/singleton/reagent/nutriment = list("medicine" = 3,"black licorice" = 3)) + +/obj/item/reagent_containers/food/snacks/hakhspam + name = "maps salty hakhma" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "hakhmaps" + desc = "A variant of the famous spiced ham product. Popular among Scarabs and the Star-Men." + filling_color = "#7f168d" + center_of_mass = list("x"=15, "y"=9) + trash = /obj/item/trash/hakhmaps + reagents_to_add = list(/singleton/reagent/nutriment/protein = 6, /singleton/reagent/sodiumchloride = 4) + bitesize = 3 + reagent_data = list(/singleton/reagent/nutriment/protein = list("alien meat" = 6)) + +/obj/item/reagent_containers/food/snacks/pemmicanbar + name = "Vedabar" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "pemmicanbar" + desc = "A bar of dried ohdker meat and berries. Excellent for hiking!" + filling_color = "#a7633f" + center_of_mass = list("x"=15, "y"=9) + trash = /obj/item/trash/pemmican + reagents_to_add = list(/singleton/reagent/nutriment/protein = 6) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/choctruffles + name = "Dalyoni Dimlights" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "choctruffles" + desc = "A bag of Assunzionii chocolate truffles. Remarkably unremarkable." + filling_color = "#a7633f" + center_of_mass = list("x"=15, "y"=9) + trash = /obj/item/trash/trufflebag + reagents_to_add = list(/singleton/reagent/nutriment = 5, /singleton/reagent/sugar = 1) + bitesize = 2 + reagent_data = list(/singleton/reagent/nutriment = list("rich dark chocolate" = 3, "cocoa powder" = 2)) + +/obj/item/reagent_containers/food/snacks/peanutsnack + name = "Annapurna Classic Munch" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "peanuts_xanu" + desc = "A bag of roasted peanuts." + filling_color = "#e48552" + center_of_mass = list("x"=15, "y"=9) + trash = /obj/item/trash/peanutsnack + reagents_to_add = list(/singleton/reagent/nutriment = 5, /singleton/reagent/sodiumchloride = 2) + reagent_data = list(/singleton/reagent/nutriment = list("peanuts" = 5)) + bitesize = 4 + +/obj/item/reagent_containers/food/snacks/peanutsnack/pepper + name = "Annapurna Salt N' Pepper" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "peanuts_sp" + desc = "A bag of roasted peanuts, seasoned with salt and pepper." + trash = /obj/item/trash/peanutsnack/pepper + reagent_data = list(/singleton/reagent/nutriment = list("peanuts" = 2,"pepper" = 3)) + +/obj/item/reagent_containers/food/snacks/peanutsnack/choc + name = "Annapurna Cinnamon Chocolate" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "peanuts_choc" + desc = "A bag of roasted peanuts, coated with chocolate and cinnamon." + trash = /obj/item/trash/peanutsnack/choc + reagent_data = list(/singleton/reagent/nutriment = list("peanuts" = 2,"chocolate" = 2, "cinnamon" = 1)) + +/obj/item/reagent_containers/food/snacks/peanutsnack/masala + name = "Annapurna Masala Masterpiece" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "peanuts_masala" + desc = "A bag of roasted peanuts, seasoned with Xanan garam masala." + trash = /obj/item/trash/peanutsnack/masala + reagent_data = list(/singleton/reagent/nutriment = list("peanuts" = 2,"garam masala" = 3)) + +/obj/item/reagent_containers/food/snacks/chana + name = "NexChana Mild" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "chanamild" + desc = "Seasoned, crispy chickpeas. A proud product of the All-Xanu Republic." + filling_color = "#e48552" + center_of_mass = list("x"=15, "y"=9) + trash = /obj/item/trash/chana + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/sodiumchloride = 2) + reagent_data = list(/singleton/reagent/nutriment = list("roasted chickpeas" = 3,"spices" = 3)) + bitesize = 4 + +/obj/item/reagent_containers/food/snacks/chana/wild + name = "NexChana Wild" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "chanawild" + desc = "Crispy chickpeas, coated in a spicy masala mix." + trash = /obj/item/trash/chana/wild + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/capsaicin = 3) + reagent_data = list(/singleton/reagent/nutriment = list("roasted chickpeas" = 3,"spices" = 3)) + +/obj/item/reagent_containers/food/snacks/papad + name = "Vollendaal Papad Crackers" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "papad" + desc = "A Xanan brand of crispy papad crackers. Brighten up your snacking!" + trash = /obj/item/trash/papad + center_of_mass = list("x"=16, "y"=10) + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/sodiumchloride = 2) + reagent_data = list(/singleton/reagent/nutriment = list("fried chickpeas" = 3,"salt" = 1)) + bitesize = 4 + +/obj/item/reagent_containers/food/snacks/papad/garlic + name = "Vollendaal Gracious Garlic" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "papadgarlic" + desc = "The All-Xanu Republic's favorite papad crackers. A sunrise of natural garlic flavor!" + trash = /obj/item/trash/papad/garlic + reagent_data = list(/singleton/reagent/nutriment = list("fried chickpeas" = 2,"garlic" = 2)) + +/obj/item/reagent_containers/food/snacks/papad/ginger + name = "Vollendaal Ginger Justice" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "papadginger" + desc = "The sale of this box of crackers directly funds the Frontier Protection Bureau." + trash = /obj/item/trash/papad/ginger + reagent_data = list(/singleton/reagent/nutriment = list("fried chickpeas" = 2,"fresh ginger" = 2)) + +/obj/item/reagent_containers/food/snacks/papad/apple + name = "Vollendaal Awesome Apple" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "papadapple" + desc = "A healthy, crispy comrade to any lunchbox sandwich or movie night." + trash = /obj/item/trash/papad/apple + reagent_data = list(/singleton/reagent/nutriment = list("fried chickpeas" = 2,"crisp apples" = 2)) + +/obj/item/storage/box/fancy/foysnack + name = "Brown Palace cocoa biscuits" + desc = "A little packet of cocoa biscuits. A companion for any afternoon tea." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "foypack" + icon_type = "cookie" + storage_type = "packaging" + starts_with = list(/obj/item/reagent_containers/food/snacks/foy = 6) + can_hold = list(/obj/item/reagent_containers/food/snacks/foy) + max_storage_space = 6 + + use_sound = 'sound/items/storage/wrapper.ogg' + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' + + trash = /obj/item/trash/foysnack + closable = FALSE + icon_overlays = FALSE + +/obj/item/reagent_containers/food/snacks/foy + name = "foy biscuit" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "cookie_foy" + desc = "Tea's favorite cookie." + reagents_to_add = list(/singleton/reagent/nutriment = 0.5) + reagent_data = list(/singleton/reagent/nutriment = list("light cocoa" = 2)) + bitesize = 1 diff --git a/code/modules/reagents/reagent_containers/glass/coffeecup.dm b/code/modules/reagents/reagent_containers/glass/coffeecup.dm index 21780cb9f6d..6341e587f1a 100644 --- a/code/modules/reagents/reagent_containers/glass/coffeecup.dm +++ b/code/modules/reagents/reagent_containers/glass/coffeecup.dm @@ -120,6 +120,16 @@ desc = "A coffee cup bearing the Zeng-Hu logo." icon_state = "coffeecup_zeng" +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/xanu + name = "\improper All-Xanu Republic coffee cup" + desc = "A coffee cup bearing the flag of the All-Xanu Republic." + icon_state = "coffeecup_xanu" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/galatea + name = "\improper Federal Technocracy of Galatea coffee cup" + desc = "A coffee cup bearing the flag of the Federal Technocracy of Galatea" + icon_state = "coffeecup_galatea" + // Symbols, markings /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/one name = "#1 coffee cup" diff --git a/html/changelogs/crunchypretzels-coalitionfood.yml b/html/changelogs/crunchypretzels-coalitionfood.yml new file mode 100644 index 00000000000..1f5f215c6c1 --- /dev/null +++ b/html/changelogs/crunchypretzels-coalitionfood.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: crunchypretzels + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added several new snack foods and drinks representing various Coalition cultures." + - rscadd: "Added a new, random-spawn vendor for Coalition snacks." + - rscadd: "Added recipes for several new foods, namely Xanan dishes and Himean food." diff --git a/icons/obj/drink_glasses/coffecup.dmi b/icons/obj/drink_glasses/coffecup.dmi index 171d03035ec..b11a7ddcffb 100644 Binary files a/icons/obj/drink_glasses/coffecup.dmi and b/icons/obj/drink_glasses/coffecup.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index a006caf08ac..8e27f840a97 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/item/reagent_containers/food/cultural/human.dmi b/icons/obj/item/reagent_containers/food/cultural/human.dmi index d162bcf682e..f61b4b1b0a6 100644 Binary files a/icons/obj/item/reagent_containers/food/cultural/human.dmi and b/icons/obj/item/reagent_containers/food/cultural/human.dmi differ diff --git a/icons/obj/item/reagent_containers/food/drinks/bottle.dmi b/icons/obj/item/reagent_containers/food/drinks/bottle.dmi index 286e1b0c5ee..258790303c7 100644 Binary files a/icons/obj/item/reagent_containers/food/drinks/bottle.dmi and b/icons/obj/item/reagent_containers/food/drinks/bottle.dmi differ diff --git a/icons/obj/item/reagent_containers/food/drinks/soda.dmi b/icons/obj/item/reagent_containers/food/drinks/soda.dmi index 81cda8b0788..b6e359340f8 100644 Binary files a/icons/obj/item/reagent_containers/food/drinks/soda.dmi and b/icons/obj/item/reagent_containers/food/drinks/soda.dmi differ diff --git a/icons/obj/item/reagent_containers/food/meat.dmi b/icons/obj/item/reagent_containers/food/meat.dmi index 27dff6ceee5..6e55d018344 100644 Binary files a/icons/obj/item/reagent_containers/food/meat.dmi and b/icons/obj/item/reagent_containers/food/meat.dmi differ diff --git a/icons/obj/item/reagent_containers/food/processed.dmi b/icons/obj/item/reagent_containers/food/processed.dmi index 7c134ba5d84..fcea48fca77 100644 Binary files a/icons/obj/item/reagent_containers/food/processed.dmi and b/icons/obj/item/reagent_containers/food/processed.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index af949943519..96fb29414c8 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 8b1d84c6aaf..acf2c7e3673 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ