diff --git a/code/game/machinery/vending_machines.dm b/code/game/machinery/vending_machines.dm index ebdd3f4f5a..84796eb066 100644 --- a/code/game/machinery/vending_machines.dm +++ b/code/game/machinery/vending_machines.dm @@ -125,12 +125,14 @@ idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. vend_power_usage = 85000 //85 kJ to heat a 250 mL cup of coffee products = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 25, + /obj/item/weapon/reagent_containers/food/drinks/decaf = 15, /obj/item/weapon/reagent_containers/food/drinks/tea = 25, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 25, /obj/item/weapon/reagent_containers/food/drinks/greentea = 15, /obj/item/weapon/reagent_containers/food/drinks/chaitea = 15) contraband = list(/obj/item/weapon/reagent_containers/food/drinks/ice = 10) prices = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 3, + /obj/item/weapon/reagent_containers/food/drinks/decaf = 3, /obj/item/weapon/reagent_containers/food/drinks/tea = 3, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 3, /obj/item/weapon/reagent_containers/food/drinks/greentea = 10, diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 7c5703f0ee..0f7f3fd334 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -38,6 +38,10 @@ name = "protein bar wrapper" icon_state = "proteinbar" +/obj/item/trash/candy/fruitbar + name = "fruit bar wrapper" + icon_state = "fruitbar" + /obj/item/trash/cheesie name = "\improper Cheesie Honkers bag" icon_state = "cheesie_honkers" diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index 3f6e656f14..e6d7dbcf99 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -140,7 +140,7 @@ obj/item/clothing/mask/chewable/Destroy() //Tobacco Tins /obj/item/weapon/storage/chewables/tobacco - name = "tin of Mendell Smooth chewing tobacco" + name = "tin of Al Mamun Smooth chewing tobacco" desc = "Packaged and shipped straight from Kishar, popularised by the biosphere farmers of Kanondaga." icon_state = "chew_generic" item_state = "cigpacket" @@ -149,14 +149,14 @@ obj/item/clothing/mask/chewable/Destroy() /obj/item/weapon/storage/chewables/tobacco/fine name = "tin of Suamalie chewing tobacco" - desc = "Once reserved for the first-class tourists of Oasis, this blend has been released for the public to enjoy." + desc = "Once reserved for the first-class tourists of Oasis, this premium blend has been released for the public to enjoy." icon_state = "chew_fine" item_state = "Dpacket" starts_with = list(/obj/item/clothing/mask/chewable/tobacco/fine = 6) /obj/item/weapon/storage/box/fancy/chewables/tobacco/nico name = "box of Nico-Tine gum" - desc = "A SCG doctor-approved brand of nicotine gum. Cut out the middleman for your addiction fix." + desc = "A government doctor approved brand of nicotine gum. Cut out the middleman for your addiction fix." icon = 'icons/obj/cigarettes.dmi' icon_state = "chew_nico" item_state = "Epacket" diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 1109e7028e..c1f3e1ef71 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -494,6 +494,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/weapon/rollingpaper name = "rolling paper" desc = "A small, thin piece of easily flammable paper, commonly used for rolling and smoking various dried plants." + description_fluff = "The legalization of certain substances propelled the sale of rolling papers through the roof. Now almost every Trans-stellar produces a variety, often of questionable quality." icon = 'icons/obj/cigarettes.dmi' icon_state = "cig paper" @@ -519,6 +520,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/weapon/flame/lighter name = "cheap lighter" desc = "A cheap-as-free lighter." + description_fluff = "The 'hand-made in Altair' sticker underneath is a charming way of saying 'Made with prison labour'. It's no wonder the company can sell these things so cheap." icon = 'icons/obj/items.dmi' icon_state = "lighter-g" item_state = "lighter-g" @@ -533,6 +535,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/weapon/flame/lighter/zippo name = "\improper Zippo lighter" desc = "The zippo." + description_fluff = "Still going after all these years." icon = 'icons/obj/zippo.dmi' icon_state = "zippo" item_state = "zippo" diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 8ea37f5d11..c8eb58e5af 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -317,6 +317,7 @@ /obj/item/weapon/storage/fancy/cigar name = "cigar case" desc = "A case for holding your cigars when you are not smoking them." + description_fluff = "The tastefully engraved palm tree tells you that these 'Corona Grande' premium cigars are only sold on the luxury cruises and resorts of Oasis, though ten separate companies produce them for that purpose galaxy-wide. The standard is however very high." icon_state = "cigarcase" icon = 'icons/obj/cigarettes.dmi' w_class = ITEMSIZE_TINY diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm index 11cd46c451..148863ae8d 100644 --- a/code/game/objects/structures/loot_piles.dm +++ b/code/game/objects/structures/loot_piles.dm @@ -227,8 +227,10 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/trash/candle, /obj/item/trash/candy, /obj/item/trash/candy/proteinbar, + /obj/item/trash/candy/gums, /obj/item/trash/cheesie, /obj/item/trash/chips, + /obj/item/trash/chips/bbq, /obj/item/trash/liquidfood, /obj/item/trash/pistachios, /obj/item/trash/plate, diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index 73b3b333ff..e13d53cac8 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -213,7 +213,6 @@ 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() . = ..() @@ -261,6 +260,20 @@ . = ..() reagents.add_reagent("chaitea", 30) +/obj/item/weapon/reagent_containers/food/drinks/decaf + name = "cup of decaf coffee" + desc = "Coffee with all the wake-up sucked out." + description_fluff = "A trial run on two NanoTrasen stations in 2481 attempted to replace all vending machine coffee with decaf in order to combat an epidemic of caffeine addiction. After two days, three major industrial accidents and a death, the initiative was cancelled. Decaf is now thankfully optional." + icon_state = "coffee" + 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/decaf/Initialize() + . = ..() + reagents.add_reagent("decaf", 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." diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index cacfbe0e0e..7806f9a0e7 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -429,7 +429,7 @@ 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 + trash = /obj/item/trash/candy/fruitbar nutriment_amt = 9 nutriment_desc = list("apricot" = 2, "sugar" = 2, "dates" = 2, "cranberry" = 2, "apple = 2") @@ -2706,7 +2706,7 @@ /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." + description_fluff = "Ad-mints earned their name, and reputation when a Major Bill's senior executive 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" @@ -4100,7 +4100,7 @@ /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." + description_fluff = "Due to the high-fructose 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