cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 01:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Flavour Enhancement: Vending

Browse Source
This commit is contained in:
Cerebulon
2020-08-09 05:05:43 +01:00
parent 6d4e00c8ff
commit 0f146f3349
24 changed files with 1216 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,8 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/cola
name = "\improper Space Cola"
desc = "Cola. in space."
desc = "Reassuringly artificial."
description_fluff = "The 'Space' branding was originally added to the 'Alpha Cola' product line in order to justify selling cans for 50% higher prices to 'off-world' retailers. Despite being chemically identical, Space Cola proved so popular that Centauri Provisions eventually applied the name to the entire product line - price hike and all."
icon_state = "cola"
center_of_mass = list("x"=16, "y"=10)
@@ -18,7 +19,7 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle
name = "bottled water"
desc = "Introduced to the vending machines by Skrellian request, this water comes straight from the Martian poles."
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."
icon_state = "waterbottle"
center_of_mass = list("x"=16, "y"=8)
drop_sound = 'sound/items/drop/food.ogg'
@@ -30,6 +31,7 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind
name = "\improper Space Mountain Wind"
desc = "Blows right through you like a space wind."
description_fluff = "The 'Space' branding was originally added to the 'Alpha Cola' product line in order to justify selling cans for 50% higher prices to 'off-world' retailers. Despite being chemically identical, Space Cola proved so popular that Centauri Provisions eventually applied the name to the entire product line - price hike and all."
icon_state = "space_mountain_wind"
center_of_mass = list("x"=16, "y"=8)
@@ -39,7 +41,7 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/thirteenloko
name = "\improper Thirteen Loko"
desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsibly."
desc = "The Vir Health Board has advised consumers that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly."
icon_state = "thirteen_loko"
center_of_mass = list("x"=16, "y"=10)
@@ -50,6 +52,7 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb
name = "\improper Dr. Gibb"
desc = "A delicious mixture of 42 different flavors."
description_fluff = "Following a 2490 lawsuit and a spate of deaths, Gilthari Exports reminds customers that the 'Dr.' legally stands for 'Drink'."
icon_state = "dr_gibb"
center_of_mass = list("x"=16, "y"=8)
@@ -57,9 +60,21 @@
..()
reagents.add_reagent("dr_gibb", 30)
/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb_diet
name = "\improper Diet Dr. Gibb"
desc = "A delicious mixture of 42 different flavors, one of which is water."
description_fluff = "Following a 2490 lawsuit and a spate of deaths, Gilthari Exports reminds customers that the 'Dr.' legally stands for 'Drink'."
icon_state = "diet_dr_gibb"
center_of_mass = list("x"=16, "y"=8)
/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb_diet/Initialize()
..()
reagents.add_reagent("diet_dr_gibb", 30)
/obj/item/weapon/reagent_containers/food/drinks/cans/starkist
name = "\improper Star-kist"
desc = "The taste of a star in liquid form. And, a bit of tuna...?"
description_fluff = "Brought back by popular demand in 2515 after a limited-run release in 2510, the cult success of this bizarre tasting soda has never truly been accounted for by economists."
icon_state = "starkist"
center_of_mass = list("x"=16, "y"=8)
@@ -70,6 +85,7 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/space_up
name = "\improper Space-Up"
desc = "Tastes like a hull breach in your mouth."
description_fluff = "The 'Space' branding was originally added to the 'Alpha Cola' product line in order to justify selling cans for 50% higher prices to 'off-world' retailers. Despite being chemically identical, Space Cola proved so popular that Centauri Provisions eventually applied the name to the entire product line - price hike and all."
icon_state = "space-up"
center_of_mass = list("x"=16, "y"=8)
@@ -79,7 +95,8 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/lemon_lime
name = "\improper Lemon-Lime"
desc = "You wanted ORANGE. It gave you Lemon Lime."
desc = "You wanted ORANGE. It gave you Lemon-Lime."
description_fluff = "Not to be confused with 'lemon & lime soda', Lemon-Lime is specially formulated using the highly propriatary Lemon-Lime Fruit. Growing the Lemon-Lime without a license is punishable by fines or jail time. Accept no immitations."
icon_state = "lemon-lime"
center_of_mass = list("x"=16, "y"=8)
@@ -90,6 +107,7 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea
name = "\improper Vrisk Serket Iced Tea"
desc = "That sweet, refreshing southern earthy flavor. That's where it's from, right? South Earth?"
description_fluff = "Produced exclusively on the planet Oasis, Vrisk Serket Iced Tea is not sold outside of the Golden Crescent, let alone Earth."
icon_state = "ice_tea_can"
center_of_mass = list("x"=16, "y"=8)
@@ -100,6 +118,7 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice
name = "\improper Grapel Juice"
desc = "500 pages of rules of how to appropriately enter into a combat with this juice!"
description_fluff = "Strangely, this unassuming grape soda is a product of Hephaestus Industries."
icon_state = "purple_can"
center_of_mass = list("x"=16, "y"=8)
@@ -109,7 +128,8 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/tonic
name = "\improper T-Borg's Tonic Water"
desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
desc = "Quinine tastes funny, but at least it'll keep the Malaria away."
description_fluff = "Due to its technically medicinal properties and the complexities of chemical copyright law, T-Borg's Tonic Water is a rare product of Zeng-Hu's 'LifeWater' refreshments division."
icon_state = "tonic"
center_of_mass = list("x"=16, "y"=8)
@@ -130,9 +150,22 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale
name = "\improper Classic Ginger Ale"
desc = "For when you need to be more retro than NanoTrasen already pays you for."
description_fluff = "'Classic' beverages is a registered trademark of the Centauri Provisions corporation."
icon_state = "gingerale"
center_of_mass = list("x"=16, "y"=8)
/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale/Initialize()
. = ..()
reagents.add_reagent("gingerale", 30)
reagents.add_reagent("gingerale", 30)
/obj/item/weapon/reagent_containers/food/drinks/cans/root_beer
name = "\improper R&D Root Beer"
desc = "Guaranteed to be both Rootin' and Tootin'."
description_fluff = "Despite centuries of humanity's expansion, this particular soda is still produced almost exclusively on Earth, in North America."
icon_state = "root_beer"
center_of_mass = list("x"=16, "y"=10)
/obj/item/weapon/reagent_containers/food/drinks/cans/root_beer/Initialize()
. = ..()
reagents.add_reagent("rootbeer", 30)

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

@@ -10,6 +10,7 @@
flags = OPENCONTAINER
amount_per_transfer_from_this = 5
volume = 50
var/trash = null
/obj/item/weapon/reagent_containers/food/drinks/on_reagent_change()
if (reagents.reagent_list.len > 0)
@@ -20,6 +21,21 @@
price_tag = null
return
/obj/item/weapon/reagent_containers/food/drinks/proc/On_Consume(var/mob/M)
if(!usr)
usr = M
if(!reagents.total_volume)
M.visible_message("<span class='notice'>[M] finishes drinking \the [src].</span>","<span class='notice'>You finish drinking \the [src].</span>")
if(trash)
usr.drop_from_inventory(src) //so icons update :[
if(ispath(trash,/obj/item))
var/obj/item/TrashItem = new trash(usr)
usr.put_in_hands(TrashItem)
else if(istype(trash,/obj/item))
usr.put_in_hands(trash)
qdel(src)
return
/obj/item/weapon/reagent_containers/food/drinks/attack_self(mob/user as mob)
if(!is_open_container())
open(user)
@@ -51,6 +67,7 @@
if(!is_open_container())
to_chat(user, "<span class='notice'>You need to open [src]!</span>")
return 1
On_Consume(target,user)
return ..()
/obj/item/weapon/reagent_containers/food/drinks/standard_dispenser_refill(var/mob/user, var/obj/structure/reagent_dispensers/target)
@@ -114,6 +131,7 @@
/obj/item/weapon/reagent_containers/food/drinks/milk
name = "milk carton"
desc = "It's milk. White and nutritious goodness!"
description_fluff = "A product of NanoPastures. Who would have thought that cows would thrive in zero-G?"
icon_state = "milk"
item_state = "carton"
center_of_mass = list("x"=16, "y"=9)
@@ -126,6 +144,7 @@
/obj/item/weapon/reagent_containers/food/drinks/soymilk
name = "soymilk carton"
desc = "It's soy milk. White and nutritious goodness!"
description_fluff = "A product of NanoPastures. For those skeptical that cows can thrive in zero-G."
icon_state = "soymilk"
item_state = "carton"
center_of_mass = list("x"=16, "y"=9)
@@ -138,6 +157,7 @@
/obj/item/weapon/reagent_containers/food/drinks/smallmilk
name = "small milk carton"
desc = "It's milk. White and nutritious goodness!"
description_fluff = "A product of NanoPastures. Who would have thought that cows would thrive in zero-G?"
volume = 30
icon_state = "mini-milk"
item_state = "carton"
@@ -151,6 +171,7 @@
/obj/item/weapon/reagent_containers/food/drinks/smallchocmilk
name = "small chocolate milk carton"
desc = "It's milk! This one is in delicious chocolate flavour."
description_fluff = "A product of NanoPastures. Who would have thought that cows would thrive in zero-G?"
volume = 30
icon_state = "mini-milk_choco"
item_state = "carton"
@@ -164,20 +185,25 @@
/obj/item/weapon/reagent_containers/food/drinks/coffee
name = "\improper Robust Coffee"
desc = "Careful, the beverage you're about to enjoy is extremely hot."
description_fluff = "Fresh coffee is almost unheard of outside of planets and stations where it is grown. Robust Coffee proudly advertises the six separate times it is freeze-dried during the production process of every cup of instant."
icon_state = "coffee"
trash = /obj/item/trash/coffee
center_of_mass = list("x"=15, "y"=10)
drop_sound = 'sound/items/drop/box.ogg'
drop_sound = 'sound/items/drop/papercup.ogg'
/obj/item/weapon/reagent_containers/food/drinks/coffee/Initialize()
. = ..()
reagents.add_reagent("coffee", 30)
/obj/item/weapon/reagent_containers/food/drinks/tea
name = "cup of Duke Purple Tea"
name = "cup of Duke Purple tea"
desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
icon_state = "teacup"
description_fluff = "Duke Purple is NanoPasture's proprietary strain of black tea, noted for its strong but otherwise completely non-distinctive flavour."
icon_state = "chai_vended"
item_state = "coffee"
trash = /obj/item/trash/coffee
center_of_mass = list("x"=16, "y"=14)
drop_sound = 'sound/items/drop/papercup.ogg'
/obj/item/weapon/reagent_containers/food/drinks/tea/Initialize()
. = ..()
@@ -187,27 +213,63 @@
name = "cup of ice"
desc = "Careful, cold ice, do not chew."
icon_state = "coffee"
trash = /obj/item/trash/coffee
center_of_mass = list("x"=15, "y"=10)
/obj/item/weapon/reagent_containers/food/drinks/ice/Initialize()
. = ..()
reagents.add_reagent("ice", 30)
/obj/item/weapon/reagent_containers/food/drinks/h_chocolate
name = "cup of Dutch hot coco"
desc = "Made in Space South America."
icon_state = "hot_coco"
name = "cup of Counselor's Choice hot cocoa"
desc = "Who needs character traits when you can enjoy a hot mug of cocoa?"
description_fluff = "Counselor's Choice brand hot cocoa is made with a blend of hot water and non-dairy milk powder substitute, in a compromise destined to annoy all parties."
icon_state = "coffee"
item_state = "coffee"
trash = /obj/item/trash/coffee
center_of_mass = list("x"=15, "y"=13)
drop_sound = 'sound/items/drop/papercup.ogg'
/obj/item/weapon/reagent_containers/food/drinks/h_chocolate/Initialize()
..()
reagents.add_reagent("hot_coco", 30)
/obj/item/weapon/reagent_containers/food/drinks/greentea
name = "cup of green tea"
desc = "Exceptionally traditional, delightfully subtle."
description_fluff = "Tea remains an important tradition in many cultures originating on Earth. Among these, green tea is probably the most traditional of the bunch... Though the vending machines of the modern era hardly do it justice."
icon_state = "greentea_vended"
item_state = "coffee"
trash = /obj/item/trash/coffee
center_of_mass = list("x"=16, "y"=14)
drop_sound = 'sound/items/drop/papercup.ogg'
/obj/item/weapon/reagent_containers/food/drinks/greentea/Initialize()
. = ..()
reagents.add_reagent("greentea", 30)
/obj/item/weapon/reagent_containers/food/drinks/chaitea
name = "cup of chai tea"
desc = "The name is redundant but the flavor is delicious!"
description_fluff = "Chai Tea - tea blended with a spice mix of cinnamon and cloves - borders on a national drink on Kishar."
icon_state = "chai_vended"
item_state = "coffee"
trash = /obj/item/trash/coffee
center_of_mass = list("x"=16, "y"=14)
drop_sound = 'sound/items/drop/papercup.ogg'
/obj/item/weapon/reagent_containers/food/drinks/chaitea/Initialize()
. = ..()
reagents.add_reagent("chaitea", 30)
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen
name = "Cup Ramen"
desc = "Just add 10ml water, self heats! A taste that reminds you of your school years."
description_fluff = "Konohagakure Brand Ramen has been an instant meal staple for centuries. Cheap, quick and available in over two hundred varieties - though most taste like artifical chicken."
icon_state = "ramen"
trash = /obj/item/trash/ramen
center_of_mass = list("x"=16, "y"=11)
drop_sound = 'sound/items/drop/papercup.ogg'
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen/Initialize()
..()
reagents.add_reagent("dry_ramen", 30)
@@ -219,7 +281,7 @@
possible_transfer_amounts = null
volume = 10
center_of_mass = list("x"=16, "y"=12)
drop_sound = 'sound/items/drop/paper.ogg'
drop_sound = 'sound/items/drop/papercup.ogg'
/obj/item/weapon/reagent_containers/food/drinks/sillycup/Initialize()
. = ..()

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

@@ -202,7 +202,7 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey
name = "Uncle Git's Special Reserve"
desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter."
desc = "A premium single-malt whiskey, gently matured in a highly classified location."
icon_state = "whiskeybottle"
center_of_mass = list("x"=16, "y"=3)
@@ -252,7 +252,7 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle/patron
name = "Wrapp Artiste Patron"
desc = "Silver laced tequilla, served in space night clubs across the galaxy."
desc = "Silver laced tequilla, served in night clubs across the galaxy."
icon_state = "patronbottle"
center_of_mass = list("x"=16, "y"=6)
@@ -514,8 +514,9 @@
rag_underlay = "rag_small"
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer
name = "space beer"
desc = "Contains only water, malt and hops."
name = "Spacer beer"
desc = "A remarkably unremarkable pale lager. Barley malt, hops and yeast."
description_fluff = "Identical to an earlier Earth-based variety of beer, Spacer beer was rebranded at the height of humanity's first extra-solar colonization boom in the 2130s and become the go-to cheap booze for those dreaming of a brighter future in the stars. Today, the beer is advertised as 'brewed in space, for space."
icon_state = "beer"
center_of_mass = list("x"=16, "y"=12)
@@ -523,6 +524,28 @@
. = ..()
reagents.add_reagent("beer", 30)
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/silverdragon
name = "Silver Dragon pilsner"
desc = "An earthy pale lager produced exclusively on Nisp, best served cold."
description_fluff = "Brewed using locally grown hops, with hints of local flora, Silver Dragon has a reputation as the beer of the frontier hunter - and those trying to look just as tough."
icon_state = "beer2"
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/meteor
name = "Meteor beer"
desc = "A strong, premium beer with a hint of maize."
description_fluff = "Sold across human space, Meteor beer has won more awards than any single variety in history. It should be noted that Meteor's parent company Gilthari Exports, owns most alcohol awards agencies."
icon_state = "beerprem"
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/litebeer
name = "Lite-Speed Lite beer"
desc = "A reduced-alcohol, reduced-calorie beer for the drunk on a diet."
description_fluff = "Lite-Speed is Spacer Beer's light brand, and despite being widely considered inferior in every regard, it's still pretty cheap. The lower alcohol content also appeals to some Skrell, for whom full-strength beer is too strong."
icon_state = "beerlite"
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/litebeer/Initialize()
. = ..()
reagents.add_reagent("litebeer", 30)
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/cider
name = "Crisp's Cider"
desc = "Fermented apples never tasted this good."
@@ -545,6 +568,16 @@
. = ..()
reagents.add_reagent("ale", 30)
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper
name = "Hushed Whisper IPA"
desc = "A popular Sivian pale ale named for an infamous space pirate."
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 = "alebottle2"
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper/Initialize()
. = ..()
reagents.add_reagent("ale", 30)
/obj/item/weapon/reagent_containers/food/drinks/bottle/sake
name = "Mono-No-Aware Luxury Sake"
desc = "Dry alcohol made from rice, a favorite of businessmen."

336
code/modules/food/food/snacks.dm
View File

@@ -292,8 +292,10 @@
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy
name = "candy"
desc = "Nougat, love it or hate it."
name = "\improper Grandma Ellen's Hard Candy"
desc = "Now without nuts!"
description_fluff = "Hard candies were banned from many early human colony ships due to the tendency for brittle, sticky chunks to find their way inside vital equipment in zero-G conditions. This only made them all the more popular to new arrivees, and the Grandma Ellen's brand was Tau Ceti's answer to that demand."
icon = 'icons/obj/food_snacks.dmi'
icon_state = "candy"
trash = /obj/item/trash/candy
filling_color = "#7D5F46"
@@ -307,8 +309,10 @@
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar
name = "protein bar"
desc = "SwoleMAX brand protein bars, guaranteed to get you feeling perfectly overconfident."
name = "\improper SwoleMAX protein bar"
desc = "Guaranteed to get you feeling perfectly overconfident."
description_fluff = "NanoMed's SwoleMAX boasts the highest density of protein mush per square inch among leading protein bar brands. While formulated for strength training, this high nutrient density in a mostly-solid form makes SwoleMAX a popular alternative for spacers looking to mix up their usual diet of pastes and gooes."
icon = 'icons/obj/food_snacks.dmi'
icon_state = "proteinbar"
trash = /obj/item/trash/candy/proteinbar
nutriment_amt = 9
@@ -320,6 +324,21 @@
reagents.add_reagent("sugar", 4)
bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/candy/gummy
name = "\improper AlliCo Gummies"
desc = "Somehow, there's never enough cola bottles."
description_fluff = "AlliCo's grab-bags of gummy candies come in over a thousand novelty shapes and dozens of flavours. Shoes, astronauts, bunny rabbits and singularities all made an appearance."
icon = 'icons/obj/food_snacks.dmi'
icon_state = "candy_gums"
trash = /obj/item/trash/candy/gums
nutriment_amt = 5
nutriment_desc = list("sugar" = 1, "artificial fruit flavour" = 1)
/obj/item/weapon/reagent_containers/food/snacks/candy/gummy/Initialize()
. = ..()
reagents.add_reagent("sugar", 5)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/candy/donor
name = "Donor Candy"
desc = "A little treat for blood donors."
@@ -347,8 +366,10 @@
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/chips
name = "chips"
desc = "Commander Riker's What-The-Crisps"
name = "\improper What-The-Crisps"
desc = "Commander Riker's What-The-Crisps, lightly salted."
description_fluff = "What-The-Crisps' retro-styled starship commander has been a marketing staple for almost 200 years."
icon = 'icons/obj/food_snacks.dmi'
icon_state = "chips"
trash = /obj/item/trash/chips
filling_color = "#E8C31E"
@@ -360,6 +381,20 @@
. = ..()
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/chips/bbq
name = "\improper Legendary BBQ Chips"
desc = "You know I can't grab your ghost chips!"
description_fluff = "A local brand, Legendary Chips have proudly sponsored Vir's anti-drink-piloting campaign since 2558."
icon = 'icons/obj/food_snacks.dmi'
icon_state = "chips_bbq"
trash = /obj/item/trash/chips/bbq
nutriment_amt = 3
nutriment_desc = list("salt" = 1, "barbeque sauce" = 2)
/obj/item/weapon/reagent_containers/food/snacks/chips/Initialize()
. = ..()
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/cookie
name = "cookie"
desc = "COOKIE!!!"
@@ -373,6 +408,37 @@
. = ..()
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/cookiesnack
name = "Carps Ahoy! miniature cookies"
desc = "Now 100% carpotoxin free!"
description_fluff = "Carps Ahoy! cookies are required to sell under the 'Cap'n Choco' name in certain markets, out of concerns that children will become desensitized to the very real dangers of Space Carp."
icon = 'icons/obj/food_snacks.dmi'
icon_state = "cookiesnack"
trash = /obj/item/trash/cookiesnack
filling_color = "#DBC94F"
nutriment_amt = 3
nutriment_desc = list("sweetness" = 1, "stale cookie" = 2)
/obj/item/weapon/reagent_containers/food/snacks/cookiesnack/Initialize()
. = ..()
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/fruitbar
name = "\improper ChewMAX fruit bar"
desc = "Guaranteed to get you feeling comfortably superior."
description_fluff = "NanoMed's ChewMAX is the low-carb alternative to the SwoleMAX range! Want short-term energy but not really interested in sustaining it? Hate fat but don't entirely understand nutrition? Just really like fruit? ChewMAX is for you!"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "fruitbar"
trash = /obj/item/trash/candy/proteinbar
nutriment_amt = 9
nutriment_desc = list("apricot" = 2, "sugar" = 2, "dates" = 2, "cranberry" = 2, "apple = 2")
/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar/Initialize()
. = ..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("sugar", 4)
bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
name = "Chocolate Bar"
desc = "Such sweet, fattening food."
@@ -568,6 +634,210 @@
src.name = "Frosted Jelly Donut"
reagents.add_reagent("sprinkles", 2)
/obj/item/weapon/reagent_containers/food/snacks/tuna
name = "\improper Tuna Snax"
desc = "A packaged dried fish snack, guaranteed to do not contain space carp. Actual fish content may vary."
description_fluff = "Launched by Centuari Provisions to target the Tajaran immigrant market, Tuna Snax also found a surprising niche among Vir's sizable Scandinavian population. Elsewhere, the dried fish flakes are widely considered disgusting."
icon = 'icons/obj/food_snacks.dmi'
icon_state = "tuna"
filling_color = "#FFDEFE"
center_of_mass = list("x"=17, "y"=13)
nutriment_amt = 3
nutriment_desc = list("smoked fish" = 5)
trash = /obj/item/trash/tuna
/obj/item/weapon/reagent_containers/food/snacks/tuna/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/pistachios
name = "pistachios"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "pistachios"
desc = "Pistachios. There is absolutely nothing remarkable about these."
filling_color = "#825D26"
center_of_mass = list("x"=17, "y"=13)
nutriment_desc = list("nuts" = 1)
nutriment_amt = 3
bitesize = 1
trash = /obj/item/trash/pistachios
/obj/item/weapon/reagent_containers/food/snacks/semki
name = "\improper Semki"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "semki"
desc = "Sunflower seeds. A favorite among both birds and gopniks."
filling_color = "#68645D"
center_of_mass = list("x"=17, "y"=13)
nutriment_desc = list("sunflower seeds" = 1)
nutriment_amt = 6
bitesize = 1
trash = /obj/item/trash/semki
/obj/item/weapon/reagent_containers/food/snacks/cb01
name = "\improper Tau Ceti Bar"
desc = "A dark chocolate caramel and nougat bar made famous on Binma."
description_fluff = "Binma's signature chocolate bar, the Tau Ceti Bar was originally made with cheap, heavily preserved ingredients available to Sol's first colonists. The modern recipe attempts to recreate this, baffling many not accustomed to its slightly stale taste."
filling_color = "#552200"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "cb01"
nutriment_amt = 4
nutriment_desc = list("stale chocolate" = 2, "nougat" = 1, "caramel" = 1)
w_class = 1
/obj/item/weapon/reagent_containers/food/snacks/cb01/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cb02
name = "\improper Hundred-Thousand Thaler Bar"
desc = "An ironically cheap puffed rice caramel milk chocolate bar."
description_fluff = "The Hundred-Thousand Thaler bar has been the focal point of dozens of exonet and radio giveaway pranks over its long history. In 2500 the company got in on the action, offering a prize of one-hundred thousand one-hundred thousand thaler bars to one lucky entrant, who reportedly turned down the prize in favour of a 250 Thaler cash prize."
filling_color = "#552200"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "cb02"
nutriment_amt = 4
nutriment_desc = list("chocolate" = 2, "caramel" = 1, "puffed rice" = 1)
w_class = 1
/obj/item/weapon/reagent_containers/food/snacks/cb02/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cb03
name = "\improper Aerostat Bar"
desc = "Bubbly milk chocolate."
description_fluff = "An early slogan claimed the chocolate's bubbles where made with 'real Venusian gases', which is thought to have seriously harmed sales. The claim remains true, since the main production plant remains on Venus, but the company tries to avoid association with toxic air."
filling_color = "#552200"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "cb03"
nutriment_amt = 4
nutriment_desc = list("chocolate" = 4)
w_class = 1
/obj/item/weapon/reagent_containers/food/snacks/cb03/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cb04
name = "\improper Lars' Saltlakris"
desc = "Milk chocolate embedded with chunks of salty licorice."
description_fluff = "Produced exclusively in Kalmar for sale in Vir, Lars' Saltlakris is one of the system's most popular home-grown confectionaries."
filling_color = "#552200"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "cb04"
nutriment_amt = 4
nutriment_desc = list("chocolate" = 2, "salt = 1", "licorice" = 1)
w_class = 1
/obj/item/weapon/reagent_containers/food/snacks/cb04/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cb05
name = "\improper Andromeda Bar"
desc = "A cheap milk chocolate bar loaded with sugar."
description_fluff = "The galaxy's top-selling chocolate brand for almost 400 years. Also comes in dozens of varieties, including caramel, cookie, fruit and nut, and almond. This is just the basic stuff, though."
filling_color = "#552200"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "cb05"
nutriment_amt = 3
nutriment_desc = list("milk chocolate" = 2)
w_class = 1
/obj/item/weapon/reagent_containers/food/snacks/cb05/Initialize()
. = ..()
reagents.add_reagent("sugar", 3)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/cb06
name = "\improper Mocha Crunch"
desc = "A large latte flavored wafer chocolate bar."
description_fluff = "Lightly caffeinated, the Mocha Crunch is often considered to be more of an authentic coffee taste than most vending machine coffees."
filling_color = "#552200"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "cb06"
nutriment_amt = 4
nutriment_desc = list("chocolate" = 2, "coffee" = 1, "vanilla wafer" = 1)
w_class = 1
/obj/item/weapon/reagent_containers/food/snacks/cb06/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/cb07
name = "\improper TaroMilk Bar"
desc = "A light milk chocolate shell with a Taro paste filling. Chewy!"
description_fluff = "The best-selling Kishari snack finally made its way to the galactic stage in 2562. Whether it is here to stay remains to be seen, though it has found some popularity with the Skrell.."
filling_color = "#552200"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "cb07"
nutriment_amt = 4
nutriment_desc = list("chocolate" = 2, "taro" = 2)
w_class = 1
/obj/item/weapon/reagent_containers/food/snacks/cb07/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/cb08
name = "\improper Cronk Bar"
desc = "A large puffed malt milk chocolate bar."
description_fluff = "The Cronk Bar proudly 'Comes in one flavour, so you'll never pick the wrong one!'. Its enduring popularity may be in part due to a longstanding deal with the SCG Fleet to include Cronk in standard military rations."
filling_color = "#552200"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "cb08"
nutriment_amt = 3
nutriment_desc = list("chocolate" = 2, "malt puffs" = 1)
w_class = 1
/obj/item/weapon/reagent_containers/food/snacks/cb08/Initialize()
. = ..()
reagents.add_reagent("sugar", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/cb09
name = "\improper Kaju Mamma! Bar"
desc = "A massive cluster of cashews and peanuts covered in a condensed milk solid."
description_fluff = "Based on traditional South Asian desserts, the Kaju Mamma! is a deceptively soft, sweet bar voted 'Most allergenic candy' nineteen years running."
filling_color = "#552200"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "cb09"
nutriment_amt = 6
nutriment_desc = list("peanuts" = 3, "condensed milk" = 1, "cashews" = 2)
w_class = 1
/obj/item/weapon/reagent_containers/food/snacks/cb09/Initialize()
. = ..()
reagents.add_reagent("sugar", 1)
reagents.add_reagent("milk", 1)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/cb10
name = "\improper Shantak Bar"
desc = "Nuts, nougat, peanuts, and caramel covered in chocolate."
description_fluff = "Despite being often mistaken for a regional favourite, the Shantak Bar is sold under different 'localized' names in almost every human system in the galaxy, and adds up to being the third best selling confection produced by Centauri Provisions."
filling_color = "#552200"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "cb10"
nutriment_amt = 5
nutriment_desc = list("chocolate" = 2, "caramel" = 1, "peanuts" = 1, "nougat" = 1)
w_class = 1
/obj/item/weapon/reagent_containers/food/snacks/cb10/Initialize()
. = ..()
bitesize = 3
reagents.add_reagent("sugar", 1)
reagents.add_reagent("protein", 1)
/obj/item/weapon/reagent_containers/food/snacks/egg
name = "egg"
desc = "An egg!"
@@ -1360,8 +1630,10 @@
/obj/item/weapon/reagent_containers/food/snacks/sosjerky
name = "Scaredy's Private Reserve Beef Jerky"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "sosjerky"
desc = "Beef jerky made from the finest space cows."
desc = "Beef jerky made from the finest space-reared cows."
description_fluff = "Raising cows in low-gravity environments has the natural result of particularly tender meat. The jerking process largely undoes this apparent benefit, but it's just too damn efficient to ship not to."
trash = /obj/item/trash/sosjerky
filling_color = "#631212"
center_of_mass = list("x"=15, "y"=9)
@@ -1373,8 +1645,10 @@
/obj/item/weapon/reagent_containers/food/snacks/no_raisin
name = "4no Raisins"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "4no_raisins"
desc = "Best raisins in the universe. Not sure why."
description_fluff = "The popularity of dried foods across the galaxy is either a direct result of ease of shipping, or a clever marketing ploy by corporations trying to cut back costs. Whatever it is, there must be SOME reason?"
trash = /obj/item/trash/raisins
filling_color = "#343834"
center_of_mass = list("x"=15, "y"=4)
@@ -1386,9 +1660,11 @@
reagents.add_reagent("nutriment", 6)
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie
name = "Space Twinkie"
name = "Spacer Snack Cake"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "space_twinkie"
desc = "Guaranteed to survive longer then you will."
desc = "Guaranteed to survive longer than you will."
description_fluff = "Despite Spacer advertisements consistently portraying their snack cakes as life-saving, tear-jerking survival food for spacers in all kinds of dramatic scenarios, the Spacer Snack Cake has been statistically proven to lower survival rates on all missions where it is present."
filling_color = "#FFE591"
center_of_mass = list("x"=15, "y"=11)
@@ -1399,8 +1675,10 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers
name = "Cheesie Honkers"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "cheesie_honkers"
desc = "Bite sized cheesie snacks that will honk all over your mouth"
desc = "Bite sized cheesie snacks that will honk all over your mouth."
description_fluff = "The origins of the flourescent orange dust produced by Cheesie Honkers is considered a trade secret, despite having been leaked on the exonet decades ago. It's the cheese."
trash = /obj/item/trash/cheesie
filling_color = "#FFA305"
center_of_mass = list("x"=15, "y"=9)
@@ -1413,8 +1691,10 @@
/obj/item/weapon/reagent_containers/food/snacks/syndicake
name = "Syndi-Cakes"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "syndi_cakes"
desc = "An extremely moist snack cake that tastes just as good after being nuked."
description_fluff = "Spacer Snack Cakes' meaner, tastier cousin. The Syndi-Cakes brand was at risk of dissolution in 2429 when it was revealed that the entire production chain was a Nos Amis joint. The brand was quickly aquired by Centauri Provisions and some mild hallucinogenic 'add-ins' were axed from the recipe."
filling_color = "#FF5D05"
center_of_mass = list("x"=16, "y"=10)
trash = /obj/item/trash/syndi_cakes
@@ -2418,6 +2698,28 @@
reagents.add_reagent("mint", 1)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/mint/admints
desc = "Spearmint, peppermint's non-festive cousin."
icon = 'icons/obj/food_snacks.dmi'
icon_state = "admint"
/obj/item/weapon/storage/box/admints
name = "Ad-mints"
desc = "A pack of air fresheners for your mouth."
description_fluff = "Ad-mints earned their name, and reputation when a Major Bill's attended a meeting at a large a marketing firm and was so astounded by the quality of their complimentary mints, that he immediately bought the company - the mints company, not the ad agency - and began providing 'Ad-mints' on every MBT flight."
icon = 'icons/obj/food_snacks.dmi'
icon_state = "admint_pack"
item_state = "candy"
slot_flags = SLOT_EARS
w_class = 1
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/mint/admints = 6)
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/mint/admints)
use_sound = 'sound/items/drop/paper.ogg'
drop_sound = 'sound/items/drop/wrapper.ogg'
max_storage_space = 6
foldable = null
trash = /obj/item/trash/admints
/obj/item/weapon/reagent_containers/food/snacks/mushroomsoup
name = "chantrelle soup"
desc = "A delicious and hearty mushroom soup."
@@ -3798,6 +4100,8 @@
/obj/item/weapon/reagent_containers/food/snacks/tastybread
name = "bread tube"
desc = "Bread in a tube. Chewy...and surprisingly tasty."
description_fluff = "Due to the high corn-syrup content of NanoTrasen's own-brand bread tubes, many jurisdictions classify them as a confectionary."
icon = 'icons/obj/food_snacks.dmi'
icon_state = "tastybread"
trash = /obj/item/trash/tastybread
filling_color = "#A66829"
@@ -3812,6 +4116,8 @@
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks
name = "\improper SkrellSnax"
desc = "Cured fungus shipped all the way from Qerr'balak, almost like jerky! Almost."
description_fluff = "Despite the packaging, most SkrellSnax sold in Vir are produced using locally-grown fungi in controversial Skrell-owned biodomes on the suface of Sif."
icon = 'icons/obj/food_snacks.dmi'
icon_state = "skrellsnacks"
filling_color = "#A66829"
center_of_mass = list("x"=15, "y"=12)
@@ -3824,8 +4130,10 @@
/obj/item/weapon/reagent_containers/food/snacks/unajerky
name = "Moghes Imported Sissalik Jerky"
icon = 'icons/obj/food_snacks.dmi'
icon_state = "unathitinred"
desc = "An incredibly well made jerky, shipped in all the way from Moghes."
description_fluff = "The exact meat and spices used in the curing of Sissalik Jerky are a well-kept secret, and thought to not exist at all outside of Hegemony space. Many have tried to replicate the flavour, but none have come close, so the brand remains a highly prized import."
trash = /obj/item/trash/unajerky
filling_color = "#631212"
center_of_mass = list("x"=15, "y"=9)
@@ -4514,8 +4822,8 @@
center_of_mass = list("x"=16, "y"=16)
do_coating_prefix = 0
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sausage/battered/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
@@ -4546,7 +4854,7 @@
icon_state = "ratburger"
center_of_mass = list("x"=16, "y"=11)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/mouseburger/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
@@ -6021,7 +6329,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cosmicbrowniesslice/filled/Initialize()
. = ..()
reagents.add_reagent("protein", 1)
/obj/item/weapon/reagent_containers/food/snacks/lasagna
name = "lasagna"
desc = "Meaty, tomato-y, and ready to eat-y. Favorite of cats."

67
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
View File

@@ -150,7 +150,7 @@
/datum/reagent/nutriment/triglyceride/oil/touch_turf(var/turf/simulated/T)
if(!istype(T))
return
var/hotspot = (locate(/obj/fire) in T)
if(hotspot && !istype(T, /turf/space))
var/datum/gas_mixture/lowertemp = T.remove_air(T:air:total_moles)
@@ -222,7 +222,7 @@
taste_description = "oil"
taste_mult = 0.1
reagent_state = LIQUID
/datum/reagent/nutriment/triglyceride/oil/peanut
name = "Peanut Oil"
id = "peanutoil"
@@ -578,7 +578,7 @@
reagent_state = LIQUID
color = "#365E30"
overdose = REAGENTS_OVERDOSE
//SYNNONO MEME FOODS EXPANSION - Credit to Synnono
/datum/reagent/spacespice
@@ -1203,6 +1203,32 @@
cup_name = "cup of berry tea"
cup_desc = "A tasty mixture of berries and tea. It's apparently good for you!"
/datum/reagent/drink/greentea
name = "Green Tea"
id = "greentea"
description = "A subtle blend of green tea. It's apparently good for you!"
color = "#A8442C"
taste_description = "green tea"
glass_name = "green tea"
glass_desc = "A subtle blend of green tea. It's apparently good for you!"
cup_name = "cup of green tea"
cup_desc = "A subtle blend of green tea. It's apparently good for you!"
/datum/reagent/drink/chaitea
name = "Chai Tea"
id = "chaitea"
description = "A tea spiced with cinnamon and cloves."
color = "#A8442C"
taste_description = "creamy cinnamon and spice"
glass_name = "chai tea"
glass_desc = "A tea spiced with cinnamon and cloves."
cup_name = "cup of chai tea"
cup_desc = "A tea spiced with cinnamon and cloves."
/datum/reagent/drink/coffee
name = "Coffee"
id = "coffee"
@@ -1644,7 +1670,7 @@
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/soda/lemon_lime
name = "Lemon Lime"
name = "Lemon-Lime"
id = "lemon_lime"
description = "A tangy substance made of 0.5% natural citrus!"
taste_description = "tangy lime and lemon soda"
@@ -1667,6 +1693,26 @@
glass_desc = "The original, refreshing not-actually-ale."
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/root_beer
name = "R&D Root Beer"
id = "rootbeer"
color = "#211100"
adj_drowsy = -6
taste_description = "sassafras and anise soda"
glass_name = "glass of R&D Root Beer"
glass_desc = "A glass of bubbly R&D Root Beer."
/datum/reagent/drink/dr_gibb_diet
name = "Diet Dr. Gibb"
id = "diet_dr_gibb"
color = "#102000"
taste_description = "watered down cherry soda"
glass_name = "glass of Diet Dr. Gibb"
glass_desc = "Regular Dr.Gibb is probably healthier than this cocktail of artificial flavors."
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/shirley_temple
name = "Shirley Temple"
id = "shirley_temple"
@@ -2034,6 +2080,7 @@
glass_icon = DRINK_ICON_NOISY
glass_special = list(DRINK_FIZZ)
/* Alcohol */
// Basic
@@ -2079,6 +2126,18 @@
return
M.jitteriness = max(M.jitteriness - 3, 0)
/datum/reagent/ethanol/beer/lite
name = "Lite Beer"
id = "litebeer"
description = "An alcoholic beverage made from malted grains, hops, yeast, water, and water."
taste_description = "bad beer"
color = "#FFD300"
strength = 75
nutriment_factor = 1
glass_name = "lite beer"
glass_desc = "A freezing pint of lite beer"
/datum/reagent/ethanol/bluecuracao
name = "Blue Curacao"
id = "bluecuracao"

1
code/modules/reagents/dispenser/cartridge_presets.dm
View File

@@ -73,6 +73,7 @@
cream spawn_reagent = "cream"
mint spawn_reagent = "mint"
berry spawn_reagent = "berryjuice"
greentea spawn_reagent = "greentea"
decaf spawn_reagent = "decaf"
// ERT

1
code/modules/reagents/dispenser/dispenser_presets.dm
View File

@@ -139,5 +139,6 @@
/obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/lime,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/berry,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/greentea,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/decaf
)