cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8756 from VOREStation/upstream-merge-7449

Browse Source 
[MIRROR] Flavour Enhancement: Vending
This commit is contained in:
Novacat
2020-08-21 13:32:37 -04:00
committed by GitHub
parent 4082d5355b 537cc1328e
commit a6efe9acbb
28 changed files with 1311 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/datums/supplypacks/medical.dm
View File

@@ -29,21 +29,21 @@
name = "BloodPack crate"
contains = list(/obj/item/weapon/storage/box/bloodpacks = 3)
cost = 10
containertype = /obj/structure/closet/crate/nanocare
containertype = /obj/structure/closet/crate/nanomed
containername = "BloodPack crate"
/datum/supply_pack/med/bodybag
name = "Body bag crate"
contains = list(/obj/item/weapon/storage/box/bodybags = 3)
cost = 10
containertype = /obj/structure/closet/crate/nanocare
containertype = /obj/structure/closet/crate/nanomed
containername = "Body bag crate"
/datum/supply_pack/med/cryobag
name = "Stasis bag crate"
contains = list(/obj/item/bodybag/cryobag = 3)
cost = 40
containertype = /obj/structure/closet/crate/nanocare
containertype = /obj/structure/closet/crate/nanomed
containername = "Stasis bag crate"
/datum/supply_pack/med/surgery
@@ -109,7 +109,7 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/medical = 3
)
cost = 10
containertype = /obj/structure/closet/crate/secure/nanocare
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical surplus equipment"
access = access_medical
@@ -133,7 +133,7 @@
/obj/item/weapon/reagent_containers/syringe
)
cost = 50
containertype = /obj/structure/closet/crate/secure/nanocare
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Chief medical officer equipment"
access = access_cmo
@@ -156,7 +156,7 @@
/obj/item/weapon/reagent_containers/syringe
)
cost = 20
containertype = /obj/structure/closet/crate/secure/nanocare
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical Doctor equipment"
access = access_medical_equip
@@ -179,7 +179,7 @@
/obj/item/weapon/reagent_containers/syringe
)
cost = 20
containertype = /obj/structure/closet/crate/secure/nanocare
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Chemist equipment"
access = access_chemistry
@@ -207,7 +207,7 @@
/obj/item/clothing/accessory/storage/white_vest
)
cost = 20
containertype = /obj/structure/closet/crate/secure/nanocare
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Paramedic equipment"
access = access_medical_equip
@@ -226,7 +226,7 @@
/obj/item/weapon/cartridge/medical
)
cost = 20
containertype = /obj/structure/closet/crate/secure/nanocare
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Psychiatrist equipment"
access = access_psychiatrist
@@ -247,7 +247,7 @@
/obj/item/weapon/storage/box/gloves
)
cost = 10
containertype = /obj/structure/closet/crate/secure/nanocare
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical scrubs crate"
access = access_medical_equip
@@ -291,7 +291,7 @@
/obj/item/weapon/storage/box/gloves
)
cost = 10
containertype = /obj/structure/closet/crate/secure/nanocare
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical uniform crate"
access = access_medical_equip
@@ -309,7 +309,7 @@
/obj/item/weapon/storage/box/gloves
)
cost = 50
containertype = /obj/structure/closet/crate/secure/nanocare
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical biohazard equipment"
access = access_medical_equip

2
code/datums/supplypacks/voidsuits.dm
View File

@@ -129,7 +129,7 @@
/obj/item/weapon/tank/oxygen = 2
)
cost = 45
containertype = /obj/structure/closet/crate/secure/nanocare
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical Biohazard voidsuit crate"
access = access_medical_equip

427
code/game/machinery/vending_machines.dm
View File

@@ -38,7 +38,7 @@
/obj/machinery/vending/boozeomat
name = "Booze-O-Mat"
desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."
desc = "A technological marvel, the ads would have you believe this is able to mix just the mixture you'd like to drink the moment you ask for one."
icon_state = "fridge_dark"
products = list(/obj/item/weapon/reagent_containers/food/drinks/glass2/square = 10,
/obj/item/weapon/reagent_containers/food/drinks/glass2/rocks = 10,
@@ -72,7 +72,11 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 15,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper = 15,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 15,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/silverdragon = 15,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/meteor = 15,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/litebeer = 15,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/cider = 15,
/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 5,
@@ -104,61 +108,144 @@
vending_sound = "machines/vending/vending_cans.ogg"
/obj/machinery/vending/assist
products = list( /obj/item/device/assembly/prox_sensor = 5,/obj/item/device/assembly/igniter = 3,/obj/item/device/assembly/signaler = 4,
/obj/item/weapon/tool/wirecutters = 1, /obj/item/weapon/cartridge/signal = 4)
contraband = list(/obj/item/device/flashlight = 5,/obj/item/device/assembly/timer = 2)
products = list( /obj/item/device/assembly/prox_sensor = 5,
/obj/item/device/assembly/igniter = 3,
/obj/item/device/assembly/signaler = 4,
/obj/item/weapon/tool/wirecutters = 1,
/obj/item/weapon/cartridge/signal = 4)
contraband = list(/obj/item/device/flashlight = 5,
/obj/item/device/assembly/timer = 2)
product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!"
/obj/machinery/vending/coffee
name = "Hot Drinks machine"
desc = "A vending machine which dispenses hot drinks."
desc = "A Galaksi brand vending machine which dispenses hot drinks."
description_fluff = "The Ward-Takahashi Galaksi Samovar 55 has been reconstituting hot drinks from their powdered forms since... Well, 2555, but the design has hardly changed in a century or so."
product_ads = "Have a drink!;Drink up!;It's good for you!;Would you like a hot joe?;I'd kill for some coffee!;The best beans in the galaxy.;Only the finest brew for you.;Mmmm. Nothing like a coffee.;I like coffee, don't you?;Coffee helps you work!;Try some tea.;We hope you like the best!;Try our new chocolate!;Admin conspiracies"
icon_state = "coffee"
vend_delay = 34
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/tea = 25,/obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 25)
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 = 2, /obj/item/weapon/reagent_containers/food/drinks/tea = 2, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 2) //VOREStation Edit
prices = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 2,
/obj/item/weapon/reagent_containers/food/drinks/decaf = 3,
/obj/item/weapon/reagent_containers/food/drinks/tea = 2,
/obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 2,
/obj/item/weapon/reagent_containers/food/drinks/greentea = 10,
/obj/item/weapon/reagent_containers/food/drinks/chaitea = 5) // VOREStation Edit - Lowers Coffee/Hot Chocolate/Tea Prices from 3 -> 2.
vending_sound = "machines/vending/vending_coffee.ogg"
/obj/machinery/vending/snack
name = "Getmore Chocolate Corp"
desc = "A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars."
desc = "A snack machine courtesy of the Getmore Chocolate Corporation, a Centauri Provisions brand."
description_fluff = "Despite its name, the Getmore Chocolate Corporation does not produce chocolate - or any foods at all. The company exists soley to refit Ward-Takahashi's Galaksi brand vending products to accept Centauri Provisions' massive range of snackfoods, and sell them at a significant markup. Generic vendors are not authorized to vend Centauri products, and their popularity forces the market to Getmore or Get Lost."
product_slogans = "Try our new nougat bar!;Twice the calories for half the price!"
product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!"
product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Get More with Getmore!;Best quality snacks from Centauri Provisions.;We love chocolate!;Try our new jerky!"
icon_state = "snack"
products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 12,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 12,/obj/item/weapon/reagent_containers/food/snacks/chips =12,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 12,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 12,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 12,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 12, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 12, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 6)
contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6,/obj/item/weapon/reagent_containers/food/snacks/unajerky = 12,)
prices = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 1,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 5,/obj/item/weapon/reagent_containers/food/snacks/chips = 1,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 2,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 1,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 1, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 2, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 2)
products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 12,
/obj/item/weapon/reagent_containers/food/snacks/candy/gummy = 12,
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 12,
/obj/item/weapon/reagent_containers/food/snacks/chips = 12,
/obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 12,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 12,
/obj/item/weapon/reagent_containers/food/snacks/pistachios = 12,
/obj/item/weapon/reagent_containers/food/snacks/semki = 12,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 12,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 12,
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 12,
/obj/item/weapon/reagent_containers/food/snacks/tastybread = 12,
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 6,
/obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 6,
/obj/item/weapon/storage/box/gum = 4,
/obj/item/clothing/mask/chewable/candy/lolli = 8,
/obj/item/weapon/storage/box/admints = 4,
/obj/item/weapon/reagent_containers/food/snacks/cb01 = 6,
/obj/item/weapon/reagent_containers/food/snacks/cb02 = 6,
/obj/item/weapon/reagent_containers/food/snacks/cb03 = 6,
/obj/item/weapon/reagent_containers/food/snacks/cb04 = 6,
/obj/item/weapon/reagent_containers/food/snacks/cb05 = 6,
/obj/item/weapon/reagent_containers/food/snacks/cb06 = 6,
/obj/item/weapon/reagent_containers/food/snacks/cb07 = 6,
/obj/item/weapon/reagent_containers/food/snacks/cb08 = 6,
/obj/item/weapon/reagent_containers/food/snacks/cb09 = 6,
/obj/item/weapon/reagent_containers/food/snacks/cb10 = 6,
/obj/item/weapon/reagent_containers/food/snacks/tuna = 2)
contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6,
/obj/item/weapon/reagent_containers/food/snacks/unajerky = 12)
prices = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 1,
/obj/item/weapon/reagent_containers/food/snacks/candy/gummy = 2,
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 5,
/obj/item/weapon/reagent_containers/food/snacks/chips = 1,
/obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 1,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 1,
/obj/item/weapon/reagent_containers/food/snacks/pistachios = 1,
/obj/item/weapon/reagent_containers/food/snacks/semki = 1,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 2,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1,
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 1,
/obj/item/weapon/reagent_containers/food/snacks/tastybread = 2,
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 4,
/obj/item/weapon/storage/box/gum = 15,
/obj/item/clothing/mask/chewable/candy/lolli = 2,
/obj/item/weapon/storage/box/admints = 5,
/obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 20,
/obj/item/weapon/reagent_containers/food/snacks/cb01 = 5,
/obj/item/weapon/reagent_containers/food/snacks/cb02 = 3,
/obj/item/weapon/reagent_containers/food/snacks/cb03 = 5,
/obj/item/weapon/reagent_containers/food/snacks/cb04 = 4,
/obj/item/weapon/reagent_containers/food/snacks/cb05 = 3,
/obj/item/weapon/reagent_containers/food/snacks/cb06 = 7,
/obj/item/weapon/reagent_containers/food/snacks/cb07 = 4,
/obj/item/weapon/reagent_containers/food/snacks/cb08 = 6,
/obj/item/weapon/reagent_containers/food/snacks/cb09 = 10,
/obj/item/weapon/reagent_containers/food/snacks/cb10 = 8,
/obj/item/weapon/reagent_containers/food/snacks/tuna = 23)
/obj/machinery/vending/cola
name = "Robust Softdrinks"
desc = "A softdrink vendor provided by Robust Industries, LLC."
desc = "A softdrink vendor graciously provided by NanoTrasen's own vending division."
description_fluff = "In a genius sales move, the only vendor authorized to dispense 'outside' beverages (at temperatures lower than 30 degrees celcius) aboard NanoTrasen stations... Is NanoTrasen themselves."
icon_state = "Cola_Machine"
product_slogans = "Robust Softdrinks: More robust than a toolbox to the head!"
product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space."
products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 10,/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 10,
/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 10,/obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 10,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 10,/obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 10,
/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 10, /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 10,
/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 10)
contraband = list(/obj/item/weapon/reagent_containers/food/drinks/cans/thirteenloko = 5, /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 6)
prices = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 1,/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 1,
/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 1,/obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 1,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 2,/obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 1,
/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 1,/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 1,
/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 1)
product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in the galaxy."
products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 10,
/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 10,
/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 10,
/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb_diet = 10,
/obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 10,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 10,
/obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 10,
/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 10,
/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 10,
/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 10,
/obj/item/weapon/reagent_containers/food/drinks/cans/root_beer = 10)
contraband = list(/obj/item/weapon/reagent_containers/food/drinks/cans/thirteenloko = 5,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 6)
prices = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 1,
/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 1,
/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 1,
/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb_diet = 1,
/obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 1,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 2,
/obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 1,
/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 1,
/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 1,
/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 1,
/obj/item/weapon/reagent_containers/food/drinks/cans/root_beer = 1)
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
vending_sound = "machines/vending/vending_cans.ogg"
/obj/machinery/vending/fitness
name = "SweatMAX"
desc = "Fueled by your inner inadequacy!"
description_fluff = "Provided by NanoMed, SweatMAX promises solutions to all of your problems. Premium gains at premium prices. Resale of SweatMAX products is a violation of NanoTrasen guidelines."
icon_state = "fitness"
//VOREStation Edit Start
products = list(/obj/item/weapon/reagent_containers/food/drinks/smallmilk = 16,
@@ -166,6 +253,7 @@
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake = 8,
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask = 8,
/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 16,
/obj/item/weapon/reagent_containers/food/snacks/fruitbar = 16,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 8,
/obj/item/weapon/reagent_containers/pill/diet = 8,
///obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5, //VOREStation Removal,
@@ -177,6 +265,7 @@
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake = 15,
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask = 1,
/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 5,
/obj/item/weapon/reagent_containers/food/snacks/fruitbar = 5,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 5,
/obj/item/weapon/reagent_containers/pill/diet = 25,
///obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5,
@@ -201,6 +290,7 @@
/obj/machinery/vending/cigarette
name = "cigarette machine"
desc = "If you want to get cancer, might as well do it in style!"
description_fluff = "As the ease of cancer treatment progressed to the almost routine (if costly) in the 22nd century, the tobacco industry was quick to make sure smoking went back into style. Take your pick, you've got health insurance don't ya, kid?"
product_slogans = "Space cigs taste good like a cigarette should.;I'd rather toolbox than switch.;Smoke!;Don't believe the reports - smoke today!"
product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs.;Feeling temperamental? Try a Temperamento!;Carcinoma Angels - go fuck yerself!;Don't be so hard on yourself, kid. Smoke a Lucky Star!"
vend_delay = 34
@@ -212,35 +302,76 @@
/obj/item/weapon/storage/fancy/cigarettes/jerichos = 10,
/obj/item/weapon/storage/fancy/cigarettes/menthols = 10,
/obj/item/weapon/storage/rollingpapers = 10,
/obj/item/weapon/storage/chewables/tobacco = 5,
/obj/item/weapon/storage/chewables/tobacco/fine = 5,
/obj/item/weapon/storage/box/matches = 10,
/obj/item/weapon/flame/lighter/random = 4)
/obj/item/weapon/flame/lighter/random = 4,
/obj/item/clothing/mask/smokable/ecig/util = 2,
///obj/item/clothing/mask/smokable/ecig/deluxe = 2,
/obj/item/clothing/mask/smokable/ecig/simple = 2,
/obj/item/weapon/reagent_containers/ecig_cartridge/med_nicotine = 10,
/obj/item/weapon/reagent_containers/ecig_cartridge/high_nicotine = 5,
/obj/item/weapon/reagent_containers/ecig_cartridge/orange = 5,
/obj/item/weapon/reagent_containers/ecig_cartridge/mint = 5,
/obj/item/weapon/reagent_containers/ecig_cartridge/watermelon = 5,
/obj/item/weapon/reagent_containers/ecig_cartridge/grape = 5,
/obj/item/weapon/reagent_containers/ecig_cartridge/lemonlime = 5,
/obj/item/weapon/reagent_containers/ecig_cartridge/coffee = 5,
/obj/item/weapon/reagent_containers/ecig_cartridge/blanknico = 2,
/obj/item/weapon/storage/box/fancy/chewables/tobacco/nico = 5)
contraband = list(/obj/item/weapon/flame/lighter/zippo = 4)
premium = list(/obj/item/weapon/storage/fancy/cigar = 5,
/obj/item/weapon/storage/fancy/cigarettes/carcinomas = 5,
/obj/item/weapon/storage/fancy/cigarettes/professionals = 5)
prices = list(/obj/item/weapon/storage/fancy/cigarettes = 12,
/obj/item/weapon/storage/fancy/cigarettes/dromedaryco = 15,
/obj/item/weapon/storage/fancy/cigarettes/killthroat = 17,
/obj/item/weapon/storage/fancy/cigarettes/dromedaryco = 20,
/obj/item/weapon/storage/fancy/cigarettes/killthroat = 14,
/obj/item/weapon/storage/fancy/cigarettes/luckystars = 17,
/obj/item/weapon/storage/fancy/cigarettes/jerichos = 22,
/obj/item/weapon/storage/fancy/cigarettes/menthols = 18,
/obj/item/weapon/storage/rollingpapers = 10,
/obj/item/weapon/storage/chewables/tobacco = 10,
/obj/item/weapon/storage/chewables/tobacco/fine = 20,
/obj/item/weapon/storage/box/matches = 1,
/obj/item/weapon/flame/lighter/random = 2)
/obj/item/weapon/flame/lighter/random = 2,
/obj/item/clothing/mask/smokable/ecig/util = 100,
///obj/item/clothing/mask/smokable/ecig/deluxe = 300,
/obj/item/clothing/mask/smokable/ecig/simple = 150,
/obj/item/weapon/reagent_containers/ecig_cartridge/med_nicotine = 10,
/obj/item/weapon/reagent_containers/ecig_cartridge/high_nicotine = 15,
/obj/item/weapon/reagent_containers/ecig_cartridge/orange = 15,
/obj/item/weapon/reagent_containers/ecig_cartridge/mint = 15,
/obj/item/weapon/reagent_containers/ecig_cartridge/watermelon = 15,
/obj/item/weapon/reagent_containers/ecig_cartridge/grape = 15,
/obj/item/weapon/reagent_containers/ecig_cartridge/lemonlime = 15,
/obj/item/weapon/reagent_containers/ecig_cartridge/coffee = 15,
/obj/item/weapon/reagent_containers/ecig_cartridge/blanknico = 15,
/obj/item/weapon/storage/box/fancy/chewables/tobacco/nico = 15)
/obj/machinery/vending/medical
name = "NanoMed Plus"
desc = "Medical drug dispenser."
description_fluff = "NanoMed is NanoTrasen's medical science division, and provides almost all of the modern medbay essentials in-house at no extra charge. By using this vending machine, employees accept liability for products that may or may not be temporarily replaced by placebos or experimental treatments."
icon_state = "med"
product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
req_access = list(access_medical)
products = list(/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 4,
/obj/item/weapon/reagent_containers/glass/bottle/stoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/toxin = 4,
/obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/syringe = 12,
/obj/item/device/healthanalyzer = 5,/obj/item/weapon/reagent_containers/glass/beaker = 4, /obj/item/weapon/reagent_containers/dropper = 2,
/obj/item/stack/medical/advanced/bruise_pack = 6, /obj/item/stack/medical/advanced/ointment = 6, /obj/item/stack/medical/splint = 4,
products = list(/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 4,
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 4,
/obj/item/weapon/reagent_containers/glass/bottle/stoxin = 4,
/obj/item/weapon/reagent_containers/glass/bottle/toxin = 4,
/obj/item/weapon/reagent_containers/syringe/antiviral = 4,
/obj/item/weapon/reagent_containers/syringe = 12,
/obj/item/device/healthanalyzer = 5,
/obj/item/weapon/reagent_containers/glass/beaker = 4,
/obj/item/weapon/reagent_containers/dropper = 2,
/obj/item/stack/medical/advanced/bruise_pack = 6,
/obj/item/stack/medical/advanced/ointment = 6,
/obj/item/stack/medical/splint = 4,
/obj/item/weapon/storage/pill_bottle/carbon = 2)
contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3,/obj/item/weapon/reagent_containers/pill/stox = 4,/obj/item/weapon/reagent_containers/pill/antitox = 6)
contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3,
/obj/item/weapon/reagent_containers/pill/stox = 4,
/obj/item/weapon/reagent_containers/pill/antitox = 6)
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
req_log_access = access_cmo
has_logs = 1
@@ -248,20 +379,31 @@
/obj/machinery/vending/phoronresearch
name = "Toximate 3000"
desc = "All the fine parts you need in one vending machine!"
products = list(/obj/item/clothing/under/rank/scientist = 6,/obj/item/clothing/suit/bio_suit = 6,/obj/item/clothing/head/bio_hood = 6,
/obj/item/device/transfer_valve = 6,/obj/item/device/assembly/timer = 6,/obj/item/device/assembly/signaler = 6,
/obj/item/device/assembly/prox_sensor = 6,/obj/item/device/assembly/igniter = 6)
products = list(/obj/item/clothing/under/rank/scientist = 6,
/obj/item/clothing/suit/bio_suit = 6,
/obj/item/clothing/head/bio_hood = 6,
/obj/item/device/transfer_valve = 6,
/obj/item/device/assembly/timer = 6,
/obj/item/device/assembly/signaler = 6,
/obj/item/device/assembly/prox_sensor = 6,
/obj/item/device/assembly/igniter = 6)
req_log_access = access_rd
has_logs = 1
/obj/machinery/vending/wallmed1
name = "NanoMed"
desc = "A wall-mounted version of the NanoMed."
description_fluff = "NanoMed is NanoTrasen's medical science division, and provides almost all of the modern medbay essentials in-house at no extra charge. By using this vending machine, employees accept liability for products that may or may not be temporarily replaced by placebos or experimental treatments."
product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?"
icon_state = "wallmed"
density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude
products = list(/obj/item/stack/medical/bruise_pack = 2,/obj/item/stack/medical/ointment = 2,/obj/item/weapon/reagent_containers/hypospray/autoinjector = 4,/obj/item/device/healthanalyzer = 1)
contraband = list(/obj/item/weapon/reagent_containers/syringe/antitoxin = 4,/obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/pill/tox = 1)
products = list(/obj/item/stack/medical/bruise_pack = 2,
/obj/item/stack/medical/ointment = 2,
/obj/item/weapon/reagent_containers/hypospray/autoinjector = 4,
/obj/item/device/healthanalyzer = 1)
contraband = list(/obj/item/weapon/reagent_containers/syringe/antitoxin = 4,
/obj/item/weapon/reagent_containers/syringe/antiviral = 4,
/obj/item/weapon/reagent_containers/pill/tox = 1)
req_log_access = access_cmo
has_logs = 1
can_rotate = 0
@@ -269,10 +411,14 @@
/obj/machinery/vending/wallmed2
name = "NanoMed"
desc = "A wall-mounted version of the NanoMed, containing only vital first aid equipment."
description_fluff = "NanoMed is NanoTrasen's medical science division, and provides almost all of the modern medbay essentials in-house at no extra charge. By using this vending machine, employees accept liability for products that may or may not be temporarily replaced by placebos or experimental treatments."
icon_state = "wallmed"
density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude
products = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector = 5,/obj/item/weapon/reagent_containers/syringe/antitoxin = 3,/obj/item/stack/medical/bruise_pack = 3,
/obj/item/stack/medical/ointment =3,/obj/item/device/healthanalyzer = 3)
products = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector = 5,
/obj/item/weapon/reagent_containers/syringe/antitoxin = 3,
/obj/item/stack/medical/bruise_pack = 3,
/obj/item/stack/medical/ointment =3,
/obj/item/device/healthanalyzer = 3)
contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3)
req_log_access = access_cmo
has_logs = 1
@@ -281,24 +427,35 @@
/obj/machinery/vending/security
name = "SecTech"
desc = "A security equipment vendor."
description_fluff = "Security vending is kindly provided by the Lawson Arms company, Hephaestus Industries' law enforcement division."
product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"
icon_state = "sec"
req_access = list(access_security)
products = list(/obj/item/weapon/handcuffs = 8,/obj/item/weapon/grenade/flashbang = 4,/obj/item/device/flash = 5,
/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 12,/obj/item/weapon/storage/box/evidence = 6)
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/weapon/storage/box/donut = 2)
products = list(/obj/item/weapon/handcuffs = 8,
/obj/item/weapon/grenade/flashbang = 4,
/obj/item/device/flash = 5,
/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 12,
/obj/item/weapon/storage/box/evidence = 6)
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,
/obj/item/weapon/storage/box/donut = 2)
req_log_access = access_armory
has_logs = 1
/obj/machinery/vending/hydronutrients
name = "NutriMax"
desc = "A plant nutrients vendor."
desc = "A plant nutrients vendor by the NanoPastures company."
product_slogans = "Aren't you glad you don't have to fertilize the natural way?;Now with 50% less stink!;Plants are people too!"
product_ads = "We like plants!;Don't you want some?;The greenest thumbs ever.;We like big plants.;Soft soil..."
icon_state = "nutri_generic"
products = list(/obj/item/weapon/reagent_containers/glass/bottle/eznutrient = 6,/obj/item/weapon/reagent_containers/glass/bottle/left4zed = 4,/obj/item/weapon/reagent_containers/glass/bottle/robustharvest = 3,/obj/item/weapon/plantspray/pests = 20,
/obj/item/weapon/reagent_containers/syringe = 5,/obj/item/weapon/reagent_containers/glass/beaker = 4,/obj/item/weapon/storage/bag/plants = 5)
premium = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5)
products = list(/obj/item/weapon/reagent_containers/glass/bottle/eznutrient = 6,
/obj/item/weapon/reagent_containers/glass/bottle/left4zed = 4,
/obj/item/weapon/reagent_containers/glass/bottle/robustharvest = 3,
/obj/item/weapon/plantspray/pests = 20,
/obj/item/weapon/reagent_containers/syringe = 5,
/obj/item/weapon/reagent_containers/glass/beaker = 4,
/obj/item/weapon/storage/bag/plants = 5)
premium = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,
/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5)
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
@@ -309,14 +466,48 @@
product_ads = "We like plants!;Grow some crops!;Grow, baby, growww!;Aw h'yeah son!"
icon_state = "seeds_generic"
products = list(/obj/item/seeds/bananaseed = 3,/obj/item/seeds/berryseed = 3,/obj/item/seeds/carrotseed = 3,/obj/item/seeds/chantermycelium = 3,/obj/item/seeds/chiliseed = 3,
/obj/item/seeds/cornseed = 3, /obj/item/seeds/eggplantseed = 3, /obj/item/seeds/potatoseed = 3, /obj/item/seeds/replicapod = 3,/obj/item/seeds/soyaseed = 3,
/obj/item/seeds/sunflowerseed = 3,/obj/item/seeds/tomatoseed = 3,/obj/item/seeds/towermycelium = 3,/obj/item/seeds/wheatseed = 3,/obj/item/seeds/appleseed = 3,
/obj/item/seeds/poppyseed = 3,/obj/item/seeds/sugarcaneseed = 3,/obj/item/seeds/ambrosiavulgarisseed = 3,/obj/item/seeds/peanutseed = 3,/obj/item/seeds/whitebeetseed = 3,/obj/item/seeds/watermelonseed = 3,/obj/item/seeds/lavenderseed = 3,/obj/item/seeds/limeseed = 3,
/obj/item/seeds/lemonseed = 3,/obj/item/seeds/orangeseed = 3,/obj/item/seeds/grassseed = 3,/obj/item/seeds/cocoapodseed = 3,/obj/item/seeds/plumpmycelium = 2,
/obj/item/seeds/cabbageseed = 3,/obj/item/seeds/grapeseed = 3,/obj/item/seeds/pumpkinseed = 3,/obj/item/seeds/cherryseed = 3,/obj/item/seeds/plastiseed = 3,/obj/item/seeds/riceseed = 3)
contraband = list(/obj/item/seeds/amanitamycelium = 2,/obj/item/seeds/glowshroom = 2,/obj/item/seeds/libertymycelium = 2,/obj/item/seeds/mtearseed = 2,
/obj/item/seeds/nettleseed = 2,/obj/item/seeds/reishimycelium = 2,/obj/item/seeds/reishimycelium = 2,/obj/item/seeds/shandseed = 2,)
products = list(/obj/item/seeds/bananaseed = 3,
/obj/item/seeds/berryseed = 3,
/obj/item/seeds/carrotseed = 3,
/obj/item/seeds/chantermycelium = 3,
/obj/item/seeds/chiliseed = 3,
/obj/item/seeds/cornseed = 3,
/obj/item/seeds/eggplantseed = 3,
/obj/item/seeds/potatoseed = 3,
/obj/item/seeds/replicapod = 3,
/obj/item/seeds/soyaseed = 3,
/obj/item/seeds/sunflowerseed = 3,
/obj/item/seeds/tomatoseed = 3,
/obj/item/seeds/towermycelium = 3,
/obj/item/seeds/wheatseed = 3,
/obj/item/seeds/appleseed = 3,
/obj/item/seeds/poppyseed = 3,
/obj/item/seeds/sugarcaneseed = 3,
/obj/item/seeds/ambrosiavulgarisseed = 3,
/obj/item/seeds/peanutseed = 3,
/obj/item/seeds/whitebeetseed = 3,
/obj/item/seeds/watermelonseed = 3,
/obj/item/seeds/lavenderseed = 3,
/obj/item/seeds/limeseed = 3,
/obj/item/seeds/lemonseed = 3,
/obj/item/seeds/orangeseed = 3,
/obj/item/seeds/grassseed = 3,
/obj/item/seeds/cocoapodseed = 3,
/obj/item/seeds/plumpmycelium = 2,
/obj/item/seeds/cabbageseed = 3,
/obj/item/seeds/grapeseed = 3,
/obj/item/seeds/pumpkinseed = 3,
/obj/item/seeds/cherryseed = 3,
/obj/item/seeds/plastiseed = 3,
/obj/item/seeds/riceseed = 3)
contraband = list(/obj/item/seeds/amanitamycelium = 2,
/obj/item/seeds/glowshroom = 2,
/obj/item/seeds/libertymycelium = 2,
/obj/item/seeds/mtearseed = 2,
/obj/item/seeds/nettleseed = 2,
/obj/item/seeds/reishimycelium = 2,
/obj/item/seeds/reishimycelium = 2,
/obj/item/seeds/shandseed = 2,)
premium = list(/obj/item/weapon/reagent_containers/spray/waterflower = 1)
/**
@@ -357,7 +548,7 @@
/obj/machinery/vending/dinnerware
name = "Dinnerware"
desc = "A kitchen and restaurant equipment vendor."
desc = "A WT Galaksi brand kitchen and restaurant equipment vendor."
product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..."
icon_state = "dinnerware"
products = list(
@@ -403,11 +594,21 @@
desc = "Tools for tools."
icon_state = "tool"
//req_access = list(access_maint_tunnels) //Maintenance access
products = list(/obj/item/stack/cable_coil/random = 10,/obj/item/weapon/tool/crowbar = 5,/obj/item/weapon/weldingtool = 3,/obj/item/weapon/tool/wirecutters = 5,
/obj/item/weapon/tool/wrench = 5,/obj/item/device/analyzer = 5,/obj/item/device/t_scanner = 5,/obj/item/weapon/tool/screwdriver = 5,
/obj/item/device/flashlight/glowstick = 3, /obj/item/device/flashlight/glowstick/red = 3, /obj/item/device/flashlight/glowstick/blue = 3,
/obj/item/device/flashlight/glowstick/orange =3, /obj/item/device/flashlight/glowstick/yellow = 3)
contraband = list(/obj/item/weapon/weldingtool/hugetank = 2,/obj/item/clothing/gloves/fyellow = 2,)
products = list(/obj/item/stack/cable_coil/random = 10,
/obj/item/weapon/tool/crowbar = 5,
/obj/item/weapon/weldingtool = 3,
/obj/item/weapon/tool/wirecutters = 5,
/obj/item/weapon/tool/wrench = 5,
/obj/item/device/analyzer = 5,
/obj/item/device/t_scanner = 5,
/obj/item/weapon/tool/screwdriver = 5,
/obj/item/device/flashlight/glowstick = 3,
/obj/item/device/flashlight/glowstick/red = 3,
/obj/item/device/flashlight/glowstick/blue = 3,
/obj/item/device/flashlight/glowstick/orange =3,
/obj/item/device/flashlight/glowstick/yellow = 3)
contraband = list(/obj/item/weapon/weldingtool/hugetank = 2,
/obj/item/clothing/gloves/fyellow = 2)
premium = list(/obj/item/clothing/gloves/yellow = 1)
req_log_access = access_ce
has_logs = 1
@@ -417,16 +618,35 @@
desc = "Spare tool vending. What? Did you expect some witty description?"
icon_state = "engivend"
req_access = list(access_engine_equip)
products = list(/obj/item/device/geiger = 4,/obj/item/clothing/glasses/meson = 2,/obj/item/device/multitool = 4,/obj/item/weapon/cell/high = 10,
/obj/item/weapon/airlock_electronics = 10,/obj/item/weapon/module/power_control = 10,
/obj/item/weapon/circuitboard/airalarm = 10,/obj/item/weapon/circuitboard/firealarm = 10,/obj/item/weapon/circuitboard/status_display = 2,
/obj/item/weapon/circuitboard/ai_status_display = 2,/obj/item/weapon/circuitboard/newscaster = 2,/obj/item/weapon/circuitboard/holopad = 2,
/obj/item/weapon/circuitboard/intercom = 4,/obj/item/weapon/circuitboard/security/telescreen/entertainment = 4,
/obj/item/weapon/stock_parts/motor = 2,/obj/item/weapon/stock_parts/spring = 2,/obj/item/weapon/stock_parts/gear = 2,
/obj/item/weapon/circuitboard/atm,/obj/item/weapon/circuitboard/guestpass,/obj/item/weapon/circuitboard/keycard_auth,
/obj/item/weapon/circuitboard/photocopier,/obj/item/weapon/circuitboard/fax,/obj/item/weapon/circuitboard/request,
/obj/item/weapon/circuitboard/microwave,/obj/item/weapon/circuitboard/washing,/obj/item/weapon/circuitboard/scanner_console,
/obj/item/weapon/circuitboard/sleeper_console,/obj/item/weapon/circuitboard/body_scanner,/obj/item/weapon/circuitboard/sleeper,
products = list(/obj/item/device/geiger = 4,
/obj/item/clothing/glasses/meson = 2,
/obj/item/device/multitool = 4,
/obj/item/weapon/cell/high = 10,
/obj/item/weapon/airlock_electronics = 10,
/obj/item/weapon/module/power_control = 10,
/obj/item/weapon/circuitboard/airalarm = 10,
/obj/item/weapon/circuitboard/firealarm = 10,
/obj/item/weapon/circuitboard/status_display = 2,
/obj/item/weapon/circuitboard/ai_status_display = 2,
/obj/item/weapon/circuitboard/newscaster = 2,
/obj/item/weapon/circuitboard/holopad = 2,
/obj/item/weapon/circuitboard/intercom = 4,
/obj/item/weapon/circuitboard/security/telescreen/entertainment = 4,
/obj/item/weapon/stock_parts/motor = 2,
/obj/item/weapon/stock_parts/spring = 2,
/obj/item/weapon/stock_parts/gear = 2,
/obj/item/weapon/circuitboard/atm,
/obj/item/weapon/circuitboard/guestpass,
/obj/item/weapon/circuitboard/keycard_auth,
/obj/item/weapon/circuitboard/photocopier,
/obj/item/weapon/circuitboard/fax,
/obj/item/weapon/circuitboard/request,
/obj/item/weapon/circuitboard/microwave,
/obj/item/weapon/circuitboard/washing,
/obj/item/weapon/circuitboard/scanner_console,
/obj/item/weapon/circuitboard/sleeper_console,
/obj/item/weapon/circuitboard/body_scanner,
/obj/item/weapon/circuitboard/sleeper,
/obj/item/weapon/circuitboard/dna_analyzer)
contraband = list(/obj/item/weapon/cell/potato = 3)
premium = list(/obj/item/weapon/storage/belt/utility = 3)
@@ -439,15 +659,30 @@
desc = "Everything you need for do-it-yourself station repair."
icon_state = "engi"
req_access = list(access_engine_equip)
products = list(/obj/item/clothing/under/rank/chief_engineer = 4,/obj/item/clothing/under/rank/engineer = 4,/obj/item/clothing/shoes/orange = 4,/obj/item/clothing/head/hardhat = 4,
/obj/item/weapon/storage/belt/utility = 4,/obj/item/clothing/glasses/meson = 4,/obj/item/clothing/gloves/yellow = 4, /obj/item/weapon/tool/screwdriver = 12,
/obj/item/weapon/tool/crowbar = 12,/obj/item/weapon/tool/wirecutters = 12,/obj/item/device/multitool = 12,/obj/item/weapon/tool/wrench = 12,/obj/item/device/t_scanner = 12,
/obj/item/stack/cable_coil/heavyduty = 8, /obj/item/weapon/cell = 8, /obj/item/weapon/weldingtool = 8,/obj/item/clothing/head/welding = 8,
/obj/item/weapon/light/tube = 10,/obj/item/clothing/suit/fire = 4, /obj/item/weapon/stock_parts/scanning_module = 5,/obj/item/weapon/stock_parts/micro_laser = 5,
/obj/item/weapon/stock_parts/matter_bin = 5,/obj/item/weapon/stock_parts/manipulator = 5,/obj/item/weapon/stock_parts/console_screen = 5)
// There was an incorrect entry (cablecoil/power). I improvised to cablecoil/heavyduty.
// Another invalid entry, /obj/item/weapon/circuitry. I don't even know what that would translate to, removed it.
// The original products list wasn't finished. The ones without given quantities became quantity 5. -Sayu
products = list(/obj/item/clothing/under/rank/chief_engineer = 4,
/obj/item/clothing/under/rank/engineer = 4,
/obj/item/clothing/shoes/orange = 4,
/obj/item/clothing/head/hardhat = 4,
/obj/item/weapon/storage/belt/utility = 4,
/obj/item/clothing/glasses/meson = 4,
/obj/item/clothing/gloves/yellow = 4,
/obj/item/weapon/tool/screwdriver = 12,
/obj/item/weapon/tool/crowbar = 12,
/obj/item/weapon/tool/wirecutters = 12,
/obj/item/device/multitool = 12,
/obj/item/weapon/tool/wrench = 12,
/obj/item/device/t_scanner = 12,
/obj/item/stack/cable_coil/heavyduty = 8,
/obj/item/weapon/cell = 8,
/obj/item/weapon/weldingtool = 8,
/obj/item/clothing/head/welding = 8,
/obj/item/weapon/light/tube = 10,
/obj/item/clothing/suit/fire = 4,
/obj/item/weapon/stock_parts/scanning_module = 5,
/obj/item/weapon/stock_parts/micro_laser = 5,
/obj/item/weapon/stock_parts/matter_bin = 5,
/obj/item/weapon/stock_parts/manipulator = 5,
/obj/item/weapon/stock_parts/console_screen = 5)
req_log_access = access_ce
has_logs = 1
@@ -456,17 +691,27 @@
desc = "All the tools you need to create your own robot army."
icon_state = "robotics"
req_access = list(access_robotics)
products = list(/obj/item/clothing/suit/storage/toggle/labcoat = 4,/obj/item/clothing/under/rank/roboticist = 4,/obj/item/stack/cable_coil = 4,/obj/item/device/flash = 4,
/obj/item/weapon/cell/high = 12, /obj/item/device/assembly/prox_sensor = 3,/obj/item/device/assembly/signaler = 3,/obj/item/device/healthanalyzer = 3,
/obj/item/weapon/surgical/scalpel = 2,/obj/item/weapon/surgical/circular_saw = 2,/obj/item/weapon/tank/anesthetic = 2,/obj/item/clothing/mask/breath/medical = 5,
/obj/item/weapon/tool/screwdriver = 5,/obj/item/weapon/tool/crowbar = 5)
//everything after the power cell had no amounts, I improvised. -Sayu
products = list(/obj/item/clothing/suit/storage/toggle/labcoat = 4,
/obj/item/clothing/under/rank/roboticist = 4,
/obj/item/stack/cable_coil = 4,
/obj/item/device/flash = 4,
/obj/item/weapon/cell/high = 12,
/obj/item/device/assembly/prox_sensor = 3,
/obj/item/device/assembly/signaler = 3,
/obj/item/device/healthanalyzer = 3,
/obj/item/weapon/surgical/scalpel = 2,
/obj/item/weapon/surgical/circular_saw = 2,
/obj/item/weapon/tank/anesthetic = 2,
/obj/item/clothing/mask/breath/medical = 5,
/obj/item/weapon/tool/screwdriver = 5,
/obj/item/weapon/tool/crowbar = 5)
req_log_access = access_rd
has_logs = 1
/obj/machinery/vending/giftvendor
name = "AlliCo Baubles and Confectionaries"
desc = "For that special someone!"
description_fluff = "AlliCo Ltd. is a NanoTrasen subsidiary focused on the design and licensing of 'cute' products including toys, gifts, stationary and accessories. Their range of original characters feature in all aspects of popular culture, from snacks to animated series."
icon_state = "giftvendor"
vend_delay = 15
products = list(/obj/item/weapon/storage/fancy/heartbox = 5,

99
code/game/objects/items/trash.dm
View File

@@ -28,40 +28,60 @@
icon_state = "4no_raisins"
/obj/item/trash/candy
name = "candy"
name = "hard candy wrapper"
icon_state = "candy"
/obj/item/trash/candy/gums
name = "gummy candy bag"
icon_state = "candy_gums"
/obj/item/trash/candy/proteinbar
name = "protein bar"
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"
name = "\improper Cheesie Honkers bag"
icon_state = "cheesie_honkers"
/obj/item/trash/chips
name = "chips"
name = "chips bag"
icon_state = "chips"
/obj/item/trash/chips/bbq
name = "bbq chips bag"
icon_state = "chips_bbq"
/obj/item/trash/cookiesnack
name = "\improper Carps Ahoy! miniature cookies packet"
icon_state = "cookiesnack"
/obj/item/trash/popcorn
name = "popcorn"
name = "popcorn bag"
icon_state = "popcorn"
/obj/item/trash/tuna
name = "tuna can"
icon_state = "tuna"
/obj/item/trash/sosjerky
name = "Scaredy's Private Reserve Beef Jerky"
name = "Scaredy's Private Reserve Beef Jerky wrapper"
icon_state = "sosjerky"
/obj/item/trash/unajerky
name = "Moghes Imported Sissalik Jerky"
name = "Moghes Imported Sissalik Jerky tin"
icon_state = "unathitinred"
drop_sound = 'sound/items/drop/soda.ogg'
/obj/item/trash/syndi_cakes
name = "syndi cakes"
name = "syndi cakes box"
icon_state = "syndi_cakes"
/obj/item/trash/waffles
name = "waffles"
name = "waffles tray"
icon_state = "waffles"
/obj/item/trash/plate
@@ -73,13 +93,39 @@
icon_state = "snack_bowl"
/obj/item/trash/pistachios
name = "pistachios pack"
name = "pistachios packet"
icon_state = "pistachios_pack"
/obj/item/trash/semki
name = "semki pack"
name = "semki packet"
icon_state = "semki_pack"
/obj/item/trash/koisbar
name = "candy wrapper"
icon_state = "koisbar"
/obj/item/trash/kokobar
name = "candy wrapper"
icon_state = "kokobar"
/obj/item/trash/gumpack
name = "gum packet"
icon_state = "gum_pack"
/obj/item/trash/admints
name = "mint wrapper"
icon_state = "admint_pack"
/obj/item/trash/coffee
name = "empty cup"
icon_state = "coffee_vended"
drop_sound = 'sound/items/drop/papercup.ogg'
/obj/item/trash/ramen
name = "cup ramen"
icon_state = "ramen"
drop_sound = 'sound/items/drop/papercup.ogg'
/obj/item/trash/tray
name = "tray"
icon_state = "tray"
@@ -91,19 +137,19 @@
icon_state = "candle4"
/obj/item/trash/liquidfood
name = "\improper \"LiquidFood\" ration"
name = "\improper \"LiquidFood\" ration packet"
icon_state = "liquidfood"
/obj/item/trash/liquidprotein
name = "\improper \"LiquidProtein\" ration"
name = "\improper \"LiquidProtein\" ration packet"
icon_state = "liquidprotein"
/obj/item/trash/liquidvitamin
name = "\improper \"VitaPaste\" ration"
name = "\improper \"VitaPaste\" ration packet"
icon_state = "liquidvitamin"
/obj/item/trash/tastybread
name = "bread tube"
name = "bread tube wrapper"
icon_state = "tastybread"
// Aurora Food Port
@@ -121,7 +167,28 @@
/obj/item/trash/chipbasket
name = "empty basket"
icon_state = "chipbasket_empty"
icon_state = "chipbasket_empty"
/obj/item/trash/spitgum
name = "old gum"
desc = "A disgusting chewed up wad of gum."
icon = 'icons/obj/clothing/masks.dmi'
icon_state = "spit-gum"
drop_sound = 'sound/items/drop/flesh.ogg'
/obj/item/trash/lollibutt
name = "lollipop stick"
desc = "A lollipop stick devoid of pop."
icon = 'icons/obj/clothing/masks.dmi'
icon_state = "pop-stick"
/obj/item/trash/spitwad
name = "spit wad"
desc = "A disgusting spitwad."
icon = 'icons/obj/clothing/masks.dmi'
icon_state = "spit-chew"
drop_sound = 'sound/items/drop/flesh.ogg'
slot_flags = SLOT_EARS | SLOT_MASK
/obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
return

233
code/game/objects/items/weapons/chewables.dm Normal file
View File

@@ -0,0 +1,233 @@
/obj/item/clothing/mask/chewable
name = "chewable item master"
desc = "If you are seeing this, ahelp it."
icon = 'icons/obj/clothing/masks.dmi'
drop_sound = 'sound/items/drop/food.ogg'
body_parts_covered = 0
var/type_butt = null
var/chem_volume = 0
var/chewtime = 0
var/brand
var/list/filling = list()
var/wrapped = FALSE
/obj/item/clothing/mask/chewable/attack_self(mob/user)
if(wrapped)
wrapped = FALSE
to_chat(user, span("notice", "You unwrap \the [name]."))
playsound(src.loc, 'sound/items/drop/wrapper.ogg', 50, 1)
slot_flags = SLOT_EARS | SLOT_MASK
update_icon()
/obj/item/clothing/mask/chewable/update_icon()
cut_overlays()
if(wrapped)
add_overlay("[initial(icon_state)]_wrapper")
obj/item/clothing/mask/chewable/Initialize()
. = ..()
flags |= NOREACT // so it doesn't react until you light it
create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15
for(var/R in filling)
reagents.add_reagent(R, filling[R])
if(wrapped)
slot_flags = null
/obj/item/clothing/mask/chewable/equipped(var/mob/living/user, var/slot)
..()
if(slot == slot_wear_mask)
var/mob/living/carbon/human/C = user
if(C.check_has_mouth())
START_PROCESSING(SSprocessing, src)
else
to_chat(user, span("notice", "You don't have a mouth, and can't make much use of \the [src]."))
/obj/item/clothing/mask/chewable/dropped()
STOP_PROCESSING(SSprocessing, src)
..()
obj/item/clothing/mask/chewable/Destroy()
. = ..()
STOP_PROCESSING(SSprocessing, src)
/obj/item/clothing/mask/chewable/proc/chew()
chewtime--
if(reagents && reagents.total_volume)
if(ishuman(loc))
var/mob/living/carbon/human/C = loc
if (src == C.wear_mask && C.check_has_mouth())
reagents.trans_to_mob(C, REM, CHEM_INGEST, 0.2)
else
STOP_PROCESSING(SSprocessing, src)
/obj/item/clothing/mask/chewable/process()
chew()
if(chewtime < 1)
spitout()
/obj/item/clothing/mask/chewable/tobacco
name = "wad"
desc = "A chewy wad of tobacco. Cut in long strands and treated with syrup so it doesn't taste like an ash-tray when you stuff it into your face."
throw_speed = 0.5
icon_state = "chew"
type_butt = /obj/item/trash/spitwad
w_class = 1
slot_flags = SLOT_EARS | SLOT_MASK
chem_volume = 50
chewtime = 300
brand = "tobacco"
/obj/item/clothing/mask/chewable/proc/spitout(var/transfer_color = 1, var/no_message = 0)
if(type_butt)
var/obj/item/butt = new type_butt(src.loc)
transfer_fingerprints_to(butt)
if(transfer_color)
butt.color = color
if(brand)
butt.desc += " This one is \a [brand]."
if(ismob(loc))
var/mob/living/M = loc
if(!no_message)
to_chat(M, SPAN_NOTICE("The [name] runs out of flavor."))
if(M.wear_mask)
M.remove_from_mob(src) //un-equip it so the overlays can update
M.update_inv_wear_mask(0)
if(!M.equip_to_slot_if_possible(butt, slot_wear_mask))
M.update_inv_l_hand(0)
M.update_inv_r_hand(1)
M.put_in_hands(butt)
STOP_PROCESSING(SSprocessing, src)
qdel(src)
/obj/item/clothing/mask/chewable/tobacco/cheap
name = "chewing tobacco"
desc = "A chewy wad of tobacco. Cut in long strands and treated with syrup so it tastes less like an ash-tray when you stuff it into your face."
filling = list("nicotine" = 2)
/obj/item/clothing/mask/chewable/tobacco/fine
name = "deluxe chewing tobacco"
desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrup so it doesn't taste like an ash-tray when you stuff it into your face."
filling = list("nicotine" = 3)
/obj/item/clothing/mask/chewable/tobacco/nico
name = "nicotine gum"
desc = "A chewy wad of synthetic rubber, laced with nicotine. Possibly the least disgusting method of nicotine delivery."
icon_state = "nic_gum"
type_butt = /obj/item/trash/spitgum
wrapped = TRUE
/obj/item/clothing/mask/chewable/tobacco/nico/Initialize()
. = ..()
reagents.add_reagent("nicotine", 2)
color = reagents.get_color()
/obj/item/weapon/storage/chewables
name = "box of chewing wads master"
desc = "A generic brand of Waffle Co Wads, unflavored chews. Why do these exist?"
icon = 'icons/obj/cigarettes.dmi'
icon_state = "cigpacket"
item_state = "cigpacket"
drop_sound = 'sound/items/drop/shovel.ogg'
use_sound = 'sound/items/storage/pillbottle.ogg'
w_class = 2
throwforce = 2
slot_flags = SLOT_BELT
starts_with = list(/obj/item/clothing/mask/chewable/tobacco = 6)
make_exact_fit()
//Tobacco Tins
/obj/item/weapon/storage/chewables/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"
starts_with = list(/obj/item/clothing/mask/chewable/tobacco/cheap = 6)
storage_slots = 6
/obj/item/weapon/storage/chewables/tobacco/fine
name = "tin of Suamalie chewing tobacco"
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 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"
starts_with = list(/obj/item/clothing/mask/chewable/tobacco/nico = 6)
storage_slots = 6
drop_sound = 'sound/items/drop/box.ogg'
use_sound = 'sound/items/storage/box.ogg'
/obj/item/weapon/storage/box/fancy/chewables/tobacco/update_icon()
icon_state = "[initial(icon_state)][contents.len]"
/obj/item/clothing/mask/chewable/candy
name = "wad"
desc = "A chewy wad of wadding material."
throw_speed = 0.5
icon_state = "chew"
type_butt = /obj/item/trash/spitgum
w_class = 1
slot_flags = SLOT_EARS | SLOT_MASK
chem_volume = 50
chewtime = 300
filling = list("sugar" = 2)
/obj/item/clothing/mask/chewable/candy/gum
name = "chewing gum"
desc = "A chewy wad of fine synthetic rubber and artificial flavoring. Be sure to unwrap it, genius."
icon_state = "gum"
item_state = "gum"
wrapped = TRUE
/obj/item/clothing/mask/chewable/candy/gum/Initialize()
. = ..()
reagents.add_reagent(pick("banana","berryjuice","grapejuice","lemonjuice","limejuice","orangejuice","watermelonjuice"),10)
color = reagents.get_color()
update_icon()
/obj/item/weapon/storage/box/gum
name = "\improper Frooty-Choos flavored gum"
desc = "A small pack of chewing gum in various flavors."
description_fluff = "Frooty-Choos is NanoTrasen's top-selling brand of artificially flavoured fruit-adjacent non-swallowable chew-product. This extremely specific definition places sales figures safely away from competing 'gum' brands."
icon = 'icons/obj/food_snacks.dmi'
icon_state = "gum_pack"
item_state = "candy"
slot_flags = SLOT_EARS
w_class = 1
starts_with = list(/obj/item/clothing/mask/chewable/candy/gum = 5)
can_hold = list(/obj/item/clothing/mask/chewable/candy/gum,
/obj/item/trash/spitgum)
use_sound = 'sound/items/drop/paper.ogg'
drop_sound = 'sound/items/drop/wrapper.ogg'
max_storage_space = 5
foldable = null
trash = /obj/item/trash/gumpack
/obj/item/clothing/mask/chewable/candy/lolli
name = "lollipop"
desc = "A simple artificially flavored sphere of sugar on a handle, colloquially known as a sucker. Allegedly one is born every minute. Make sure to unwrap it, genius."
type_butt = /obj/item/trash/lollibutt
icon_state = "lollipop"
item_state = "lollipop"
wrapped = TRUE
/obj/item/clothing/mask/chewable/candy/lolli/process()
chew()
if(chewtime < 1)
spitout(0)
/obj/item/clothing/mask/chewable/candy/lolli/Initialize()
. = ..()
reagents.add_reagent(pick("banana","berryjuice","grapejuice","lemonjuice","limejuice","orangejuice","watermelonjuice"),20)
color = reagents.get_color()
update_icon()

3
code/game/objects/items/weapons/cigs_lighters.dm
View File

@@ -488,6 +488,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"
@@ -513,6 +514,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"
@@ -527,6 +529,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"

5
code/game/objects/items/weapons/ecigs.dm
View File

@@ -1,6 +1,6 @@
/obj/item/clothing/mask/smokable/ecig
name = "electronic cigarette"
desc = "Device with modern approach to smoking."
desc = "For the modern approach to smoking."
icon = 'icons/obj/ecig.dmi'
var/active = 0
//var/obj/item/weapon/cell/ec_cell = /obj/item/weapon/cell/device
@@ -24,6 +24,7 @@
/obj/item/clothing/mask/smokable/ecig/simple
name = "simple electronic cigarette"
desc = "A cheap Lucky 1337 electronic cigarette, styled like a traditional cigarette."
description_fluff = "Produced by the Ward-Takahashi Corporation on behalf of the Lucky Stars cigarette brand, the 1337 is the e-cig of choice for teenage wastrels across the core worlds. Due to a total lack of safety features, this model is banned on most interstellar flights."
icon_state = "ccigoff"
icon_off = "ccigoff"
icon_empty = "ccigoff"
@@ -32,6 +33,7 @@
/obj/item/clothing/mask/smokable/ecig/util
name = "electronic cigarette"
desc = "A popular utilitarian model electronic cigarette, the ONI-55. Comes in a variety of colors."
description_fluff = "Ward-Takahashi's flagship brand of e-cig is a popular fashion accessory in certain circles where open flames are prohibited. Custom casings are sold for almost as much as the device itself, and are practically impossible to DIY."
icon_state = "ecigoff1"
icon_off = "ecigoff1"
icon_empty = "ecigoff1"
@@ -43,6 +45,7 @@
/obj/item/clothing/mask/smokable/ecig/deluxe
name = "deluxe electronic cigarette"
desc = "A premium model eGavana MK3 electronic cigarette, shaped like a cigar."
description_fluff = "The eGavana is a product of Morpheus Cyberkinetics, and comes standard with additional jacks that allow cyborgs and positronics to experience a simulation of soothing artificial oil residues entering their lungs. It's a pretty good cig for meatbags, too."
icon_state = "pcigoff1"
icon_off = "pcigoff1"
icon_empty = "pcigoff2"

50
code/game/objects/items/weapons/storage/boxes.dm
View File

@@ -26,6 +26,7 @@
item_state = "syringe_kit"
center_of_mass = list("x" = 13,"y" = 10)
var/foldable = /obj/item/stack/material/cardboard // BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard
var/trash = null // if set, can be crushed into a trash item when empty
max_w_class = ITEMSIZE_SMALL
max_storage_space = INVENTORY_BOX_SPACE
use_sound = 'sound/items/storage/box.ogg'
@@ -35,26 +36,37 @@
/obj/item/weapon/storage/box/attack_self(mob/user as mob)
if(..()) return
//try to fold it.
if ( contents.len )
return
//try to fold it
if(ispath(foldable))
if (contents.len)
return
var/found = 0
// Close any open UI windows first
for(var/mob/M in range(1))
if (M.s_active == src)
close(M)
if (M == user)
found = 1
if (!found) // User is too far away
return
// Now make the cardboard
to_chat(user, "<span class='notice'>You fold [src] flat.</span>")
playsound(src, 'sound/items/storage/boxfold.ogg', 30, 1)
new foldable(get_turf(src))
qdel(src)
//try to crush it
if(ispath(trash))
if(contents.len && user.a_intent == I_HURT) // only crumple with things inside on harmintent.
user.visible_message(SPAN_DANGER("You crush \the [src], spilling its contents everywhere!"), SPAN_DANGER("[user] crushes \the [src], spilling its contents everywhere!"))
spill()
else
to_chat(user, SPAN_NOTICE("You crumple up \the [src].")) //make trash
playsound(src.loc, 'sound/items/drop/wrapper.ogg', 30, 1)
var/obj/item/trash = new src.trash()
qdel(src)
user.put_in_hands(trash)
if ( !ispath(foldable) )
return
var/found = 0
// Close any open UI windows first
for(var/mob/M in range(1))
if (M.s_active == src)
close(M)
if ( M == user )
found = 1
if ( !found ) // User is too far away
return
// Now make the cardboard
to_chat(user, "<span class='notice'>You fold [src] flat.</span>")
playsound(src, 'sound/items/storage/boxfold.ogg', 30, 1)
new foldable(get_turf(src))
qdel(src)
/obj/item/weapon/storage/box/survival
name = "emergency supply box"

21
code/game/objects/items/weapons/storage/fancy.dm
View File

@@ -265,14 +265,16 @@
/obj/item/weapon/storage/fancy/cigarettes/dromedaryco
name = "\improper DromedaryCo packet"
desc = "A packet of six imported DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\""
desc = "A packet of six Earth-export DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\""
description_fluff = "DromedaryCo is one of Sol's oldest cigarette brands, and takes pride in having sourced tobcacco from the same Indian plantations since 2044. Popular with those willing to pay extra for a little nostalgia."
icon_state = "Dpacket"
brand = "\improper Dromedary Co. cigarette"
/obj/item/weapon/storage/fancy/cigarettes/killthroat
name = "\improper AcmeCo packet"
desc = "A packet of six AcmeCo cigarettes. For those who somehow want to obtain the record for the most amount of cancerous tumors."
icon_state = "Bpacket"
desc = "A packet of six AcmeCo cigarettes. For those who want to obtain a record for the most cancerous tumors on a budget."
description_fluff = "Available anywhere people breathe and want to breathe less, AcmeCo is the cheapest, most widespread cigarette brand in the galaxy. They taste like trash, but when you're keeping them inside your jumpsuit on a 16 hour shift, you're probably not too concerned with flavour."
icon_state = "Apacket"
brand = "\improper Acme Co. cigarette"
// New exciting ways to kill your lungs! - Earthcrusher //
@@ -280,36 +282,41 @@
/obj/item/weapon/storage/fancy/cigarettes/luckystars
name = "\improper pack of Lucky Stars"
desc = "A mellow blend made from synthetic, pod-grown tobacco. The commercial jingle is guaranteed to get stuck in your head."
description_fluff = "Lucky Stars are some of the most prolific advertisers in the business, with Gilthari Exports plastering the name and slogan on everything from workplace safety videos to racing bikes. 'Feel the gentle warmth of your Lucky Star'."
icon_state = "LSpacket"
brand = "\improper Lucky Star"
/obj/item/weapon/storage/fancy/cigarettes/jerichos
name = "\improper pack of Jerichos"
desc = "Typically seen dangling from the lips of Martian soldiers and border world hustlers. Tastes like hickory smoke, feels like warm liquid death down your lungs."
desc = "Typically seen dangling from the lips of Fleet veterans and border world hustlers. Tastes like hickory smoke, feels like warm liquid death down your lungs."
description_fluff = "The Jericho brand has carefully cultivated its 'rugged' image ever since its completely accidental association with the SolGov-Hegemony war due to their sizable corporate presence in the region. Prior to the war, Jerichos were considered the realm of drunks and sad divorcees."
icon_state = "Jpacket"
brand = "\improper Jericho"
/obj/item/weapon/storage/fancy/cigarettes/menthols
name = "\improper pack of Temperamento Menthols"
desc = "With a sharp and natural organic menthol flavor, these Temperamentos are a favorite of NDV crews. Hardly anyone knows they make 'em in non-menthol!"
desc = "With a sharp and natural organic menthol flavor, these Temperamentos are a favorite of science vessel crews. Hardly anyone knows they make 'em in non-menthol!"
description_fluff = "Temperamento Menthols are a product of the Aether Atmospherics and Recycling company, and the 'smooth' menthol taste is rumoured to be the chemical by-product of some far more profitable industrial synthesis."
icon_state = "TMpacket"
brand = "\improper Temperamento Menthol"
/obj/item/weapon/storage/fancy/cigarettes/carcinomas
name = "\improper pack of Carcinoma Angels"
desc = "This unknown brand was slated for the chopping block, until they were publicly endorsed by an old Earthling gonzo journalist. The rest is history. They sell a variety for cats, too."
icon_state = "CApacket"
desc = "This previously unknown brand was slated for the chopping block, until they were publicly endorsed by an old Earthling gonzo journalist. The rest is history. They sell a variety for cats, too."
description_fluff = "The bitter taste of a Carcinoma Angel is considered desirable by many equally bitter wash-ups who consider themselves to be 'hard-boiled'. The smell is practically inseparable from urban security offices, and old men with exonet radio shows."
brand = "\improper Carcinoma Angel"
/obj/item/weapon/storage/fancy/cigarettes/professionals
name = "\improper pack of Professional 120s"
desc = "Let's face it - if you're smoking these, you're either trying to look upper-class or you're 80 years old. That's the only excuse. They are, however, very good quality."
description_fluff = "Grown and rolled in a meticulously maintained biosphere orbitting Love, P120 tobacco is marketed as 'probably the best in the galaxy'. The premium price point, and the fact that the vast majority of consumers couldn't really tell the difference between this and the next leading brand."
icon_state = "P100packet"
brand = "\improper Professional 120"
/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

8
code/game/objects/structures/crates_lockers/crates.dm
View File

@@ -401,8 +401,8 @@
desc = "A crate emblazoned with the NanoThreads Garments livery, a subsidary of the NanoTrasen Corporation."
closet_appearance = /decl/closet_appearance/crate/nanotrasenclothing
/obj/structure/closet/crate/nanocare
desc = "A crate emblazoned with the NanoCare Medical livery, a subsidary of the NanoTrasen Corporation."
/obj/structure/closet/crate/nanomed
desc = "A crate emblazoned with the NanoMed Medical livery, a subsidary of the NanoTrasen Corporation."
closet_appearance = /decl/closet_appearance/crate/nanotrasenmedical
/obj/structure/closet/crate/oculum
@@ -516,8 +516,8 @@
desc = "A secure crate emblazoned with the standard NanoTrasen livery."
closet_appearance = /decl/closet_appearance/crate/secure/nanotrasen
/obj/structure/closet/crate/secure/nanocare
desc = "A secure crate emblazoned with the NanoCare Medical livery, a subsidary of the NanoTrasen Corporation."
/obj/structure/closet/crate/secure/nanomed
desc = "A secure crate emblazoned with the NanoMed Medical livery, a subsidary of the NanoTrasen Corporation."
closet_appearance = /decl/closet_appearance/crate/secure/nanotrasenmedical
/obj/structure/closet/crate/secure/scg

3
code/game/objects/structures/loot_piles.dm
View File

@@ -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,
@@ -239,6 +241,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/trash/sosjerky,
/obj/item/trash/syndi_cakes,
/obj/item/trash/tastybread,
/obj/item/trash/coffee,
/obj/item/trash/tray,
/obj/item/trash/unajerky,
/obj/item/trash/waffles,

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)

89
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()
. = ..()
@@ -193,21 +219,70 @@
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/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."
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 +294,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()
. = ..()

43
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)
@@ -233,7 +233,7 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla
name = "Caccavo Guaranteed Quality Tequilla"
desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!"
icon_state = "tequillabottle"
icon_state = "tequilabottle"
center_of_mass = list("x"=16, "y"=3)
/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla/Initialize()
@@ -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

@@ -307,8 +307,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"
@@ -322,8 +324,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
@@ -335,6 +339,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."
@@ -362,8 +381,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"
@@ -375,6 +396,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!!!"
@@ -388,6 +423,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/fruitbar
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."
@@ -583,6 +649,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!"
@@ -1375,8 +1645,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)
@@ -1388,8 +1660,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)
@@ -1401,9 +1675,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)
@@ -1414,8 +1690,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)
@@ -1428,8 +1706,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
@@ -2433,6 +2713,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 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"
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."
@@ -3813,6 +4115,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-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
filling_color = "#A66829"
@@ -3827,6 +4131,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)
@@ -3839,8 +4145,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)
@@ -4529,8 +4837,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)
@@ -4561,7 +4869,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)
@@ -6036,7 +6344,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

@@ -152,7 +152,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)
@@ -224,7 +224,7 @@
taste_description = "oil"
taste_mult = 0.1
reagent_state = LIQUID
/datum/reagent/nutriment/triglyceride/oil/peanut
name = "Peanut Oil"
id = "peanutoil"
@@ -584,7 +584,7 @@
reagent_state = LIQUID
color = "#365E30"
overdose = REAGENTS_OVERDOSE
//SYNNONO MEME FOODS EXPANSION - Credit to Synnono
/datum/reagent/spacespice
@@ -1242,6 +1242,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"
@@ -1683,7 +1709,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"
@@ -1706,6 +1732,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"
@@ -2073,6 +2119,7 @@
glass_icon = DRINK_ICON_NOISY
glass_special = list(DRINK_FIZZ)
/* Alcohol */
// Basic
@@ -2118,6 +2165,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
)

39
html/changelogs/Cerebulon - Vending.yml Normal file
View File

@@ -0,0 +1,39 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: Cerebulon
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Added extended flavour text to most things related to commercial vending machines and their contents."
- rscadd: "Added chewing gum, lollipops and chewing tobacco. Unwrap it and place it in your mask slot like a cigarette."
- rscadd: "Added snack food, vending drink and beer brand variety."
- imageadd: "New booze bottle, coffee, juice, snack and cigarette packet sprites."

BIN
icons/obj/cigarettes.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
icons/obj/clothing/masks.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
icons/obj/drinks.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 88 KiB

BIN
icons/obj/ecig.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
icons/obj/food.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 135 KiB

After

Width:  |  Height:  |  Size: 132 KiB

BIN
icons/obj/food_snacks.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
icons/obj/trash.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
sound/items/drop/papercup.ogg Normal file
View File

Binary file not shown.

2
vorestation.dme
View File

@@ -1196,10 +1196,12 @@
#include "code\game\objects\items\weapons\candle.dm"
#include "code\game\objects\items\weapons\canes.dm"
#include "code\game\objects\items\weapons\cards_ids_vr.dm"
#include "code\game\objects\items\weapons\chewables.dm"
#include "code\game\objects\items\weapons\cigs_lighters.dm"
#include "code\game\objects\items\weapons\clown_items.dm"
#include "code\game\objects\items\weapons\cosmetics.dm"
#include "code\game\objects\items\weapons\dna_injector.dm"
#include "code\game\objects\items\weapons\ecigs.dm"
#include "code\game\objects\items\weapons\explosives.dm"
#include "code\game\objects\items\weapons\explosives_vr.dm"
#include "code\game\objects\items\weapons\extinguisher.dm"