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

Flavour Enhancement: Flavour (#9034)

Browse Source 
* Flavour strings and food tweaks

* Secret Meats...

* beet soup runtime

* fixes chip plates and subtypes

* final spelling corrections
This commit is contained in:
Cerebulon
2023-06-23 16:54:49 -08:00
committed by GitHub
parent e7a0fce846
commit 5cdfc4f09a
13 changed files with 1095 additions and 1074 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/examine/descriptions/containers.dm
+17 -55
View File
@@ -1,41 +1,3 @@
/obj/item/reagent_containers/food/drinks/cans/cola
description_fluff = "Space Cola is the most popular soft drink in known space. It was invented by Nikolas Fedorov, a Martian-Russian immagrant to Tau Ceti. He then went on to create Nikolas Beverages Inc., a soft drink corporation that is now part of Centauri Provisions."
/obj/item/reagent_containers/food/drinks/cans/waterbottle
description_fluff = "This is a generic, NanoTrasen branded bottle of water. The company swears on the quality of the water, saying it comes from the Martian poles. Most people disregard that and assume it's recycled from hydroponics trays."
/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind
description_fluff = "This cola was allegedly made after Vasily Federov, the son of Nikolas Federov and the second CEO of Federov Beverages Inc., went on a climbing expedition to an arctic planet. He then created this citris flavored soft drink. Scientists claim that it can eat through styrafoam in a matter of weeks, but people drink it anyway."
/obj/item/reagent_containers/food/drinks/cans/thirteenloko
description_fluff = "A beverage loved by college students. The Thirteen Loko Company created this highly alcoholic beverage as an energy drink. It is illegal in much of SolGov space and most of Skrell space. This drink has been regulated more than any other in known space, and doctors strongly advise not to drink it."
/obj/item/reagent_containers/food/drinks/cans/dr_gibb
description_fluff = "Originally made by a doctor seeking to mix several different flavors, this soda has become widely popular in the past decade. The drink has become so popular, in fact, that Nikolas Beverages bought it. Ever since then, the drink has never been the same. As a result, people all across known space beg for the old formula, but Nikolas Beverages does not appear to be listening."
/obj/item/reagent_containers/food/drinks/cans/starkist
description_fluff = "Nikolas Beverages' attempt at an orange-flavored drink. Advertised as a nice summer beverage. The company tries to paint it as one of their more 'healthy' beverages due to its 'orange' and 'vitamins'."
/obj/item/reagent_containers/food/drinks/cans/space_up
description_fluff = "This drink is advertised as one of the most carbonated beverages on the market. It's owned by Federov Beverages, and advertised for its carbonation, not its flavor. Children will commonly make 'Space-Up Volcanoes' by dropping mints into a can of Space-Up and causing it to create a long stream of fizz upward."
/obj/item/reagent_containers/food/drinks/cans/lemon_lime
description_fluff = "This is a NanoTrasen branded can of Lemon-Lime juice. NanoTrasen swears to their 'natural' beverage, but most people think differently."
/obj/item/reagent_containers/food/drinks/cans/iced_tea
description_fluff = "Vrisk Iced Tea is named after its creator, Penelope Vrisk. She was a canner for Federov Beverages who wanted to create an authentic-tasting Southern iced tea. After finishing her formula and managing to get it produced, the tea became an instant hit."
/obj/item/reagent_containers/food/drinks/cans/grape_juice
description_fluff = "This is a NanoTrasen branded can of grape juice. NanoTrasen claims that they use the same grapes that this juice is made of to make their wine."
/obj/item/reagent_containers/food/drinks/cans/tonic
description_fluff = "Endorsed by the popular positronic rapper, T-Borg, this drink is advertised as a 'high class' drink. Most people just use it to mix with their gin, and not much can be said about the quality."
/obj/item/reagent_containers/food/drinks/cans/sodawater
description_fluff = "This is a NanoTrasen branded can of soda water. They use the same water for this that they use for the bottled water that they sell. That may explain why the stuff isn't exactly flying off of the shelves."
/obj/item/reagent_containers/food/drinks/cans/gingerale
description_fluff = "Somehow, NanoTrasen wound up taking this ginger ale formula from Centauri Provisions, some say as payback for the DONKpocket incident. It tastes like ginger ale."
/obj/item/reagent_containers/food/drinks/bottle/gin
description_fluff = "Griffeater Gin was originally an independent disillery in Alpha Centauri, but financial troubles obligated them to sell out to Centauri Provisions. It's said that Centauri ruined the brew, but it's pretty much impossible to tell."
@@ -45,54 +7,54 @@
/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey
description_fluff = "Nobody knows what Special Blend Whiskey really is, how it's made, or where it comes from. It's an expensive Gilthari product, for only the most luxurious, but NanoTrasen managed to secure a supply deal."
/obj/item/reagent_containers/food/drinks/bottle/vodka
description_fluff = "Centauri Provisions claims that their vodka wins in blind taste-tests against traditional mixes from Earth, but they're not fooling anyone."
/obj/item/reagent_containers/food/drinks/bottle/tequilla
description_fluff = "This tequilla comes from the 'Cancer Craze' of the 20's, where consumer products would openly advertize their blatently carcinogenic nature to a burgeoning middle class with newfound access to cloned organs."
description_fluff = "This tequilla comes from the 'Cancer Craze' of the 2520's, where consumer products would openly advertize their blatently carcinogenic nature to a burgeoning middle class with newfound access to cloned organs."
/obj/item/reagent_containers/food/drinks/bottle/patron
description_fluff = "This emerged as a response to Caccavo, with Patron advertising claiming to be even more toxic and dangerous. Unfortunately, when the Cancer Craze ended, Patron's stocks nosedived and they now operate only a handful of distilleries."
/obj/item/reagent_containers/food/drinks/bottle/rum
description_fluff = "Captain Pete's was involved in a long, expensive lawsuit against Gilthari concerning their claims to be from Cuba. They're actually owned and operated by none other than Centauri Provisions, with no distillaries on Earth to speak of."
/obj/item/reagent_containers/food/drinks/bottle/vermouth
description_fluff = "One of Gilthari's less expensive products, Goldeneye Vermouth still manages to sell itself as a drink for only the richest and most successful; giving any number of poseurs a swollen head in the process."
/obj/item/reagent_containers/food/drinks/bottle/kahlua
description_fluff = "One of Centauri Provision's least successful products, this coffee liquour continues to be produced for the handful of mixed drinks requiring it. Surprisingly energizing!"
/obj/item/reagent_containers/food/drinks/bottle/goldschlager
description_fluff = "Drinks laced with gold and other precious metals are a common indulgence among those who live on planets where these metals are still somewhat rare and expensive. On asteroid colonies and better-developed regions, they're seen as a ridiculous waste of materials."
/obj/item/reagent_containers/food/drinks/bottle/cognac
description_fluff = "Another Gilthari product, Chataeu du Baton is one of the few brandies to still be produced using traditional methods, instead of chemical synthesizers."
/obj/item/reagent_containers/food/drinks/bottle/wine
description_fluff = "NanoTrasen makes this wine, which is generally regarded as better used for cooking than actually drinking. Morpheus specifically names Doublebeard in their recipe for Twobread."
/obj/item/reagent_containers/food/drinks/bottle/absinthe
description_fluff = "A product of the anarchists of Casini's Reach, Jailebreaker Verte is an open-source synthesized liquour that has actually managed to succeed over traditional absinthes. Gilthari is livid."
/obj/item/reagent_containers/food/drinks/bottle/melonliquor
description_fluff = "Melon liquor, formerly an obscure drink, took off when young Skrell started dabbling in alcohol. This brand is owned by Vey-Med, one of their few diversified holdings."
/obj/item/reagent_containers/food/drinks/bottle/bluecuracao
description_fluff = "Centauri Provisions is currently marketing Miss Blue as the next big thing in mixed drinks. Analysts suggest that they're mistaken."
/obj/item/reagent_containers/food/drinks/bottle/pwine
description_fluff = "You've never heard of this before, but it looks vaguely Gilthari, so it's probably good, right?"
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice
description_fluff = "Morpheus used to sell 'Tomato Juice' that was actually synthetic blood in a carton, until they got sued for damages."
/obj/item/reagent_containers/food/drinks/bottle/small/beer
description_fluff = "Getting synthesized booze to taste decent is always a challenge, but Space Beer is a resounding success. As the most popular drink in human space, it'd have to be."
/obj/item/reagent_containers/food/drinks/bottle/small/ale
description_fluff = "A product of Titan and enjoyed widely among the hydrocarbon workers of the oil moon. Often described as 'Beer, but better.'"
/obj/item/reagent_containers/food/drinks/bottle/sake
description_fluff = "An export from New Kyoto, Mono-no-Aware promises to show to the drinker the beautiful transience of all life. Mostly it just tastes like dry booze."
code/modules/food/food/cans.dm
+7 -4
View File
@@ -32,6 +32,7 @@
/obj/item/reagent_containers/food/drinks/cans/waterbottle
name = "bottled water"
desc = "Ice cold and utterly tasteless, this 'all-natural' mineral water comes 'fresh' from one of NanoTrasen's heavy-duty bottling plants in the Sivian poles."
description_fluff = "This is a generic, NanoTrasen branded bottle of water. The company swears on the quality of the water, saying it comes from the Sivian poles. Most people disregard that and assume it's recycled from hydroponics trays."
icon_state = "waterbottle"
center_of_mass = list("x"=16, "y"=8)
drop_sound = 'sound/items/drop/disk.ogg'
@@ -164,6 +165,7 @@
/obj/item/reagent_containers/food/drinks/cans/sodawater
name = "soda water"
desc = "A can of soda water. Still water's more refreshing cousin."
description_fluff = "This is a NanoTrasen branded can of soda water. They use the same water for this that they use for the bottled water that they sell, which may explain why the stuff isn't exactly flying off of the shelves."
icon_state = "sodawater"
center_of_mass = list("x"=16, "y"=8)
@@ -270,7 +272,7 @@
/obj/item/reagent_containers/food/drinks/cans/terra_cola
name = "\improper Terra-Cola"
desc = "Made by the people. Served to the people."
description_fluff = "A can of the only soft drink state approved for the benefit of the people. Served at room temperature regardless of ambient temperatures thanks to innovative Terran insulation technology."
description_fluff = "A can of the only soft drink state approved for the benefit of the people. Served at room temperature regardless of ambient temperatures thanks to innovative 'Terran' insulation technology."
icon_state = "terra_cola"
center_of_mass = list("x"=16, "y"=8)
@@ -323,7 +325,7 @@
/obj/item/reagent_containers/food/drinks/cans/grape_cola
name = "\improper Gravity Grape"
desc = "Get down with Newton's favorite corbonated science experiment!"
desc = "Get down with Newton's favorite carbonated science experiment!"
icon_state = "grapesoda"
center_of_mass = list("x"=16, "y"=8)
@@ -374,8 +376,9 @@
reagents.add_reagent("beer", 30)
/obj/item/reagent_containers/food/drinks/cans/alecan
name = "\improper Spacecastle Pale Ale"
desc = "A delicious IPA that's canned for your pleasure. Drink up!"
name = "\improper Hushed Whisper Pale Ale"
desc = "A delicious Sivian IPA that's canned for your pleasure. Drink up!"
description_fluff = "Named for one of history's most infamous pirates, Qar’raqel, who ruled over Natuna before suffering a mysterious fate. This ale is brewed on Sif by a small company... Owned by Centauri Provisions."
icon_state = "alecan"
center_of_mass = list("x"=16, "y"=8)
code/modules/food/food/lunch.dm
+1 -1
View File
@@ -6,7 +6,7 @@ var/global/list/lunchables_lunches_ = list(/obj/item/reagent_containers/food/sna
/obj/item/reagent_containers/food/snacks/slice/meatpizza/filled,
/obj/item/reagent_containers/food/snacks/slice/mushroompizza/filled,
/obj/item/reagent_containers/food/snacks/slice/vegetablepizza/filled,
/obj/item/reagent_containers/food/snacks/pineappleslice/filled,
/obj/item/reagent_containers/food/snacks/slice/pineapple/filled,
/obj/item/reagent_containers/food/snacks/tastybread,
/obj/item/reagent_containers/food/snacks/bagelplain,
/obj/item/reagent_containers/food/snacks/bagelsunflower,
code/modules/food/food/snacks.dm
+958 -976
View File
File diff suppressed because it is too large Load Diff
code/modules/food/food/snacks/meat.dm
+3 -3
View File
@@ -66,6 +66,6 @@
/obj/item/reagent_containers/food/snacks/meat/neaera/Initialize()
. = ..()
reagents.add_reagent("protein", 3)
reagents.add_reagent("seafood", 3)
reagents.add_reagent("triglyceride", 2)
reagents.add_reagent("protein", 3, list("fainty fungal meat" = 3))
reagents.add_reagent("seafood", 3, list("fainty fungal meat" = 3))
reagents.add_reagent("triglyceride", 2)
code/modules/food/recipes_fryer.dm
+8 -1
View File
@@ -3,6 +3,7 @@
items = list(
/obj/item/reagent_containers/food/snacks/rawsticks
)
reagent_mix = RECIPE_REAGENT_REPLACE //No raw tater
result = /obj/item/reagent_containers/food/snacks/fries
/datum/recipe/cheesyfries
@@ -11,6 +12,7 @@
/obj/item/reagent_containers/food/snacks/fries,
/obj/item/reagent_containers/food/snacks/cheesewedge,
)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/cheesyfries
/datum/recipe/jpoppers
@@ -39,6 +41,7 @@
coating = /datum/reagent/nutriment/coating/batter
fruit = list("onion" = 1)
result = /obj/item/reagent_containers/food/snacks/onionrings
reagent_mix = RECIPE_REAGENT_REPLACE //So it doesn't taste of onions and fried onions
//Meaty Recipes
//====================
@@ -49,6 +52,7 @@
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/carpmeat
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/cubancarp
/datum/recipe/batteredsausage
@@ -94,6 +98,7 @@
result = /obj/item/reagent_containers/food/snacks/friedmushroom
/datum/recipe/fishfingers
appliance = FRYER
items = list(
/obj/item/reagent_containers/food/snacks/carpmeat,
)
@@ -128,6 +133,7 @@
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly
result_quantity = 2
@@ -152,6 +158,7 @@
items = list(
/obj/item/reagent_containers/food/snacks/doughslice
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/donut/plain
result_quantity = 2
@@ -212,4 +219,4 @@
/obj/item/organ/internal/liver/neaera
)
result = /obj/item/reagent_containers/food/snacks/garani
reagent_mix = RECIPE_REAGENT_REPLACE
reagent_mix = RECIPE_REAGENT_REPLACE
code/modules/food/recipes_grill.dm
+4 -3
View File
@@ -194,6 +194,7 @@
/obj/item/reagent_containers/food/snacks/cheesewedge,
/obj/item/reagent_containers/food/snacks/boiledegg,
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/superbiteburger
/datum/recipe/slimeburger
@@ -228,7 +229,7 @@
/obj/item/reagent_containers/food/snacks/bacon,
/obj/item/reagent_containers/food/snacks/bacon
)
result = /obj/item/reagent_containers/food/snacks/burger/bacon
result = /obj/item/reagent_containers/food/snacks/baconburger
/datum/recipe/omelette
appliance = GRILL
@@ -237,7 +238,6 @@
/obj/item/reagent_containers/food/snacks/cheesewedge,
)
reagents = list("egg" = 6)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/reagent_containers/food/snacks/omelette
/datum/recipe/omurice
@@ -330,4 +330,5 @@
/datum/recipe/qazalflatbread
appliance = GRILL
items = list(/obj/item/reagent_containers/food/snacks/sliceable/qazal_flatdough)
result = /obj/item/reagent_containers/food/snacks/grilled_qazal_flatbread
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/grilled_qazal_flatbread
code/modules/food/recipes_microwave.dm
+36 -4
View File
@@ -28,7 +28,7 @@ I said no!
/datum/recipe/boiledegg
reagents = list("water" = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
reagent_mix = RECIPE_REAGENT_REPLACE //No water
items = list(
/obj/item/reagent_containers/food/snacks/egg
)
@@ -48,6 +48,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/meatball
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/donkpocket //SPECIAL
/datum/recipe/donkpocket/proc/warm_up(var/obj/item/reagent_containers/food/snacks/donkpocket/being_cooked)
@@ -121,6 +122,7 @@ I said no!
/datum/recipe/loadedbakedpotato
fruit = list("potato" = 1)
items = list(/obj/item/reagent_containers/food/snacks/cheesewedge)
reagent_mix = RECIPE_REAGENT_REPLACE //No raw tater
result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato
/datum/recipe/microchips
@@ -128,6 +130,7 @@ I said no!
items = list(
/obj/item/reagent_containers/food/snacks/rawsticks
)
reagent_mix = RECIPE_REAGENT_REPLACE //No raw tater
result = /obj/item/reagent_containers/food/snacks/microchips
/datum/recipe/bangersandmash
@@ -135,6 +138,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/mashedpotato,
/obj/item/reagent_containers/food/snacks/sausage,
)
reagent_mix = RECIPE_REAGENT_REPLACE //No raw tater
result = /obj/item/reagent_containers/food/snacks/bangersandmash
/datum/recipe/cheesymash
@@ -161,6 +165,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/doughslice,
/obj/item/paper,
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/fortunecookie
/datum/recipe/syntisteak
@@ -195,6 +200,7 @@ I said no!
/datum/recipe/nettlesoup
fruit = list("nettle" = 1, "potato" = 1)
reagents = list("water" = 10, "egg" = 3)
reagent_mix = RECIPE_REAGENT_REPLACE //Denature that nettle
result = /obj/item/reagent_containers/food/snacks/nettlesoup
/datum/recipe/wishsoup
@@ -245,6 +251,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/cheesewedge
)
fruit = list("tomato" = 1, "lettuce" = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify
result = /obj/item/reagent_containers/food/snacks/clubsandwich
/datum/recipe/tomatosoup
@@ -258,6 +265,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough,
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/rofflewaffles
/datum/recipe/stew
@@ -329,7 +337,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/meatballspagetti
/datum/recipe/spesslaw
reagents = list("water" = 5)
reagents = list("water" = 5, "flour" = 5)
items = list(
/obj/item/reagent_containers/food/snacks/spagetti,
/obj/item/reagent_containers/food/snacks/meatball,
@@ -394,6 +402,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/egg,
/obj/item/reagent_containers/food/snacks/chocolatebar,
)
reagent_mix = RECIPE_REAGENT_REPLACE //No actual egg??
result = /obj/item/reagent_containers/food/snacks/chocolateegg
/datum/recipe/sausage
@@ -487,6 +496,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/spreads
)
fruit = list("potato" = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //So it doesn't taste like potato and mashed potato
result = /obj/item/reagent_containers/food/snacks/mashedpotato
/datum/recipe/icecreamsandwich
@@ -581,6 +591,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/dough
)
reagents = list("sugar" = 5, "egg" = 3)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/sugarcookie
/datum/recipe/berrymuffin
@@ -589,6 +600,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/dough
)
fruit = list("berries" = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/berrymuffin/berry
/datum/recipe/poisonberrymuffin
@@ -597,6 +609,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/dough
)
fruit = list("poisonberries" = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/berrymuffin/poison
/datum/recipe/ghostmuffin
@@ -606,6 +619,7 @@ I said no!
/obj/item/ectoplasm
)
fruit = list("berries" = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/ghostmuffin/berry
/datum/recipe/poisonghostmuffin
@@ -615,6 +629,7 @@ I said no!
/obj/item/ectoplasm
)
fruit = list("poisonberries" = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/ghostmuffin/poison
/datum/recipe/eggroll
@@ -667,6 +682,7 @@ I said no!
)
result = /obj/item/reagent_containers/food/snacks/bagelplain
/datum/recipe/bagelsunflower
reagents = list("water" = 5)
items = list(
@@ -706,6 +722,7 @@ I said no!
/obj/item/fuel_assembly/supermatter
)
result = /obj/item/reagent_containers/food/snacks/bageleverything
reagent_mix = RECIPE_REAGENT_REPLACE //Unfathomable
/datum/recipe/bageltwo
reagents = list("water" = 5)
@@ -884,6 +901,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/meatball
)
reagents = list("spacespice" = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/burrito
/datum/recipe/burrito_vegan
@@ -891,15 +909,17 @@ I said no!
/obj/item/reagent_containers/food/snacks/tortilla,
/obj/item/reagent_containers/food/snacks/tofu
)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/burrito_vegan
/datum/recipe/burrito_cheese
/datum/recipe/burrito_cheese // WITH cheese
items = list(
/obj/item/reagent_containers/food/snacks/tortilla,
/obj/item/reagent_containers/food/snacks/meatball,
/obj/item/reagent_containers/food/snacks/meatball,
/obj/item/reagent_containers/food/snacks/cheesewedge
)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/burrito_cheese
/datum/recipe/burrito_cheese_spicy
@@ -909,6 +929,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/cheesewedge,
/obj/item/reagent_containers/food/snacks/cheesewedge,
)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/burrito_cheese_spicy
/datum/recipe/burrito_hell
@@ -930,15 +951,17 @@ I said no!
/obj/item/reagent_containers/food/snacks/cutlet,
/obj/item/reagent_containers/food/snacks/cutlet
)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/meatburrito
/datum/recipe/cheeseburrito
/datum/recipe/cheeseburrito // JUST cheese
fruit = list("soybeans" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/tortilla,
/obj/item/reagent_containers/food/snacks/cheesewedge,
/obj/item/reagent_containers/food/snacks/cheesewedge
)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/cheeseburrito
/datum/recipe/fuegoburrito
@@ -946,6 +969,7 @@ I said no!
items = list(
/obj/item/reagent_containers/food/snacks/tortilla
)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/fuegoburrito
/datum/recipe/breakfast_wrap
@@ -985,6 +1009,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/cheesewedge
)
reagent_mix = RECIPE_REAGENT_REPLACE //Curdle that baby
result = /obj/item/reagent_containers/food/snacks/red_sun_special
/datum/recipe/hatchling_suprise
@@ -1004,6 +1029,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/egg
)
reagents = list("blood" = 15)
reagent_mix = RECIPE_REAGENT_REPLACE //Keep the eggs raw
result = /obj/item/reagent_containers/food/snacks/riztizkzi_sea
/datum/recipe/father_breakfast
@@ -1012,6 +1038,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/meatsteak
)
reagents = list("egg" = 6)
reagent_mix = RECIPE_REAGENT_REPLACE //No point doubling everything!
result = /obj/item/reagent_containers/food/snacks/father_breakfast
/datum/recipe/stuffed_meatball
@@ -1029,6 +1056,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/meatball
)
reagents = list("egg" = 6)
reagent_mix = RECIPE_REAGENT_REPLACE //No point doubling everything!
result = /obj/item/reagent_containers/food/snacks/egg_pancake
/datum/recipe/bacon_stick
@@ -1052,6 +1080,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/friedegg,
/obj/item/reagent_containers/food/snacks/cheesewedge
)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify...
result = /obj/item/reagent_containers/food/snacks/nt_muffin
/datum/recipe/fish_taco
@@ -1070,6 +1099,7 @@ I said no!
/obj/item/reagent_containers/food/snacks/bacon,
/obj/item/reagent_containers/food/snacks/bacon
)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify the result
result = /obj/item/reagent_containers/food/snacks/blt
/datum/recipe/gigapuddi
@@ -1143,6 +1173,7 @@ I said no!
items = list(
/obj/item/reagent_containers/food/snacks/tofu
)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify the result
result = /obj/item/reagent_containers/food/snacks/hotandsoursoup
/datum/recipe/kitsuneudon
@@ -1156,6 +1187,7 @@ I said no!
/datum/recipe/mammi
fruit = list("orange" = 1)
reagents = list("water" = 10, "flour" = 10, "milk" = 5, "sodiumchloride" = 1)
reagent_mix = RECIPE_REAGENT_REPLACE //Cook off that flour
result = /obj/item/reagent_containers/food/snacks/mammi
code/modules/food/recipes_oven.dm
+36 -4
View File
@@ -3,6 +3,7 @@
items = list(
/obj/item/reagent_containers/food/snacks/rawsticks
)
reagent_mix = RECIPE_REAGENT_REPLACE //No raw tater
result = /obj/item/reagent_containers/food/snacks/ovenchips
//Roasts
@@ -40,6 +41,7 @@
/obj/item/reagent_containers/food/snacks/meat/chicken,
/obj/item/reagent_containers/food/snacks/stuffing
)
reagent_mix = RECIPE_REAGENT_REPLACE //Turkeyfy
result = /obj/item/reagent_containers/food/snacks/sliceable/turkey
/datum/recipe/tofurkey
@@ -81,6 +83,7 @@
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
reagents = list("sodiumchloride" = 1, "yeast" = 5)
result = /obj/item/reagent_containers/food/snacks/sliceable/bread
@@ -91,6 +94,7 @@
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/baguette
@@ -107,6 +111,7 @@
/obj/item/reagent_containers/food/snacks/cheesewedge,
/obj/item/reagent_containers/food/snacks/cheesewedge
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/sliceable/tofubread
@@ -118,6 +123,7 @@
/obj/item/reagent_containers/food/snacks/cheesewedge,
/obj/item/reagent_containers/food/snacks/cheesewedge
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread
/datum/recipe/flatbread
@@ -125,6 +131,7 @@
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/flatbread
/datum/recipe/tortilla
@@ -133,6 +140,7 @@
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/tortilla
/datum/recipe/meatbread
@@ -148,6 +156,7 @@
/obj/item/reagent_containers/food/snacks/cheesewedge,
/obj/item/reagent_containers/food/snacks/cheesewedge
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/sliceable/meatbread
/datum/recipe/syntibread
@@ -163,6 +172,7 @@
/obj/item/reagent_containers/food/snacks/cheesewedge,
/obj/item/reagent_containers/food/snacks/cheesewedge
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/sliceable/meatbread
/datum/recipe/xenomeatbread
@@ -178,6 +188,7 @@
/obj/item/reagent_containers/food/snacks/cheesewedge,
/obj/item/reagent_containers/food/snacks/cheesewedge
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread
/datum/recipe/bananabread
@@ -189,6 +200,7 @@
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/reagent_containers/food/snacks/dough
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/sliceable/bananabread
@@ -197,6 +209,7 @@
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/bun
//Predesigned pies
@@ -208,6 +221,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/meat
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/meatpie
/datum/recipe/tofupie
@@ -216,6 +230,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/tofu
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/tofupie
/datum/recipe/xemeatpie
@@ -224,6 +239,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/xenomeat
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/xemeatpie
/datum/recipe/pie
@@ -231,6 +247,7 @@
fruit = list("banana" = 1)
reagents = list("sugar" = 5)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/pie
/datum/recipe/cherrypie
@@ -240,24 +257,28 @@
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/cherrypie
/datum/recipe/amanita_pie
appliance = OVEN
reagents = list("amatoxin" = 5)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/amanita_pie
/datum/recipe/plump_pie
appliance = OVEN
fruit = list("plumphelmet" = 1)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/plump_pie
/datum/recipe/applepie
appliance = OVEN
fruit = list("apple" = 1)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/applepie
/datum/recipe/pumpkinpie
@@ -265,6 +286,7 @@
fruit = list("pumpkin" = 1)
reagents = list("sugar" = 5)
items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie
/datum/recipe/appletart
@@ -346,6 +368,7 @@
appliance = OVEN
fruit = list("berries" = 2)
reagents = list("milk" = 5, "flour" = 15, "cream" = 10, "coco" = 5, "egg" = 6)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/sliceable/buchedenoel
/datum/recipe/cinnamonbun
@@ -354,6 +377,7 @@
items = list(
/obj/item/reagent_containers/food/snacks/dough
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/cinnamonbun
result_quantity = 4
@@ -370,6 +394,7 @@
/obj/item/reagent_containers/food/snacks/cheesewedge,
/obj/item/reagent_containers/food/snacks/cheesewedge
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita
/datum/recipe/meatpizza
@@ -382,6 +407,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/cheesewedge
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza
/datum/recipe/syntipizza
@@ -394,6 +420,7 @@
/obj/item/reagent_containers/food/snacks/meat/syntiflesh,
/obj/item/reagent_containers/food/snacks/cheesewedge
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza
/datum/recipe/mushroompizza
@@ -403,7 +430,6 @@
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/cheesewedge
)
reagent_mix = RECIPE_REAGENT_REPLACE //No vomit taste in finished product from chanterelles
result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza
@@ -414,6 +440,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/cheesewedge
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza
/datum/recipe/pineapplepizza
@@ -425,6 +452,7 @@
/obj/item/reagent_containers/food/snacks/pineapple_ring,
/obj/item/reagent_containers/food/snacks/pineapple_ring
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/pineapple
//Spicy
@@ -446,7 +474,7 @@
appliance = OVEN
reagents = list("milk" = 5, "flour" = 15, "sugar" = 15, "egg" = 9, "vanilla" = 1)
result = /obj/item/reagent_containers/food/snacks/sliceable/plaincake
reagent_mix = RECIPE_REAGENT_REPLACE
reagent_mix = RECIPE_REAGENT_REPLACE // No flour, egg etc.
/datum/recipe/cake/carrot
appliance = OVEN
@@ -517,6 +545,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/reagent_containers/food/snacks/sliceable/flatdough
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/pancakes
/datum/recipe/pancakes/berry
@@ -541,6 +570,7 @@
/obj/item/reagent_containers/food/snacks/dough
)
reagents = list("milk" = 5, "egg" = 3,"honey" = 5)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/honeybun
//Bacon
@@ -565,6 +595,7 @@
/obj/item/reagent_containers/food/snacks/meatball,
/obj/item/reagent_containers/food/snacks/cheesewedge
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/meat_pocket
result_quantity = 2
@@ -579,6 +610,7 @@
/obj/item/reagent_containers/food/snacks/bacon,
/obj/item/reagent_containers/food/snacks/bacon
)
reagent_mix = RECIPE_REAGENT_REPLACE //No Dough
result = /obj/item/reagent_containers/food/snacks/bacon_flatbread
/datum/recipe/truffle
@@ -733,7 +765,7 @@
/obj/item/reagent_containers/food/snacks/dough,
/obj/item/organ/internal/eyes/neaera
)
result = /obj/item/reagent_containers/food/snacks/neaeracandy
result = /obj/item/reagent_containers/food/snacks/chipplate/neaeracandy
result_quantity = 6
reagent_mix = RECIPE_REAGENT_REPLACE
@@ -792,4 +824,4 @@
)
reagents = list("kirani_jelly" = 5, "qazal_flour" = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/reagent_containers/food/snacks/kirani_jellypuff
result = /obj/item/reagent_containers/food/snacks/kirani_jellypuff
code/modules/mob/living/carbon/taste.dm
+2 -2
View File
@@ -33,7 +33,7 @@ calculate text size per text.
for(var/datum/reagent/R in reagent_list)
if(!R.taste_mult)
continue
if(R.id == "nutriment") //this is ugly but apparently only nutriment (not subtypes) has taste data TODO figure out why
if(istype(R, /datum/reagent/nutriment))
var/list/taste_data = R.get_data()
for(var/taste in taste_data)
if(taste in tastes)
@@ -63,4 +63,4 @@ calculate text size per text.
intensity_desc = "the strong flavor of"
out += "[intensity_desc] [taste_desc]"
return english_list(out, "something indescribable")
return english_list(out, "something indescribable")
code/modules/reagents/reactions/instant/food.dm
+17 -17
View File
@@ -1,19 +1,19 @@
/decl/chemical_reaction/instant/food/hot_ramen
name = "Hot Ramen"
name = "hot ramen"
id = "hot_ramen"
result = "hot_ramen"
required_reagents = list("water" = 1, "dry_ramen" = 3)
result_amount = 3
/decl/chemical_reaction/instant/food/hell_ramen
name = "Hell Ramen"
name = "hell ramen"
id = "hell_ramen"
result = "hell_ramen"
required_reagents = list("capsaicin" = 1, "hot_ramen" = 6)
result_amount = 6
/decl/chemical_reaction/instant/food/tofu
name = "Tofu"
name = "tofu"
id = "tofu"
result = null
required_reagents = list("soymilk" = 10)
@@ -27,7 +27,7 @@
return
/decl/chemical_reaction/instant/food/chocolate_bar
name = "Chocolate Bar"
name = "chocolate bar"
id = "chocolate_bar"
result = null
required_reagents = list("soymilk" = 2, "coco" = 2, "sugar" = 2)
@@ -40,7 +40,7 @@
return
/decl/chemical_reaction/instant/food/chocolate_bar2
name = "Chocolate Bar"
name = "chocolate bar"
id = "chocolate_bar"
result = null
required_reagents = list("milk" = 2, "coco" = 2, "sugar" = 2)
@@ -53,28 +53,28 @@
return
/decl/chemical_reaction/instant/food/soysauce
name = "Soy Sauce"
name = "soy sauce"
id = "soysauce"
result = "soysauce"
required_reagents = list("soymilk" = 4, "sacid" = 1)
result_amount = 5
/decl/chemical_reaction/instant/food/ketchup
name = "Ketchup"
name = "ketchup"
id = "ketchup"
result = "ketchup"
required_reagents = list("tomatojuice" = 2, "water" = 1, "sugar" = 1)
result_amount = 4
/decl/chemical_reaction/instant/food/barbecue
name = "Barbeque Sauce"
name = "barbeque sauce"
id = "barbecue"
result = "barbecue"
required_reagents = list("tomatojuice" = 2, "applejuice" = 1, "sugar" = 1, "spacespice" = 1)
result_amount = 4
/decl/chemical_reaction/instant/food/peanutbutter
name = "Peanut Butter"
name = "peanut butter"
id = "peanutbutter"
result = "peanutbutter"
required_reagents = list("peanutoil" = 2, "sugar" = 1, "sodiumchloride" = 1)
@@ -89,7 +89,7 @@
result_amount = 15
/decl/chemical_reaction/instant/food/cheesewheel
name = "Cheesewheel"
name = "cheesewheel"
id = "cheesewheel"
result = null
required_reagents = list("milk" = 40)
@@ -103,7 +103,7 @@
return
/decl/chemical_reaction/instant/food/meatball
name = "Meatball"
name = "meatball"
id = "meatball"
result = null
required_reagents = list("protein" = 3, "flour" = 5)
@@ -116,7 +116,7 @@
return
/decl/chemical_reaction/instant/food/dough
name = "Dough"
name = "dough"
id = "dough"
result = null
required_reagents = list("egg" = 3, "flour" = 10)
@@ -130,7 +130,7 @@
return
/decl/chemical_reaction/instant/food/syntiflesh
name = "Syntiflesh"
name = "syntiflesh"
id = "syntiflesh"
result = null
required_reagents = list("blood" = 5, "clonexadone" = 5)
@@ -149,28 +149,28 @@
*/
/decl/chemical_reaction/instant/food/coating/batter
name = "Batter"
name = "batter"
id = "batter"
result = "batter"
required_reagents = list("egg" = 3, "flour" = 10, "water" = 5, "sodiumchloride" = 2)
result_amount = 20
/decl/chemical_reaction/instant/food/coating/beerbatter
name = "Beer Batter"
name = "beer batter"
id = "beerbatter"
result = "beerbatter"
required_reagents = list("egg" = 3, "flour" = 10, "beer" = 5, "sodiumchloride" = 2)
result_amount = 20
/decl/chemical_reaction/instant/food/browniemix
name = "Brownie Mix"
name = "brownie mix"
id = "browniemix"
result = "browniemix"
required_reagents = list("flour" = 5, "coco" = 5, "sugar" = 5)
result_amount = 15
/decl/chemical_reaction/instant/food/butter
name = "Butter"
name = "butter"
id = "butter"
result = null
required_reagents = list("cream" = 20, "sodiumchloride" = 1)
code/modules/reagents/reagents/food_drinks.dm
+6 -4
View File
@@ -27,13 +27,13 @@
else
initialize_data(newdata)
//cull all tastes below 10% of total
//cull all tastes below 5% of total
var/totalFlavor = 0
for(var/taste in data)
totalFlavor += data[taste]
if(totalFlavor) //Let's not divide by zero for things w/o taste
for(var/taste in data)
if(data[taste]/totalFlavor < 0.1)
if(data[taste]/totalFlavor < 0.05)
data -= taste
#define ANIMAL_NUTRITION_MULTIPLIER 0.5
@@ -269,7 +269,7 @@
/datum/reagent/nutriment/protein // Bad for Skrell!
name = "animal protein"
id = "protein"
taste_description = "some sort of meat"
taste_description = "umami"
color = "#440000"
allergen_type = ALLERGEN_MEAT //"Animal protein" implies it comes from animals, therefore meat.
@@ -713,7 +713,7 @@
name = "Capsaicin Oil"
id = "capsaicin"
description = "This is what makes chilis hot."
taste_description = "hot peppers"
taste_description = "spiciness"
taste_mult = 1.5
reagent_state = LIQUID
ingest_met = REM
@@ -1097,6 +1097,7 @@
reagent_state = LIQUID
color = "#ff2424"
strength = 10
allergen_type = ALLERGEN_MEAT //It's meat.
/datum/reagent/toxin/plantcolony
name = "A colony of plant cells"
@@ -1106,6 +1107,7 @@
reagent_state = LIQUID
color = "#7ce01f"
strength = 10
allergen_type = ALLERGEN_VEGETABLE //It's plant.
/datum/reagent/drink/juice/potato
name = "Potato Juice"