diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 7cd282de851..899d26f2259 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -81,15 +81,18 @@ /obj/item/reagent_containers/food/drinks/bottle/sake = 1, /obj/item/reagent_containers/food/drinks/bottle/cremewhite = 4, /obj/item/reagent_containers/food/drinks/bottle/mintsyrup = 5, + /obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor = 2, /obj/item/reagent_containers/food/drinks/bottle/chartreuseyellow =5, + /obj/item/reagent_containers/food/drinks/bottle/messa_mead = 2, /obj/item/reagent_containers/food/drinks/bottle/small/ale = 6, /obj/item/reagent_containers/food/drinks/bottle/small/beer = 6, /obj/item/reagent_containers/food/drinks/bottle/small/xuizijuice = 8, + /obj/item/reagent_containers/food/drinks/bottle/small/khlibnyz = 4, /obj/item/reagent_containers/food/drinks/bottle/cola = 5, /obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind = 5, /obj/item/reagent_containers/food/drinks/bottle/space_up = 5, /obj/item/reagent_containers/food/drinks/bottle/hrozamal_soda = 2, - /obj/item/reagent_containers/food/drinks/cans/adhomai_milk = 2, + /obj/item/reagent_containers/food/drinks/bottle/small/midynhr_water = 3, /obj/item/reagent_containers/food/drinks/cans/grape_juice = 6, /obj/item/reagent_containers/food/drinks/cans/beetle_milk = 2, /obj/item/reagent_containers/food/drinks/cans/sodawater = 15, @@ -102,6 +105,8 @@ /obj/item/reagent_containers/food/drinks/carton/lemonjuice = 4, /obj/item/reagent_containers/food/drinks/carton/orangejuice = 4, /obj/item/reagent_containers/food/drinks/carton/tomatojuice = 4, + /obj/item/reagent_containers/food/drinks/carton/fatshouters = 2, + /obj/item/reagent_containers/food/drinks/carton/mutthir = 2, /obj/item/reagent_containers/food/drinks/flask/barflask = 2, /obj/item/reagent_containers/food/drinks/flask/vacuumflask = 2, /obj/item/reagent_containers/food/drinks/ice = 9, diff --git a/code/modules/item_worth/reagents.dm b/code/modules/item_worth/reagents.dm index 6588d2c82b6..ca8ac4cbab4 100644 --- a/code/modules/item_worth/reagents.dm +++ b/code/modules/item_worth/reagents.dm @@ -39,6 +39,9 @@ /decl/reagent/alcohol/butanol/xuizijuice value = 0.2 +/decl/reagent/alcohol/nmshaan_liquor/darmadhirbrew + value = 25 + /decl/reagent/hydrazine value = 0.017 diff --git a/code/modules/mob/living/simple_animal/friendly/adhomai.dm b/code/modules/mob/living/simple_animal/friendly/adhomai.dm index cfa6b74b845..dcda3e9e717 100644 --- a/code/modules/mob/living/simple_animal/friendly/adhomai.dm +++ b/code/modules/mob/living/simple_animal/friendly/adhomai.dm @@ -72,7 +72,7 @@ milk_type = /decl/reagent/drink/milk/adhomai meat_type = /obj/item/reagent_containers/food/snacks/meat/adhomai - butchering_products = list(/obj/item/stack/material/animalhide = 5) + butchering_products = list(/obj/item/stack/material/animalhide = 5, /obj/item/reagent_containers/food/snacks/spreads/lard = 5) /mob/living/simple_animal/hostile/retaliate/rafama @@ -127,9 +127,9 @@ health = 50 has_udder = TRUE - milk_type = /decl/reagent/drink/milk + milk_type = /decl/reagent/drink/milk/schlorrgo - meat_type = /obj/item/reagent_containers/food/snacks/meat/chicken + meat_type = /obj/item/reagent_containers/food/snacks/meat/adhomai organ_names = list("head", "chest", "fatty core", "blubberous torso", "thick centre", "left leg", "right leg") butchering_products = list(/obj/item/reagent_containers/food/snacks/spreads/lard = 5) 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 e1f38a22b72..19b5229c5e2 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1006,6 +1006,15 @@ glass_name = "glass of fermented fatshouters milk" glass_desc = "A tajaran made fermented dairy product, traditionally consumed by nomadic population of Adhomai." +/decl/reagent/drink/milk/adhomai/mutthir + name = "Mutthir" + description = "A beverage made with Fatshouters' yogurt mixed with Nm’shaan's sugar and sweet herbs." + taste_description = "sweet fatty yogurt" + + glass_icon_state = "mutthir_glass" + glass_name = "glass of mutthir" + glass_desc = "A beverage made with Fatshouters' yogurt mixed with Nm’shaan's sugar and sweet herbs." + /decl/reagent/drink/milk/beetle name = "Hakhma Milk" description = "A milky substance extracted from the brood sac of the viviparous Hakhma, often consumed by Offworlders and Scarabs." @@ -1016,6 +1025,19 @@ glass_name = "glass of hakhma milk" glass_desc = "A milky substance extracted from the brood sac of the viviparous Hakhma, often consumed by Offworlders and Scarabs." +/decl/reagent/drink/milk/schlorrgo + name = "Schlorrgo Milk" + description = "An opaque white liquid produced by the mammary glands of the Schlorrgo." + taste_description = "fatty milk" + +/decl/reagent/drink/milk/schlorrgo/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) + ..() + if(alien == IS_TAJARA && prob(5)) + var/mob/living/carbon/human/H = M + if(H.can_feel_pain()) + H.custom_pain("You feel a stinging pain in your abdomen!") + H.Stun(3) + /decl/reagent/drink/tea name = "Tea" description = "Tasty black tea, it has antioxidants, it's good for you!" @@ -4173,6 +4195,81 @@ glass_name = "glass of Rixulin Sundae" glass_desc = "A fizzing drink that looks like a really great time." +/decl/reagent/alcohol/khlibnyz + name = "Khlibnyz" + color = "#843113" + description = "A fermented beverage produced from Adhomian bread." + taste_description = "earthy and salty" + + strength = 5 + nutriment_factor = 1 + carbonated = TRUE + + glass_icon_state = "khlibnyzglass" + glass_name = "glass of khlibnyz" + glass_desc = "A fermented beverage produced from Adhomian bread." + +/decl/reagent/alcohol/shyyrkirrtyr_wine + name = "Shyyr Kirr'tyr Wine" + color = "#D08457" + description = "Tajaran spirit infused with some eel-like Adhomian creature." + taste_description = "dry alcohol with a hint of meat" + + strength = 20 + nutriment_factor = 1 + + glass_icon_state = "shyrrkirrtyrwineglass" + glass_name = "glass of shyyr kirr'tyr wine" + glass_desc = "Tajaran spirit infused with some eel-like Adhomian creature." + +/decl/reagent/alcohol/nmshaan_liquor + name = "Nm'shaan Liquor" + color = "#FE6B03" + description = "A strong Adhomian liquor reserved for special occasions." + taste_description = "sweet and silky alcohol" + + strength = 70 + + glass_icon_state = "nmshaanliquorglass" + glass_name = "glass of nm'shaan liquor" + glass_desc = "A strong Adhomian liquor reserved for special occasions." + +/decl/reagent/alcohol/nmshaan_liquor/darmadhirbrew + name = "Darmadhir Brew" + color = "#E4A769" + description = "A rare and expensive brand of nm'shaan liquor." + taste_description = "expensive sweet and silky alcohol" + + strength = 75 + + glass_icon_state = "darmadhirbrewglass" + glass_name = "glass of Darmadhir Brew" + description = "A rare and expensive brand of nm'shaan liquor." + +/decl/reagent/alcohol/treebark_firewater + name = "Tree-Bark Firewater" + color = "#ACAA1D" + description = "High-content alcohol distilled from Earthen-Root or Blizzard Ears." + taste_description = "earthy and bitter alcohol" + + strength = 65 + + glass_icon_state = "treebarkfirewaterglass" + glass_name = "glass of tree-bark firewater" + glass_desc = "High-content alcohol distilled from Earthen-Root or Blizzard Ears." + +/decl/reagent/alcohol/veterans_choice + name = "Veteran's Choice" + color = "#7C7231" + description = "A cocktail consisting of Messa's Mead and gunpowder." + taste_description = "honey and salty" + + strength = 25 + + glass_icon_state = "veteranschoiceglass" + glass_name = "glass of veteran's choice" + glass_desc = "A cocktail consisting of Messa's Mead and gunpowder." + // Butanol-based alcoholic drinks //===================================== //These are mainly for unathi, and have very little (but still some) effect on other species @@ -4622,3 +4719,14 @@ condiment_desc = "A vegetarian friendly way to add a little extra pizazz to any dish." condiment_icon_state = "dionaepowder" condiment_center_of_mass = list("x"=16, "y"=10) + +/decl/reagent/drink/midynhr_water + name = "Midynhr Water" + description = "A soft drink made from honey and tree syrup." + color = "#95D44C" + taste_description = "creamy sweetness" + + glass_icon_state = "midynhrwaterglass" + glass_name = "glass of midynhr water" + glass_desc = "A soft drink made from honey and tree syrup." + glass_center_of_mass = list("x"=15, "y"=9) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index afc16fa9c51..67129ce9164 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -3490,3 +3490,26 @@ result = /decl/reagent/alcohol/fisfirebomb required_reagents = list(/decl/reagent/alcohol/ale = 1, /decl/reagent/alcohol/fiscream = 1) result_amount = 2 + +/datum/chemical_reaction/drink/veterans_choice + name = "Veteran's Choice" + id = "veterans_choice" + result = /decl/reagent/alcohol/veterans_choice + required_reagents = list(/decl/reagent/alcohol/messa_mead = 1, /decl/reagent/gunpowder = 1) + result_amount = 2 + +/datum/chemical_reaction/drink/mutthir + name = "Mutthir" + id = "mutthir" + result = /decl/reagent/drink/milk/adhomai/mutthir + required_reagents = list(/decl/reagent/drink/milk/adhomai = 1, /decl/reagent/sugar = 1) + catalysts = list(/decl/reagent/enzyme = 5) + result_amount = 2 + +/datum/chemical_reaction/drink/treebark_firewater + name = "Tree-Bark Firewater" + id = "treebark_firewater" + result = /decl/reagent/alcohol/treebark_firewater + required_reagents = list(/decl/reagent/drink/earthenrootjuice = 1, /decl/reagent/sugar = 1, /decl/reagent/woodpulp = 1) + catalysts = list(/decl/reagent/enzyme = 5) + result_amount = 3 \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index 94747d16143..fa2e406a0d5 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -422,6 +422,21 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I reagents_to_add = list(/decl/reagent/drink/applejuice = 100) +/obj/item/reagent_containers/food/drinks/carton/fatshouters + name = "fatshouters milk carton" + desc = "Fatty fatshouters milk in a carton." + + reagents_to_add = list(/decl/reagent/drink/milk/adhomai = 100) + +/obj/item/reagent_containers/food/drinks/carton/mutthir + name = "mutthir carton" + desc = "A beverage made with Fatshouters' yogurt mixed with Nm’shaan's sugar and sweet herbs." + desc_fluff = "A beverage made with Fatshouters' yogurt mixed with Nm’shaan's sugar and sweet herbs. Mutthir is usually consumed during meals by both nobles and commoners. \ + The drink can also be smoked for flavor. Mutthir is believed to have originated from the worldwide appreciated Fatshouters' fermented milk. Rock Nomads living in the Nomadic Host \ + were quick to adopt the drink to their diet." + + reagents_to_add = list(/decl/reagent/drink/milk/adhomai = 100) + //////////////////////////drinkingglass and shaker// //Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink // itself), in Chemistry-Recipes.dm (for the reaction that changes the components into the drink), and here (for the drinking glass diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 92f2b8c67f9..35ad09a6944 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -216,9 +216,9 @@ desc = "Pour one out for Al'mari. His gun was on stun, bless his heart." icon_state = "victorygin" center_of_mass = list("x"=16, "y"=4) - desc_fluff = "Adhomian beverages are commonly made with fermented grains or vegetables, if alcoholic, or juices mixed with sugar or honey. Victory gin is the most \ - widespread alcoholic drink in Adhomai, the result of the fermentation of honey extracted from Messa's tears, but its production and consumption is slowly declining due to the \ - People's Republic situation in the current conflict." + desc_fluff = "Considered the official drink of the People's Republic of Adhomai, Victory Gin was created to celebrate the end of the revolution. It is commonly found in NanoTrasen's \ + stations, due to a contract that allows the government to supply the corporation, and in the Tajaran communities of Tau Ceti. The destruction of Victory Gin's bottles and reserves \ + was widespread when Republican positions and cities were taken by the opposition as the drink is deemed by many as a symbol of the Hadiist regime." reagents_to_add = list(/decl/reagent/alcohol/victorygin = 100) /obj/item/reagent_containers/food/drinks/bottle/whiskey @@ -454,8 +454,8 @@ //Small bottles /obj/item/reagent_containers/food/drinks/bottle/small - name = "empty small bottle" - desc = "A sad empty bottle." + name = "small bottle" + desc = "A small bottle." icon_state = "beer" volume = 50 smash_duration = 1 @@ -552,9 +552,9 @@ desc = "A bottle of Messa's mead. Bottled somewhere in the icy world of Adhomai." icon_state = "messa_mead" center_of_mass = list("x" = 16,"y" = 5) - desc_fluff = "Adhomian beverages are commonly made with fermented grains or vegetables, if alcoholic, or juices mixed with sugar or honey. Victory gin is the most \ - widespread alcoholic drink in Adhomai, the result of the fermentation of honey extracted from Messa's tears, but its production and consumption is slowly declining due to the \ - People's Republic situation in the current conflict. Messa's mead is also another more traditional alternative, made with honey and fermented Earthen-Root juice." + desc_fluff = "A fermented alcoholic drink made from earthen-root juice and Messa's tears leaves. It has a relatively low alcohol content and characteristic honey flavor. \ + Messa's Mead is one of the most popular alcoholic drinks in Adhomai; it is consumed both during celebrations and daily meals. Any proper Adhomian bar will have at least a keg or \ + some bottles of the mead." reagents_to_add = list(/decl/reagent/alcohol/messa_mead = 100) /obj/item/reagent_containers/food/drinks/bottle/sake @@ -589,6 +589,75 @@ center_of_mass = list("x"=16, "y"=5) reagents_to_add = list(/decl/reagent/alcohol/makgeolli = 100) +/obj/item/reagent_containers/food/drinks/bottle/small/khlibnyz + name = "khlibnyz" + desc = "A bottle traditionally made khlibnyz. Likely prepared in some Hadiist communal farm." + icon_state = "khlibnyz" + center_of_mass = list("x" = 16,"y" = 5) + desc_fluff = "A fermented beverage produced from Adhomian bread. Herbs, fruits, and tree sap can be added for flavoring. It is considered a non-alcoholic drink by Adhomian standards \ + because of its very low alcohol content. Khlibnyz was mainly consumed by peasants during pre-contact times and is still very popular with the Hadiist rural population. Communal farms \ + will brew their own Khlibnyz and sell it to the government for distribution." + reagents_to_add = list(/decl/reagent/alcohol/khlibnyz = 30) + +/obj/item/reagent_containers/food/drinks/bottle/shyyrkirrtyr_wine + name = "shyyr kirr'tyr wine" + desc = "Tajaran spirit infused with some eel-like Adhomian creature. The animal floating in the liquid appears to be well preserved." + icon_state = "shyyrkirrtyrwine" + center_of_mass = list("x" = 16,"y" = 5) + desc_fluff = "An alcoholic made by infusing a whole Shyyr Kirr'tyr in Dirt Berries or Earthen-Root spirit. The Water Snake Devil's poison is neutralized by ethanol, making the \ + beverage safe to consume. The wine can be deadly if improperly prepared. The drink is native to the Southeast Harr'masir wetlands, where it is as common as Messa's Mead. Other \ + Tajara consider the wine to be exotic or outright disgusting. The Shyyr Kirr'tyr is usually eaten after the beverage is imbibed." + reagents_to_add = list(/decl/reagent/alcohol/shyyrkirrtyr_wine = 100) + +/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor + name = "nm'shaan liquor" + desc = "A strong Adhomian liquor reserved for special occasions. A label on the bottle recommends diluting it with icy water before drinking." + icon_state = "nmshaanliquor" + center_of_mass = list("x" = 16,"y" = 5) + desc_fluff = "An alcoholic drink manufactured from the fruit of the Nm'shaan plant. It usually has a high level of alcohol by volume. Nm'shaan liquor was once reserved for the \ + consumption of the nobility; even today it is considered a decadent drink reserved for fancy occasions." + reagents_to_add = list(/decl/reagent/alcohol/nmshaan_liquor = 100) + +/obj/item/reagent_containers/food/drinks/bottle/small/midynhr_water + name = "midynhr water" + desc = "A soft drink made from honey and tree syrup. The label claims it is good as the tap version." + icon_state = "midynhrwater" + center_of_mass = list("x" = 16,"y" = 5) + desc_fluff = "A soft drink based on Yve’kha's honey and tree syrups. The drink has a creamy consistency and is served cold from the tap of traditional soda fountains. Native to \ + Das'nrra, the beverage is now widespread in the Al'mariist territories. Bottled versions exist, but they are considered to be inferior to what is served in bars and restaurants." + reagents_to_add = list(/decl/reagent/drink/midynhr_water = 30) + +/obj/item/reagent_containers/food/drinks/bottle/veterans_choice + name = "veteran's choice" + desc = "A home-made bottle of veteran's choice. Shake it carefully before serving." + icon_state = "veteranschoice" + center_of_mass = list("x" = 16,"y" = 5) + desc_fluff = "A cocktail consisting of Messa's Mead and gunpowder. Supposedly originated among the ranks of the Liberation Army as an attempt to spice up the mead, the cocktail \ + became a hit - not because of its taste - with the young Tajara. Drinking the Veteran's Choice is seen as a way to display one's bravado. ALA soldiers are known to consume the cocktail before going into battle believing that it brings luck." + reagents_to_add = list(/decl/reagent/alcohol/veterans_choice = 100) + +/obj/item/reagent_containers/food/drinks/bottle/treebark_firewater + name = "tree-bark firewater" + desc = "A jug full of adhomian moonshine. The bottle states dubiously that it is a handmade recipe." + icon_state = "treebarkfirewater" + center_of_mass = list("x" = 16,"y" = 5) + desc_fluff = "High-content alcohol distilled from Earthen-Root or Blizzard Ears. Tree bark is commonly added to the drink to give it a distinct flavor. The firewater's origins can \ + be traced back to the pre-contact times where impoverished peasants would make alcohol out of anything they could find. Homebrewing remains a tradition in the New Kingdom's rural \ + parts. These traditional spirits are also manufactured by large breweries and sold to the urban population as handcrafted." + reagents_to_add = list(/decl/reagent/alcohol/treebark_firewater = 100) + drink_flags = NO_EMPTY_ICON + +/obj/item/reagent_containers/food/drinks/bottle/darmadhir_brew + name = "Darmadhir Brew" + desc = "A fancy bottle contained sought-after Darmadhir's nm'shaan liquor. It is more of a collection piece than a beverage." + icon_state = "darmadhirbrew" + center_of_mass = list("x" = 16,"y" = 5) + desc_fluff = "A famous variation of the Nm'shaan Liquor; it is described as one of Adhomai's finest spirits. It is produced solely by a small family-owned brewery in Miran'mir. Its \ + recipe is a secret passed down through the generations of the Darmadhir household since immemorial times. The only living member of the family, Hazyr Darmadhir, is a 68 years old \ + Tajara. His sole heir and son died in the Second Revolution after being drafted to fight for the royal army. Alcohol collectors stipulate that the brew's price will skyrocket after Hazyr's death." + reagents_to_add = list(/decl/reagent/alcohol/nmshaan_liquor/darmadhirbrew = 100) + drink_flags = NO_EMPTY_ICON + // Butanol-based alcoholic drinks //===================================== //These are mainly for unathi, and have very little (but still some) effect on other species diff --git a/code/modules/reagents/reagent_containers/food/lunch.dm b/code/modules/reagents/reagent_containers/food/lunch.dm index 5fe850ad668..1cf10f193da 100644 --- a/code/modules/reagents/reagent_containers/food/lunch.dm +++ b/code/modules/reagents/reagent_containers/food/lunch.dm @@ -69,7 +69,9 @@ var/list/lunchables_drinks_ = list( /obj/item/reagent_containers/food/drinks/cans/sodawater, /obj/item/reagent_containers/food/drinks/cans/adhomai_milk, /obj/item/reagent_containers/food/drinks/cans/beetle_milk, - /obj/item/reagent_containers/food/drinks/cans/hrozamal_soda + /obj/item/reagent_containers/food/drinks/cans/hrozamal_soda, + /obj/item/reagent_containers/food/drinks/bottle/small/midynhr_water, + /obj/item/reagent_containers/food/drinks/bottle/small/khlibnyz ) var/list/lunchables_utensil_ = list( @@ -105,7 +107,8 @@ var/list/lunchables_alcohol_reagents_ = list( /decl/reagent/alcohol/neurotoxin, /decl/reagent/alcohol/pwine, /decl/reagent/alcohol/threemileisland, - /decl/reagent/alcohol/toxins_special + /decl/reagent/alcohol/toxins_special, + /decl/reagent/alcohol/nmshaan_liquor/darmadhirbrew ) /proc/lunchables_lunches() diff --git a/html/changelogs/alberyk-drinks.yml b/html/changelogs/alberyk-drinks.yml new file mode 100644 index 00000000000..a48084db640 --- /dev/null +++ b/html/changelogs/alberyk-drinks.yml @@ -0,0 +1,7 @@ +author: Alberyk, Ramke + +delete-after: True + +changes: + - rscadd: "Added some new Adhomian drinks. They can be found in the loadout selection and booze vending machine." + - tweak: "Butchering a fatshouter now gives lard." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index aec5517b34c..30eb48a2468 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/drinks_empty.dmi b/icons/obj/drinks_empty.dmi index 76893ee7466..9f0140d85d9 100644 Binary files a/icons/obj/drinks_empty.dmi and b/icons/obj/drinks_empty.dmi differ