cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 04:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update vending_machines.dm

Browse Source
This commit is contained in:
C.L
2022-09-20 22:03:10 -04:00
committed by GitHub
parent 916f0c398c
commit cf79f13719
1 changed files with 4 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/economy/vending_machines.dm
+4 -74
View File
@@ -39,26 +39,26 @@
/obj/machinery/vending/boozeomat
name = "Booze-O-Mat"
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."
<<<<<<< HEAD
icon_state = "boozeomat"
products = list(/obj/item/weapon/reagent_containers/food/drinks/glass2/square = 10,
products = list(/obj/item/reagent_containers/food/drinks/glass2/square = 10,
/obj/item/weapon/reagent_containers/food/drinks/glass2/rocks = 10,
/obj/item/weapon/reagent_containers/food/drinks/glass2/shake = 10,
/obj/item/weapon/reagent_containers/food/drinks/glass2/cocktail = 10,
/obj/item/weapon/reagent_containers/food/drinks/glass2/shot = 10,
/obj/item/weapon/reagent_containers/food/drinks/glass2/pint = 10,
/obj/item/weapon/reagent_containers/food/drinks/glass2/mug = 10,
/obj/item/weapon/reagent_containers/food/drinks/glass2/wine = 10,
/obj/item/weapon/reagent_containers/food/drinks/glass2/carafe = 2, //VOREStation Add - Carafes and Pitchers
/obj/item/weapon/reagent_containers/food/drinks/glass2/pitcher = 2, //VOREStation Add - Carafes and Pitchers
/obj/item/weapon/reagent_containers/food/drinks/glass2/wine = 10,
/obj/item/weapon/reagent_containers/food/drinks/metaglass = 10,
/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint = 10,
/obj/item/weapon/reagent_containers/glass/beaker/stopperedbottle = 10,
/obj/item/weapon/reagent_containers/food/drinks/bottle/gin = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine = 5,
/obj/item/weapon/reagent_containers/food/condiment/cookingoil = 5,
/obj/item/weapon/reagent_containers/food/condiment/cornoil = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/peppermintschnapps = 5,
@@ -72,8 +72,6 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 5,
/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/whitewine = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/grapejuice = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/jager = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 15,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper = 15,
@@ -82,8 +80,6 @@
/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/cans/beercan = 15,
/obj/item/weapon/reagent_containers/food/drinks/cans/alecan = 15,
/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 5,
@@ -95,11 +91,6 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle/decaf_cola = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/dr_gibb = 5,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/cola = 15,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/space_up = 15,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/space_mountain_wind = 15,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/dr_gibb = 15,
/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 15,
/obj/item/weapon/reagent_containers/food/drinks/cans/tonic = 15,
/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 15,
@@ -109,67 +100,6 @@
/obj/item/weapon/reagent_containers/food/drinks/tea = 15,
/obj/item/weapon/glass_extra/stick = 30,
/obj/item/weapon/glass_extra/straw = 30)
=======
icon_state = "fridge_dark"
products = list(/obj/item/reagent_containers/food/drinks/glass2/square = 10,
/obj/item/reagent_containers/food/drinks/glass2/rocks = 10,
/obj/item/reagent_containers/food/drinks/glass2/shake = 10,
/obj/item/reagent_containers/food/drinks/glass2/cocktail = 10,
/obj/item/reagent_containers/food/drinks/glass2/shot = 10,
/obj/item/reagent_containers/food/drinks/glass2/pint = 10,
/obj/item/reagent_containers/food/drinks/glass2/mug = 10,
/obj/item/reagent_containers/food/drinks/glass2/wine = 10,
/obj/item/reagent_containers/food/drinks/metaglass = 10,
/obj/item/reagent_containers/food/drinks/metaglass/metapint = 10,
/obj/item/reagent_containers/glass/beaker/stopperedbottle = 10,
/obj/item/reagent_containers/food/drinks/bottle/gin = 5,
/obj/item/reagent_containers/food/drinks/bottle/absinthe = 5,
/obj/item/reagent_containers/food/drinks/bottle/bluecuracao = 5,
/obj/item/reagent_containers/food/drinks/bottle/cognac = 5,
/obj/item/reagent_containers/food/drinks/bottle/grenadine = 5,
/obj/item/reagent_containers/food/condiment/cornoil = 5,
/obj/item/reagent_containers/food/drinks/bottle/kahlua = 5,
/obj/item/reagent_containers/food/drinks/bottle/melonliquor = 5,
/obj/item/reagent_containers/food/drinks/bottle/peppermintschnapps = 5,
/obj/item/reagent_containers/food/drinks/bottle/peachschnapps = 5,
/obj/item/reagent_containers/food/drinks/bottle/lemonadeschnapps = 5,
/obj/item/reagent_containers/food/drinks/bottle/rum = 5,
/obj/item/reagent_containers/food/drinks/bottle/sake = 5,
/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey = 5,
/obj/item/reagent_containers/food/drinks/bottle/tequilla = 5,
/obj/item/reagent_containers/food/drinks/bottle/vermouth = 5,
/obj/item/reagent_containers/food/drinks/bottle/vodka = 5,
/obj/item/reagent_containers/food/drinks/bottle/whiskey = 5,
/obj/item/reagent_containers/food/drinks/bottle/wine = 5,
/obj/item/reagent_containers/food/drinks/bottle/jager = 5,
/obj/item/reagent_containers/food/drinks/bottle/small/ale = 15,
/obj/item/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper = 15,
/obj/item/reagent_containers/food/drinks/bottle/small/beer = 15,
/obj/item/reagent_containers/food/drinks/bottle/small/beer/silverdragon = 15,
/obj/item/reagent_containers/food/drinks/bottle/small/beer/meteor = 15,
/obj/item/reagent_containers/food/drinks/bottle/small/litebeer = 15,
/obj/item/reagent_containers/food/drinks/bottle/small/cider = 15,
/obj/item/reagent_containers/food/drinks/bottle/orangejuice = 5,
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 5,
/obj/item/reagent_containers/food/drinks/bottle/limejuice = 5,
/obj/item/reagent_containers/food/drinks/bottle/lemonjuice = 5,
/obj/item/reagent_containers/food/drinks/bottle/applejuice = 5,
/obj/item/reagent_containers/food/drinks/bottle/milk = 5,
/obj/item/reagent_containers/food/drinks/bottle/cream = 5,
/obj/item/reagent_containers/food/drinks/bottle/cola = 5,
/obj/item/reagent_containers/food/drinks/bottle/decaf_cola = 5,
/obj/item/reagent_containers/food/drinks/bottle/space_up = 5,
/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind = 5,
/obj/item/reagent_containers/food/drinks/cans/sodawater = 15,
/obj/item/reagent_containers/food/drinks/cans/tonic = 15,
/obj/item/reagent_containers/food/drinks/cans/gingerale = 15,
/obj/item/reagent_containers/food/drinks/flask/barflask = 5,
/obj/item/reagent_containers/food/drinks/flask/vacuumflask = 5,
/obj/item/reagent_containers/food/drinks/ice = 10,
/obj/item/reagent_containers/food/drinks/tea = 15,
/obj/item/glass_extra/stick = 30,
/obj/item/glass_extra/straw = 30)
>>>>>>> fab45d385f5... Merge pull request #8633 from Sypsoti/bartendinggood
contraband = list()
vend_delay = 15
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.