cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] [MDB IGNORE] Refactors drinks and fixes a lot of food problems [MDB IGNORE] (#15577)

Browse Source 
* [MDB IGNORE] Refactors drinks and fixes a lot of food problems

* [MDB IGNORE] Refactors drinks and fixes a lot of food problems

* forgto 2 commit

* im slowly going insane

* why does find and replace not FIND everything

* hnghnnngh

* h

* l

* a

* a

* so close...

* delta fix

* I thought I committed this already, guess not

* this PR has been the bane of my fucking life

* orange juice

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-08-25 03:17:10 +01:00
committed by GitHub
co-authored by John Willard Tom Zonespace GoldenAlpharex Jolly-66
parent d14465e9f5
commit 88c85fe1f7
369 changed files with 8902 additions and 8509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/boozeomat.dm
+42 -42
View File
@@ -5,52 +5,52 @@
icon_deny = "boozeomat-deny"
panel_type = "panel22"
products = list(
/obj/item/reagent_containers/food/drinks/drinkingglass = 30,
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 12,
/obj/item/reagent_containers/food/drinks/flask = 3,
/obj/item/reagent_containers/food/drinks/ice = 10,
/obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4,
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4,
/obj/item/reagent_containers/food/drinks/bottle/limejuice = 4,
/obj/item/reagent_containers/food/drinks/bottle/cream = 4,
/obj/item/reagent_containers/food/drinks/soda_cans/cola = 8,
/obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8,
/obj/item/reagent_containers/food/drinks/soda_cans/sodawater = 15,
/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 8,
/obj/item/reagent_containers/food/drinks/bottle/grenadine = 4,
/obj/item/reagent_containers/food/drinks/bottle/menthol = 4,
/obj/item/reagent_containers/food/drinks/bottle/ale = 6,
/obj/item/reagent_containers/food/drinks/bottle/beer = 6,
/obj/item/reagent_containers/food/drinks/bottle/maltliquor = 6,
/obj/item/reagent_containers/food/drinks/bottle/gin = 5,
/obj/item/reagent_containers/food/drinks/bottle/whiskey = 5,
/obj/item/reagent_containers/food/drinks/bottle/tequila = 5,
/obj/item/reagent_containers/food/drinks/bottle/vodka = 5,
/obj/item/reagent_containers/food/drinks/bottle/vermouth = 5,
/obj/item/reagent_containers/food/drinks/bottle/rum = 5,
/obj/item/reagent_containers/food/drinks/bottle/navy_rum = 5,
/obj/item/reagent_containers/food/drinks/bottle/wine = 5,
/obj/item/reagent_containers/food/drinks/bottle/cognac = 5,
/obj/item/reagent_containers/food/drinks/bottle/kahlua = 5,
/obj/item/reagent_containers/food/drinks/bottle/curacao = 5,
/obj/item/reagent_containers/food/drinks/bottle/hcider = 5,
/obj/item/reagent_containers/food/drinks/bottle/absinthe = 5,
/obj/item/reagent_containers/food/drinks/bottle/grappa = 5,
/obj/item/reagent_containers/food/drinks/bottle/amaretto = 5,
/obj/item/reagent_containers/food/drinks/bottle/sake = 5,
/obj/item/reagent_containers/food/drinks/bottle/applejack = 5,
/obj/item/reagent_containers/food/drinks/bottle = 15,
/obj/item/reagent_containers/food/drinks/bottle/small = 15,
/obj/item/reagent_containers/cup/glass/drinkingglass = 30,
/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass = 12,
/obj/item/reagent_containers/cup/glass/flask = 3,
/obj/item/reagent_containers/cup/glass/ice = 10,
/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice = 4,
/obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice = 4,
/obj/item/reagent_containers/cup/glass/bottle/juice/limejuice = 4,
/obj/item/reagent_containers/cup/glass/bottle/juice/cream = 4,
/obj/item/reagent_containers/cup/glass/bottle/juice/menthol = 4,
/obj/item/reagent_containers/cup/soda_cans/cola = 8,
/obj/item/reagent_containers/cup/soda_cans/tonic = 8,
/obj/item/reagent_containers/cup/soda_cans/sodawater = 15,
/obj/item/reagent_containers/cup/soda_cans/sol_dry = 8,
/obj/item/reagent_containers/cup/glass/bottle/grenadine = 4,
/obj/item/reagent_containers/cup/glass/bottle/ale = 6,
/obj/item/reagent_containers/cup/glass/bottle/beer = 6,
/obj/item/reagent_containers/cup/glass/bottle/maltliquor = 6,
/obj/item/reagent_containers/cup/glass/bottle/gin = 5,
/obj/item/reagent_containers/cup/glass/bottle/whiskey = 5,
/obj/item/reagent_containers/cup/glass/bottle/tequila = 5,
/obj/item/reagent_containers/cup/glass/bottle/vodka = 5,
/obj/item/reagent_containers/cup/glass/bottle/vermouth = 5,
/obj/item/reagent_containers/cup/glass/bottle/rum = 5,
/obj/item/reagent_containers/cup/glass/bottle/navy_rum = 5,
/obj/item/reagent_containers/cup/glass/bottle/wine = 5,
/obj/item/reagent_containers/cup/glass/bottle/cognac = 5,
/obj/item/reagent_containers/cup/glass/bottle/kahlua = 5,
/obj/item/reagent_containers/cup/glass/bottle/curacao = 5,
/obj/item/reagent_containers/cup/glass/bottle/hcider = 5,
/obj/item/reagent_containers/cup/glass/bottle/absinthe = 5,
/obj/item/reagent_containers/cup/glass/bottle/grappa = 5,
/obj/item/reagent_containers/cup/glass/bottle/amaretto = 5,
/obj/item/reagent_containers/cup/glass/bottle/sake = 5,
/obj/item/reagent_containers/cup/glass/bottle/applejack = 5,
/obj/item/reagent_containers/cup/glass/bottle = 15,
/obj/item/reagent_containers/cup/glass/bottle/small = 15,
)
contraband = list(
/obj/item/reagent_containers/food/drinks/mug/tea = 12,
/obj/item/reagent_containers/food/drinks/bottle/fernet = 5,
/obj/item/reagent_containers/cup/glass/mug/tea = 12,
/obj/item/reagent_containers/cup/glass/bottle/fernet = 5,
)
premium = list(
/obj/item/reagent_containers/glass/bottle/ethanol = 4,
/obj/item/reagent_containers/food/drinks/bottle/champagne = 5,
/obj/item/reagent_containers/food/drinks/bottle/trappist = 5,
/obj/item/reagent_containers/food/drinks/bottle/bitters = 5,
/obj/item/reagent_containers/cup/bottle/ethanol = 4,
/obj/item/reagent_containers/cup/glass/bottle/champagne = 5,
/obj/item/reagent_containers/cup/glass/bottle/trappist = 5,
/obj/item/reagent_containers/cup/glass/bottle/bitters = 5,
)
product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"
code/modules/vending/coffee.dm
+4 -4
View File
@@ -6,12 +6,12 @@
icon_vend = "coffee-vend"
panel_type = "panel9"
products = list(
/obj/item/reagent_containers/food/drinks/coffee = 6,
/obj/item/reagent_containers/food/drinks/mug/tea = 6,
/obj/item/reagent_containers/food/drinks/mug/coco = 3,
/obj/item/reagent_containers/cup/glass/coffee = 6,
/obj/item/reagent_containers/cup/glass/mug/tea = 6,
/obj/item/reagent_containers/cup/glass/mug/coco = 3,
)
contraband = list(
/obj/item/reagent_containers/food/drinks/ice = 12,
/obj/item/reagent_containers/cup/glass/ice = 12,
)
refill_canister = /obj/item/vending_refill/coffee
default_price = PAYCHECK_LOWER
code/modules/vending/cola.dm
+26 -26
View File
@@ -7,27 +7,27 @@
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/reagent_containers/food/drinks/soda_cans/cola = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10,
/obj/item/reagent_containers/food/drinks/waterbottle = 10,
/obj/item/reagent_containers/food/drinks/bottle/mushi_kombucha = 3,
/obj/item/reagent_containers/cup/soda_cans/cola = 10,
/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 10,
/obj/item/reagent_containers/cup/soda_cans/dr_gibb = 10,
/obj/item/reagent_containers/cup/soda_cans/starkist = 10,
/obj/item/reagent_containers/cup/soda_cans/space_up = 10,
/obj/item/reagent_containers/cup/soda_cans/pwr_game = 10,
/obj/item/reagent_containers/cup/soda_cans/lemon_lime = 10,
/obj/item/reagent_containers/cup/soda_cans/sol_dry = 10,
/obj/item/reagent_containers/cup/glass/waterbottle = 10,
/obj/item/reagent_containers/cup/glass/bottle/mushi_kombucha = 3,
)
contraband = list(
/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6,
/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6,
/obj/item/reagent_containers/cup/soda_cans/thirteenloko = 6,
/obj/item/reagent_containers/cup/soda_cans/shamblers = 6,
)
premium = list(
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1,
/obj/item/reagent_containers/food/drinks/soda_cans/air = 1,
/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 1,
/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1,
/obj/item/reagent_containers/food/drinks/bottle/rootbeer = 1,
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola = 1,
/obj/item/reagent_containers/cup/soda_cans/air = 1,
/obj/item/reagent_containers/cup/soda_cans/monkey_energy = 1,
/obj/item/reagent_containers/cup/soda_cans/grey_bull = 1,
/obj/item/reagent_containers/cup/glass/bottle/rootbeer = 1,
)
refill_canister = /obj/item/vending_refill/cola
default_price = PAYCHECK_CREW * 0.7
@@ -92,15 +92,15 @@
desc = "~Shake me up some of that Shambler's Juice!~"
icon_state = "shamblers_juice"
products = list(
/obj/item/reagent_containers/food/drinks/soda_cans/cola = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 10,
/obj/item/reagent_containers/cup/soda_cans/cola = 10,
/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 10,
/obj/item/reagent_containers/cup/soda_cans/dr_gibb = 10,
/obj/item/reagent_containers/cup/soda_cans/starkist = 10,
/obj/item/reagent_containers/cup/soda_cans/space_up = 10,
/obj/item/reagent_containers/cup/soda_cans/pwr_game = 10,
/obj/item/reagent_containers/cup/soda_cans/lemon_lime = 10,
/obj/item/reagent_containers/cup/soda_cans/sol_dry = 10,
/obj/item/reagent_containers/cup/soda_cans/shamblers = 10,
)
product_slogans = "~Shake me up some of that Shambler's Juice!~"
product_ads = "Refreshing!;Jyrbv dv lg jfdv fw kyrk Jyrdscvi'j Alztv!;Over 1 trillion souls drank!;Thirsty? Nyp efk uizeb kyv uribevjj?;Kyv Jyrdscvi uizebj kyv ezxyk!;Drink up!;Krjkp."
code/modules/vending/drinnerware.dm
+7 -7
View File
@@ -6,15 +6,15 @@
panel_type = "panel4"
products = list(
/obj/item/storage/bag/tray = 8,
/obj/item/reagent_containers/glass/bowl = 20,
/obj/item/reagent_containers/cup/bowl = 20,
/obj/item/kitchen/fork = 6,
/obj/item/kitchen/spoon = 6,
/obj/item/reagent_containers/food/drinks/drinkingglass = 8,
/obj/item/reagent_containers/food/condiment/pack/ketchup = 5,
/obj/item/reagent_containers/food/condiment/pack/hotsauce = 5,
/obj/item/reagent_containers/food/condiment/pack/astrotame = 5,
/obj/item/reagent_containers/food/condiment/saltshaker = 5,
/obj/item/reagent_containers/food/condiment/peppermill = 5,
/obj/item/reagent_containers/cup/glass/drinkingglass = 8,
/obj/item/reagent_containers/condiment/pack/ketchup = 5,
/obj/item/reagent_containers/condiment/pack/hotsauce = 5,
/obj/item/reagent_containers/condiment/pack/astrotame = 5,
/obj/item/reagent_containers/condiment/saltshaker = 5,
/obj/item/reagent_containers/condiment/peppermill = 5,
/obj/item/clothing/suit/apron/chef = 2,
/obj/item/kitchen/rollingpin = 2,
/obj/item/knife/kitchen = 2,
code/modules/vending/liberation.dm
+1 -1
View File
@@ -10,7 +10,7 @@
/obj/item/food/burger/plain = 5, //O say can you see, by the dawn's early light
/obj/item/food/burger/baseball = 3, //What so proudly we hailed at the twilight's last gleaming
/obj/item/food/fries = 5, //Whose broad stripes and bright stars through the perilous fight
/obj/item/reagent_containers/food/drinks/bottle/beer/light = 10, //O'er the ramparts we watched, were so gallantly streaming?
/obj/item/reagent_containers/cup/glass/bottle/beer/light = 10, //O'er the ramparts we watched, were so gallantly streaming?
/obj/item/gun/ballistic/automatic/pistol/deagle/gold = 2,
/obj/item/gun/ballistic/automatic/pistol/deagle/camo = 2,
/obj/item/gun/ballistic/automatic/pistol/m1911 = 2,
code/modules/vending/magivend.dm
+1 -1
View File
@@ -16,7 +16,7 @@
/obj/item/clothing/shoes/sandal/magic = 1,
/obj/item/staff = 2,
)
contraband = list(/obj/item/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave
contraband = list(/obj/item/reagent_containers/cup/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave
armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
default_price = 0 //Just in case, since it's primary use is storage.
code/modules/vending/medical.dm
+7 -7
View File
@@ -60,13 +60,13 @@
/obj/item/reagent_containers/pill/patch/aiuri = 5,
/obj/item/reagent_containers/syringe/convermol = 2,
/obj/item/reagent_containers/pill/insulin = 5,
/obj/item/reagent_containers/glass/bottle/multiver = 2,
/obj/item/reagent_containers/glass/bottle/syriniver = 2,
/obj/item/reagent_containers/glass/bottle/epinephrine = 3,
/obj/item/reagent_containers/glass/bottle/morphine = 4,
/obj/item/reagent_containers/glass/bottle/potass_iodide = 1,
/obj/item/reagent_containers/glass/bottle/salglu_solution = 3,
/obj/item/reagent_containers/glass/bottle/toxin = 3,
/obj/item/reagent_containers/cup/bottle/multiver = 2,
/obj/item/reagent_containers/cup/bottle/syriniver = 2,
/obj/item/reagent_containers/cup/bottle/epinephrine = 3,
/obj/item/reagent_containers/cup/bottle/morphine = 4,
/obj/item/reagent_containers/cup/bottle/potass_iodide = 1,
/obj/item/reagent_containers/cup/bottle/salglu_solution = 3,
/obj/item/reagent_containers/cup/bottle/toxin = 3,
/obj/item/reagent_containers/syringe/antiviral = 6,
/obj/item/reagent_containers/medigel/libital = 2,
/obj/item/reagent_containers/medigel/aiuri = 2,
code/modules/vending/nutrimax.dm
+5 -5
View File
@@ -10,9 +10,9 @@
products = list(
/obj/item/cultivator = 3,
/obj/item/plant_analyzer = 4,
/obj/item/reagent_containers/glass/bottle/nutrient/ez = 30,
/obj/item/reagent_containers/glass/bottle/nutrient/l4z = 20,
/obj/item/reagent_containers/glass/bottle/nutrient/rh = 10,
/obj/item/reagent_containers/cup/bottle/nutrient/ez = 30,
/obj/item/reagent_containers/cup/bottle/nutrient/l4z = 20,
/obj/item/reagent_containers/cup/bottle/nutrient/rh = 10,
/obj/item/reagent_containers/spray/pestspray = 20,
/obj/item/reagent_containers/syringe = 5,
/obj/item/secateurs = 3,
@@ -20,8 +20,8 @@
/obj/item/storage/bag/plants = 5,
)
contraband = list(
/obj/item/reagent_containers/glass/bottle/ammonia = 10,
/obj/item/reagent_containers/glass/bottle/diethylamine = 5,
/obj/item/reagent_containers/cup/bottle/ammonia = 10,
/obj/item/reagent_containers/cup/bottle/diethylamine = 5,
)
refill_canister = /obj/item/vending_refill/hydronutrients
default_price = PAYCHECK_CREW * 0.8
code/modules/vending/snack.dm
+1 -1
View File
@@ -21,7 +21,7 @@
/obj/item/food/cnds = 6,
/obj/item/food/cnds/random = 3,
/obj/item/food/semki = 6,
/obj/item/reagent_containers/food/drinks/dry_ramen = 3,
/obj/item/reagent_containers/cup/glass/dry_ramen = 3,
/obj/item/storage/box/gum = 3,
/obj/item/food/energybar = 6,
)
code/modules/vending/sovietsoda.dm
+2 -2
View File
@@ -6,10 +6,10 @@
light_mask = "soviet-light-mask"
product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem."
products = list(
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda = 30,
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/soda = 30,
)
contraband = list(
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola = 20,
/obj/item/reagent_containers/cup/glass/drinkingglass/filled/cola = 20,
)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/sovietsoda
code/modules/vending/sustenance.dm
+2 -2
View File
@@ -9,14 +9,14 @@
products = list(
/obj/item/food/tofu/prison = 24,
/obj/item/food/breadslice/moldy = 15,
/obj/item/reagent_containers/food/drinks/ice/prison = 12,
/obj/item/reagent_containers/cup/glass/ice/prison = 12,
/obj/item/food/candy_corn/prison = 6,
/obj/item/kitchen/spoon/plastic = 6,
)
contraband = list(
/obj/item/knife = 6,
/obj/item/kitchen/spoon = 6,
/obj/item/reagent_containers/food/drinks/coffee = 12,
/obj/item/reagent_containers/cup/glass/coffee = 12,
/obj/item/tank/internals/emergency_oxygen = 6,
/obj/item/clothing/mask/breath = 6,
)
code/modules/vending/wardrobes.dm
+3 -3
View File
@@ -295,7 +295,7 @@
/obj/item/clothing/suit/apron/purple_bartender = 2,
/obj/item/clothing/head/soft/black = 2,
/obj/item/clothing/shoes/sneakers/black = 2,
/obj/item/reagent_containers/glass/rag = 2,
/obj/item/reagent_containers/cup/rag = 2,
/obj/item/storage/box/beanbag = 1,
/obj/item/clothing/suit/armor/vest/alt = 1,
/obj/item/circuitboard/machine/dish_drive = 1,
@@ -334,7 +334,7 @@
/obj/item/clothing/head/chefhat = 1,
/obj/item/clothing/under/rank/civilian/cookjorts = 2,
/obj/item/clothing/shoes/cookflops = 2,
/obj/item/reagent_containers/glass/rag = 1,
/obj/item/reagent_containers/cup/rag = 1,
/obj/item/clothing/suit/hooded/wintercoat = 2,
)
refill_canister = /obj/item/vending_refill/wardrobe/chef_wardrobe
@@ -555,7 +555,7 @@
/obj/item/clothing/shoes/kim = 1,
/obj/item/clothing/gloves/kim = 1,
/obj/item/clothing/glasses/regular/kim = 1,
/obj/item/reagent_containers/food/drinks/flask/det = 2,
/obj/item/reagent_containers/cup/glass/flask/det = 2,
/obj/item/storage/fancy/cigarettes = 5,
)
premium = list(