From cf2f30b24d62b6c1d66d6ef4883cdca87897b016 Mon Sep 17 00:00:00 2001 From: Mooshimi <85910816+Mooshimi@users.noreply.github.com> Date: Wed, 29 Sep 2021 07:05:26 -0400 Subject: [PATCH] spaces -> tabs in vendor code (#61740) --- code/modules/vending/assist.dm | 43 +-- code/modules/vending/autodrobe.dm | 284 +++++++++--------- code/modules/vending/boozeomat.dm | 74 ++--- code/modules/vending/cartridge.dm | 18 +- code/modules/vending/cigarette.dm | 87 +++--- code/modules/vending/clothesmate.dm | 379 +++++++++++++------------ code/modules/vending/coffee.dm | 12 +- code/modules/vending/cola.dm | 40 +-- code/modules/vending/engineering.dm | 46 +-- code/modules/vending/engivend.dm | 36 ++- code/modules/vending/games.dm | 63 ++-- code/modules/vending/liberation.dm | 48 ++-- code/modules/vending/liberation_toy.dm | 36 +-- code/modules/vending/magivend.dm | 18 +- code/modules/vending/medical.dm | 48 ++-- code/modules/vending/medical_wall.dm | 28 +- code/modules/vending/megaseed.dm | 106 +++---- code/modules/vending/modularpc.dm | 38 +-- code/modules/vending/nutrimax.dm | 28 +- code/modules/vending/plasmaresearch.dm | 18 +- code/modules/vending/robotics.dm | 32 ++- code/modules/vending/security.dm | 40 +-- code/modules/vending/snack.dm | 40 +-- code/modules/vending/sovietsoda.dm | 8 +- code/modules/vending/toys.dm | 6 +- code/modules/vending/wardrobes.dm | 18 +- code/modules/vending/youtool.dm | 42 +-- 27 files changed, 880 insertions(+), 756 deletions(-) diff --git a/code/modules/vending/assist.dm b/code/modules/vending/assist.dm index 89049e5d70e..17f99409ed0 100644 --- a/code/modules/vending/assist.dm +++ b/code/modules/vending/assist.dm @@ -3,24 +3,31 @@ desc = "All the finest of miscellaneous electronics one could ever need! Not responsible for any injuries caused by reckless misuse of parts." icon_state = "parts" icon_deny = "parts-deny" - products = list(/obj/item/assembly/prox_sensor = 5, - /obj/item/assembly/igniter = 3, - /obj/item/assembly/signaler = 4, - /obj/item/wirecutters = 1, - /obj/item/cartridge/signal = 4, - /obj/item/stock_parts/matter_bin = 3, - /obj/item/stock_parts/manipulator = 3, - /obj/item/stock_parts/micro_laser = 3, - /obj/item/stock_parts/scanning_module = 3, - /obj/item/stock_parts/capacitor = 3) - contraband = list(/obj/item/assembly/timer = 2, - /obj/item/assembly/voice = 2, - /obj/item/assembly/health = 2, - /obj/item/stock_parts/cell/high = 1) - premium = list(/obj/item/price_tagger = 3, - /obj/item/vending_refill/custom = 3, - /obj/item/circuitboard/machine/vendor = 3, - /obj/item/assembly/igniter/condenser = 2) + products = list( + /obj/item/assembly/prox_sensor = 5, + /obj/item/assembly/igniter = 3, + /obj/item/assembly/signaler = 4, + /obj/item/wirecutters = 1, + /obj/item/cartridge/signal = 4, + /obj/item/stock_parts/matter_bin = 3, + /obj/item/stock_parts/manipulator = 3, + /obj/item/stock_parts/micro_laser = 3, + /obj/item/stock_parts/scanning_module = 3, + /obj/item/stock_parts/capacitor = 3 + ) + contraband = list( + /obj/item/assembly/timer = 2, + /obj/item/assembly/voice = 2, + /obj/item/assembly/health = 2, + /obj/item/stock_parts/cell/high = 1 + ) + premium = list( + /obj/item/price_tagger = 3, + /obj/item/vending_refill/custom = 3, + /obj/item/circuitboard/machine/vendor = 3, + /obj/item/assembly/igniter/condenser = 2 + ) + refill_canister = /obj/item/vending_refill/assist product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!" default_price = PAYCHECK_ASSISTANT * 0.7 //Default of 35. diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 50e399707d5..ce4a87886c0 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -6,145 +6,151 @@ req_access = list(ACCESS_THEATRE) product_slogans = "Dress for success!;Suited and booted!;It's show time!;Why leave style up to fate? Use AutoDrobe!" vend_reply = "Thank you for using AutoDrobe!" - products = list(/obj/item/clothing/suit/chickensuit = 1, - /obj/item/clothing/head/chicken = 1, - /obj/item/clothing/under/rank/civilian/clown/blue = 1, - /obj/item/clothing/under/rank/civilian/clown/green = 1, - /obj/item/clothing/under/rank/civilian/clown/yellow = 1, - /obj/item/clothing/under/rank/civilian/clown/orange = 1, - /obj/item/clothing/under/rank/civilian/clown/purple = 1, - /obj/item/clothing/under/costume/gladiator = 1, - /obj/item/clothing/head/helmet/gladiator = 1, - /obj/item/clothing/under/rank/captain/suit = 1, - /obj/item/clothing/under/rank/captain/suit/skirt = 1, - /obj/item/clothing/head/flatcap = 1, - /obj/item/clothing/suit/toggle/labcoat/mad = 1, - /obj/item/clothing/shoes/jackboots = 1, - /obj/item/clothing/under/costume/schoolgirl = 1, - /obj/item/clothing/under/costume/schoolgirl/red = 1, - /obj/item/clothing/under/costume/schoolgirl/green = 1, - /obj/item/clothing/under/costume/schoolgirl/orange = 1, - /obj/item/clothing/head/kitty = 1, - /obj/item/clothing/under/dress/skirt = 1, - /obj/item/clothing/head/beret = 1, - /obj/item/clothing/accessory/waistcoat = 1, - /obj/item/clothing/under/suit/black = 1, - /obj/item/clothing/head/that = 1, - /obj/item/clothing/under/costume/kilt = 1, - /obj/item/clothing/head/beret = 3, - /obj/item/clothing/accessory/waistcoat = 1, - /obj/item/clothing/glasses/monocle =1, - /obj/item/clothing/head/bowler = 1, - /obj/item/cane = 1, - /obj/item/clothing/under/suit/sl = 1, - /obj/item/clothing/mask/fakemoustache = 1, - /obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1, - /obj/item/clothing/head/plaguedoctorhat = 1, - /obj/item/clothing/mask/gas/plaguedoctor = 1, - /obj/item/clothing/suit/toggle/owlwings = 1, - /obj/item/clothing/under/costume/owl = 1, - /obj/item/clothing/mask/gas/owl_mask = 1, - /obj/item/clothing/suit/toggle/owlwings/griffinwings = 1, - /obj/item/clothing/under/costume/griffin = 1, - /obj/item/clothing/shoes/griffin = 1, - /obj/item/clothing/head/griffin = 1, - /obj/item/clothing/suit/apron = 1, - /obj/item/clothing/under/suit/waiter = 1, - /obj/item/clothing/suit/jacket/miljacket = 1, - /obj/item/clothing/under/costume/pirate = 1, - /obj/item/clothing/suit/pirate = 1, - /obj/item/clothing/head/pirate = 1, - /obj/item/clothing/head/bandana = 1, - /obj/item/clothing/head/bandana = 1, - /obj/item/clothing/under/costume/soviet = 1, - /obj/item/clothing/head/ushanka = 1, - /obj/item/clothing/suit/imperium_monk = 1, - /obj/item/clothing/mask/gas/cyborg = 1, - /obj/item/clothing/suit/chaplainsuit/holidaypriest = 1, - /obj/item/clothing/suit/chaplainsuit/whiterobe = 1, - /obj/item/clothing/head/wizard/marisa/fake = 1, - /obj/item/clothing/suit/wizrobe/marisa/fake = 1, - /obj/item/clothing/under/dress/sundress = 1, - /obj/item/clothing/head/witchwig = 1, - /obj/item/staff/broom = 1, - /obj/item/clothing/suit/wizrobe/fake = 1, - /obj/item/clothing/head/wizard/fake = 1, - /obj/item/staff = 3, - /obj/item/clothing/mask/gas/sexyclown = 1, - /obj/item/clothing/under/rank/civilian/clown/sexy = 1, - /obj/item/clothing/mask/gas/sexymime = 1, - /obj/item/clothing/under/rank/civilian/mime/sexy = 1, - /obj/item/clothing/under/rank/civilian/mime/skirt = 1, - /obj/item/clothing/mask/animal/rat/bat = 1, - /obj/item/clothing/mask/animal/rat/bee = 1, - /obj/item/clothing/mask/animal/rat/bear = 1, - /obj/item/clothing/mask/animal/rat/raven = 1, - /obj/item/clothing/mask/animal/rat/jackal = 1, - /obj/item/clothing/mask/animal/rat/fox = 1, - /obj/item/clothing/mask/animal/frog = 1, - /obj/item/clothing/mask/animal/rat/tribal = 1, - /obj/item/clothing/mask/animal/rat = 1, - /obj/item/clothing/suit/apron/overalls = 1, - /obj/item/clothing/head/rabbitears =1, - /obj/item/clothing/head/sombrero = 1, - /obj/item/clothing/head/sombrero/green = 1, - /obj/item/clothing/suit/poncho = 1, - /obj/item/clothing/suit/poncho/green = 1, - /obj/item/clothing/suit/poncho/red = 1, - /obj/item/clothing/under/costume/maid = 1, - /obj/item/clothing/under/rank/civilian/janitor/maid = 1, - /obj/item/clothing/glasses/cold=1, - /obj/item/clothing/glasses/heat=1, - /obj/item/clothing/suit/whitedress = 1, - /obj/item/clothing/under/rank/civilian/clown/jester = 1, - /obj/item/clothing/head/jester = 1, - /obj/item/clothing/under/costume/villain = 1, - /obj/item/clothing/shoes/singery = 1, - /obj/item/clothing/under/costume/singer/yellow = 1, - /obj/item/clothing/shoes/singerb = 1, - /obj/item/clothing/under/costume/singer/blue = 1, - /obj/item/clothing/suit/hooded/carp_costume = 1, - /obj/item/clothing/suit/hooded/ian_costume = 1, - /obj/item/clothing/suit/hooded/bee_costume = 1, - /obj/item/clothing/suit/snowman = 1, - /obj/item/clothing/head/snowman = 1, - /obj/item/clothing/mask/joy = 1, - /obj/item/clothing/head/cueball = 1, - /obj/item/clothing/under/suit/white_on_white = 1, - /obj/item/clothing/under/costume/sailor = 1, - /obj/item/clothing/under/costume/referee = 1, - /obj/item/clothing/mask/whistle = 1, - /obj/item/clothing/head/delinquent = 1, - /obj/item/clothing/head/wig/random = 3, - /obj/item/clothing/head/shrine_wig = 1, - /obj/item/clothing/suit/shrine_maiden = 1, - /obj/item/clothing/suit/changshan_red = 1, - /obj/item/clothing/suit/changshan_blue = 1, - /obj/item/clothing/suit/cheongsam_red = 1, - /obj/item/clothing/suit/cheongsam_blue = 1, - /obj/item/gohei = 1) - contraband = list(/obj/item/clothing/suit/judgerobe = 1, - /obj/item/clothing/head/powdered_wig = 1, - /obj/item/gun/magic/wand/nothing = 2, - /obj/item/clothing/glasses/sunglasses/garb = 2, - /obj/item/clothing/glasses/blindfold = 1, - /obj/item/clothing/mask/muzzle = 2) - premium = list(/obj/item/clothing/suit/pirate/captain = 2, - /obj/item/clothing/head/pirate/captain = 2, - /obj/item/clothing/under/rank/civilian/clown/rainbow = 1, - /obj/item/clothing/head/helmet/roman/fake = 1, - /obj/item/clothing/head/helmet/roman/legionnaire/fake = 1, - /obj/item/clothing/under/costume/roman = 1, - /obj/item/clothing/shoes/roman = 1, - /obj/item/shield/riot/roman/fake = 1, - /obj/item/clothing/suit/chaplainsuit/clownpriest = 1, - /obj/item/clothing/head/clownmitre = 1, - /obj/item/skub = 1, - /obj/item/clothing/suit/hooded/mysticrobe = 1, - /obj/item/clothing/under/dress/wedding_dress = 1, - /obj/item/clothing/under/suit/tuxedo = 1, - /obj/item/clothing/head/weddingveil = 1, - /obj/item/storage/belt/cummerbund = 1) + products = list( + /obj/item/clothing/suit/chickensuit = 1, + /obj/item/clothing/head/chicken = 1, + /obj/item/clothing/under/rank/civilian/clown/blue = 1, + /obj/item/clothing/under/rank/civilian/clown/green = 1, + /obj/item/clothing/under/rank/civilian/clown/yellow = 1, + /obj/item/clothing/under/rank/civilian/clown/orange = 1, + /obj/item/clothing/under/rank/civilian/clown/purple = 1, + /obj/item/clothing/under/costume/gladiator = 1, + /obj/item/clothing/head/helmet/gladiator = 1, + /obj/item/clothing/under/rank/captain/suit = 1, + /obj/item/clothing/under/rank/captain/suit/skirt = 1, + /obj/item/clothing/head/flatcap = 1, + /obj/item/clothing/suit/toggle/labcoat/mad = 1, + /obj/item/clothing/shoes/jackboots = 1, + /obj/item/clothing/under/costume/schoolgirl = 1, + /obj/item/clothing/under/costume/schoolgirl/red = 1, + /obj/item/clothing/under/costume/schoolgirl/green = 1, + /obj/item/clothing/under/costume/schoolgirl/orange = 1, + /obj/item/clothing/head/kitty = 1, + /obj/item/clothing/under/dress/skirt = 1, + /obj/item/clothing/head/beret = 1, + /obj/item/clothing/accessory/waistcoat = 1, + /obj/item/clothing/under/suit/black = 1, + /obj/item/clothing/head/that = 1, + /obj/item/clothing/under/costume/kilt = 1, + /obj/item/clothing/head/beret = 3, + /obj/item/clothing/accessory/waistcoat = 1, + /obj/item/clothing/glasses/monocle =1, + /obj/item/clothing/head/bowler = 1, + /obj/item/cane = 1, + /obj/item/clothing/under/suit/sl = 1, + /obj/item/clothing/mask/fakemoustache = 1, + /obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1, + /obj/item/clothing/head/plaguedoctorhat = 1, + /obj/item/clothing/mask/gas/plaguedoctor = 1, + /obj/item/clothing/suit/toggle/owlwings = 1, + /obj/item/clothing/under/costume/owl = 1, + /obj/item/clothing/mask/gas/owl_mask = 1, + /obj/item/clothing/suit/toggle/owlwings/griffinwings = 1, + /obj/item/clothing/under/costume/griffin = 1, + /obj/item/clothing/shoes/griffin = 1, + /obj/item/clothing/head/griffin = 1, + /obj/item/clothing/suit/apron = 1, + /obj/item/clothing/under/suit/waiter = 1, + /obj/item/clothing/suit/jacket/miljacket = 1, + /obj/item/clothing/under/costume/pirate = 1, + /obj/item/clothing/suit/pirate = 1, + /obj/item/clothing/head/pirate = 1, + /obj/item/clothing/head/bandana = 1, + /obj/item/clothing/head/bandana = 1, + /obj/item/clothing/under/costume/soviet = 1, + /obj/item/clothing/head/ushanka = 1, + /obj/item/clothing/suit/imperium_monk = 1, + /obj/item/clothing/mask/gas/cyborg = 1, + /obj/item/clothing/suit/chaplainsuit/holidaypriest = 1, + /obj/item/clothing/suit/chaplainsuit/whiterobe = 1, + /obj/item/clothing/head/wizard/marisa/fake = 1, + /obj/item/clothing/suit/wizrobe/marisa/fake = 1, + /obj/item/clothing/under/dress/sundress = 1, + /obj/item/clothing/head/witchwig = 1, + /obj/item/staff/broom = 1, + /obj/item/clothing/suit/wizrobe/fake = 1, + /obj/item/clothing/head/wizard/fake = 1, + /obj/item/staff = 3, + /obj/item/clothing/mask/gas/sexyclown = 1, + /obj/item/clothing/under/rank/civilian/clown/sexy = 1, + /obj/item/clothing/mask/gas/sexymime = 1, + /obj/item/clothing/under/rank/civilian/mime/sexy = 1, + /obj/item/clothing/under/rank/civilian/mime/skirt = 1, + /obj/item/clothing/mask/animal/rat/bat = 1, + /obj/item/clothing/mask/animal/rat/bee = 1, + /obj/item/clothing/mask/animal/rat/bear = 1, + /obj/item/clothing/mask/animal/rat/raven = 1, + /obj/item/clothing/mask/animal/rat/jackal = 1, + /obj/item/clothing/mask/animal/rat/fox = 1, + /obj/item/clothing/mask/animal/frog = 1, + /obj/item/clothing/mask/animal/rat/tribal = 1, + /obj/item/clothing/mask/animal/rat = 1, + /obj/item/clothing/suit/apron/overalls = 1, + /obj/item/clothing/head/rabbitears =1, + /obj/item/clothing/head/sombrero = 1, + /obj/item/clothing/head/sombrero/green = 1, + /obj/item/clothing/suit/poncho = 1, + /obj/item/clothing/suit/poncho/green = 1, + /obj/item/clothing/suit/poncho/red = 1, + /obj/item/clothing/under/costume/maid = 1, + /obj/item/clothing/under/rank/civilian/janitor/maid = 1, + /obj/item/clothing/glasses/cold=1, + /obj/item/clothing/glasses/heat=1, + /obj/item/clothing/suit/whitedress = 1, + /obj/item/clothing/under/rank/civilian/clown/jester = 1, + /obj/item/clothing/head/jester = 1, + /obj/item/clothing/under/costume/villain = 1, + /obj/item/clothing/shoes/singery = 1, + /obj/item/clothing/under/costume/singer/yellow = 1, + /obj/item/clothing/shoes/singerb = 1, + /obj/item/clothing/under/costume/singer/blue = 1, + /obj/item/clothing/suit/hooded/carp_costume = 1, + /obj/item/clothing/suit/hooded/ian_costume = 1, + /obj/item/clothing/suit/hooded/bee_costume = 1, + /obj/item/clothing/suit/snowman = 1, + /obj/item/clothing/head/snowman = 1, + /obj/item/clothing/mask/joy = 1, + /obj/item/clothing/head/cueball = 1, + /obj/item/clothing/under/suit/white_on_white = 1, + /obj/item/clothing/under/costume/sailor = 1, + /obj/item/clothing/under/costume/referee = 1, + /obj/item/clothing/mask/whistle = 1, + /obj/item/clothing/head/delinquent = 1, + /obj/item/clothing/head/wig/random = 3, + /obj/item/clothing/head/shrine_wig = 1, + /obj/item/clothing/suit/shrine_maiden = 1, + /obj/item/clothing/suit/changshan_red = 1, + /obj/item/clothing/suit/changshan_blue = 1, + /obj/item/clothing/suit/cheongsam_red = 1, + /obj/item/clothing/suit/cheongsam_blue = 1, + /obj/item/gohei = 1 + ) + contraband = list( + /obj/item/clothing/suit/judgerobe = 1, + /obj/item/clothing/head/powdered_wig = 1, + /obj/item/gun/magic/wand/nothing = 2, + /obj/item/clothing/glasses/sunglasses/garb = 2, + /obj/item/clothing/glasses/blindfold = 1, + /obj/item/clothing/mask/muzzle = 2 + ) + premium = list( + /obj/item/clothing/suit/pirate/captain = 2, + /obj/item/clothing/head/pirate/captain = 2, + /obj/item/clothing/under/rank/civilian/clown/rainbow = 1, + /obj/item/clothing/head/helmet/roman/fake = 1, + /obj/item/clothing/head/helmet/roman/legionnaire/fake = 1, + /obj/item/clothing/under/costume/roman = 1, + /obj/item/clothing/shoes/roman = 1, + /obj/item/shield/riot/roman/fake = 1, + /obj/item/clothing/suit/chaplainsuit/clownpriest = 1, + /obj/item/clothing/head/clownmitre = 1, + /obj/item/skub = 1, + /obj/item/clothing/suit/hooded/mysticrobe = 1, + /obj/item/clothing/under/dress/wedding_dress = 1, + /obj/item/clothing/under/suit/tuxedo = 1, + /obj/item/clothing/head/weddingveil = 1, + /obj/item/storage/belt/cummerbund = 1 + ) refill_canister = /obj/item/vending_refill/autodrobe default_price = PAYCHECK_ASSISTANT * 0.8 //Default of 40. extra_price = PAYCHECK_HARD diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index c2e070bdd9a..bc8d1b3149f 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -3,46 +3,48 @@ desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one." icon_state = "boozeomat" icon_deny = "boozeomat-deny" - 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/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/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 - ) + 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/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/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 + ) contraband = list( /obj/item/reagent_containers/food/drinks/mug/tea = 12, /obj/item/reagent_containers/food/drinks/bottle/fernet = 5, ) - premium = list(/obj/item/reagent_containers/glass/bottle/ethanol = 4, + 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, ) diff --git a/code/modules/vending/cartridge.dm b/code/modules/vending/cartridge.dm index 3965501f89b..7869a49ada3 100644 --- a/code/modules/vending/cartridge.dm +++ b/code/modules/vending/cartridge.dm @@ -5,14 +5,16 @@ product_slogans = "Carts to go!" icon_state = "cart" icon_deny = "cart-deny" - products = list(/obj/item/cartridge/medical = 10, - /obj/item/cartridge/engineering = 10, - /obj/item/cartridge/security = 10, - /obj/item/cartridge/janitor = 10, - /obj/item/cartridge/signal/ordnance = 10, - /obj/item/pda/heads = 10, - /obj/item/cartridge/captain = 3, - /obj/item/cartridge/quartermaster = 10) + products = list( + /obj/item/cartridge/medical = 10, + /obj/item/cartridge/engineering = 10, + /obj/item/cartridge/security = 10, + /obj/item/cartridge/janitor = 10, + /obj/item/cartridge/signal/ordnance = 10, + /obj/item/pda/heads = 10, + /obj/item/cartridge/captain = 3, + /obj/item/cartridge/quartermaster = 10 + ) refill_canister = /obj/item/vending_refill/cart default_price = PAYCHECK_COMMAND extra_price = PAYCHECK_COMMAND * 2.5 diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm index baadf187b03..20575d57543 100644 --- a/code/modules/vending/cigarette.dm +++ b/code/modules/vending/cigarette.dm @@ -4,22 +4,29 @@ 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." icon_state = "cigs" - products = list(/obj/item/storage/fancy/cigarettes = 5, - /obj/item/storage/fancy/cigarettes/cigpack_candy = 4, - /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3, - /obj/item/storage/fancy/cigarettes/cigpack_robust = 3, - /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, - /obj/item/storage/fancy/cigarettes/cigpack_midori = 3, - /obj/item/storage/box/matches = 10, - /obj/item/lighter/greyscale = 4, - /obj/item/storage/fancy/rollingpapers = 5) - contraband = list(/obj/item/clothing/mask/vape = 5) - premium = list(/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 3, - /obj/item/storage/box/gum/nicotine = 2, - /obj/item/lighter = 3, - /obj/item/storage/fancy/cigarettes/cigars = 1, - /obj/item/storage/fancy/cigarettes/cigars/havana = 1, - /obj/item/storage/fancy/cigarettes/cigars/cohiba = 1) + products = list( + /obj/item/storage/fancy/cigarettes = 5, + /obj/item/storage/fancy/cigarettes/cigpack_candy = 4, + /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3, + /obj/item/storage/fancy/cigarettes/cigpack_robust = 3, + /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, + /obj/item/storage/fancy/cigarettes/cigpack_midori = 3, + /obj/item/storage/box/matches = 10, + /obj/item/lighter/greyscale = 4, + /obj/item/storage/fancy/rollingpapers = 5 + ) + contraband = list( + /obj/item/clothing/mask/vape = 5 + ) + premium = list( + /obj/item/storage/fancy/cigarettes/cigpack_robustgold = 3, + /obj/item/storage/box/gum/nicotine = 2, + /obj/item/lighter = 3, + /obj/item/storage/fancy/cigarettes/cigars = 1, + /obj/item/storage/fancy/cigarettes/cigars/havana = 1, + /obj/item/storage/fancy/cigarettes/cigars/cohiba = 1 + ) + refill_canister = /obj/item/vending_refill/cigarette default_price = PAYCHECK_ASSISTANT extra_price = PAYCHECK_HARD @@ -27,33 +34,39 @@ light_mask = "cigs-light-mask" /obj/machinery/vending/cigarette/syndicate - products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 7, - /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3, - /obj/item/storage/fancy/cigarettes/cigpack_candy = 2, - /obj/item/storage/fancy/cigarettes/cigpack_robust = 2, - /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, - /obj/item/storage/fancy/cigarettes/cigpack_midori = 1, - /obj/item/storage/box/matches = 10, - /obj/item/lighter/greyscale = 4, - /obj/item/storage/fancy/rollingpapers = 5) + products = list( + /obj/item/storage/fancy/cigarettes/cigpack_syndicate = 7, + /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3, + /obj/item/storage/fancy/cigarettes/cigpack_candy = 2, + /obj/item/storage/fancy/cigarettes/cigpack_robust = 2, + /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, + /obj/item/storage/fancy/cigarettes/cigpack_midori = 1, + /obj/item/storage/box/matches = 10, + /obj/item/lighter/greyscale = 4, + /obj/item/storage/fancy/rollingpapers = 5 + ) /obj/machinery/vending/cigarette/beach //Used in the lavaland_biodome_beach.dmm ruin name = "\improper ShadyCigs Ultra" desc = "Now with extra premium products!" product_ads = "Probably not bad for you!;Dope will get you through times of no money better than money will get you through times of no dope!;It's good for you!" product_slogans = "Turn on, tune in, drop out!;Better living through chemistry!;Toke!;Don't forget to keep a smile on your lips and a song in your heart!" - products = list(/obj/item/storage/fancy/cigarettes = 5, - /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3, - /obj/item/storage/fancy/cigarettes/cigpack_robust = 3, - /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, - /obj/item/storage/fancy/cigarettes/cigpack_midori = 3, - /obj/item/storage/fancy/cigarettes/cigpack_cannabis = 5, - /obj/item/storage/box/matches = 10, - /obj/item/lighter/greyscale = 4, - /obj/item/storage/fancy/rollingpapers = 5) - premium = list(/obj/item/storage/fancy/cigarettes/cigpack_mindbreaker = 5, - /obj/item/clothing/mask/vape = 5, - /obj/item/lighter = 3) + products = list( + /obj/item/storage/fancy/cigarettes = 5, + /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3, + /obj/item/storage/fancy/cigarettes/cigpack_robust = 3, + /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, + /obj/item/storage/fancy/cigarettes/cigpack_midori = 3, + /obj/item/storage/fancy/cigarettes/cigpack_cannabis = 5, + /obj/item/storage/box/matches = 10, + /obj/item/lighter/greyscale = 4, + /obj/item/storage/fancy/rollingpapers = 5 + ) + premium = list( + /obj/item/storage/fancy/cigarettes/cigpack_mindbreaker = 5, + /obj/item/clothing/mask/vape = 5, + /obj/item/lighter = 3 + ) /obj/item/vending_refill/cigarette machine_name = "ShadyCigs Deluxe" diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index ba7c486de3e..4e7472b8645 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -5,194 +5,199 @@ icon_deny = "clothes-deny" product_slogans = "Dress for success!;Prepare to look swagalicious!;Look at all this swag!;Why leave style up to fate? Use the ClothesMate!" vend_reply = "Thank you for using the ClothesMate!" - products = list(/obj/item/clothing/head/beanie = 3, - /obj/item/clothing/head/beanie/black = 3, - /obj/item/clothing/head/beanie/red = 3, - /obj/item/clothing/head/beanie/green = 3, - /obj/item/clothing/head/beanie/darkblue = 3, - /obj/item/clothing/head/beanie/purple = 3, - /obj/item/clothing/head/beanie/yellow = 3, - /obj/item/clothing/head/beanie/orange = 3, - /obj/item/clothing/head/beanie/cyan = 3, - /obj/item/clothing/head/beanie/christmas = 3, - /obj/item/clothing/head/beanie/striped = 3, - /obj/item/clothing/head/beanie/stripedred = 3, - /obj/item/clothing/head/beanie/stripedblue = 3, - /obj/item/clothing/head/beanie/stripedgreen = 3, - /obj/item/clothing/head/beanie/rasta = 3, - /obj/item/clothing/head/beret/black = 3, - /obj/item/clothing/head/kippah = 3, - /obj/item/clothing/head/taqiyahred = 3, - /obj/item/clothing/gloves/fingerless = 2, - /obj/item/clothing/neck/scarf/pink = 3, - /obj/item/clothing/neck/scarf/red = 3, - /obj/item/clothing/neck/scarf/green = 3, - /obj/item/clothing/neck/scarf/darkblue = 3, - /obj/item/clothing/neck/scarf/purple = 3, - /obj/item/clothing/neck/scarf/yellow = 3, - /obj/item/clothing/neck/scarf/orange = 3, - /obj/item/clothing/neck/scarf/cyan = 3, - /obj/item/clothing/neck/scarf = 3, - /obj/item/clothing/neck/scarf/black = 3, - /obj/item/clothing/neck/scarf/zebra = 3, - /obj/item/clothing/neck/scarf/christmas = 3, - /obj/item/clothing/neck/stripedredscarf = 3, - /obj/item/clothing/neck/stripedbluescarf = 3, - /obj/item/clothing/neck/stripedgreenscarf = 3, - /obj/item/clothing/neck/tie/blue = 3, - /obj/item/clothing/neck/tie/red = 3, - /obj/item/clothing/neck/tie/black = 3, - /obj/item/clothing/neck/tie/horrible = 3, - /obj/item/storage/belt/fannypack = 3, - /obj/item/storage/belt/fannypack/blue = 3, - /obj/item/storage/belt/fannypack/red = 3, - /obj/item/clothing/under/misc/overalls = 2, - /obj/item/clothing/under/pants/jeans = 2, - /obj/item/clothing/under/pants/classicjeans = 2, - /obj/item/clothing/under/pants/camo = 2, - /obj/item/clothing/under/pants/blackjeans = 2, - /obj/item/clothing/under/pants/khaki = 2, - /obj/item/clothing/under/pants/white = 2, - /obj/item/clothing/under/pants/red = 2, - /obj/item/clothing/under/pants/black = 2, - /obj/item/clothing/under/pants/tan = 2, - /obj/item/clothing/under/pants/track = 2, - /obj/item/clothing/shoes/sneakers/black = 4, - /obj/item/clothing/head/wig/natural = 4, - /obj/item/clothing/under/dress/skirt/plaid = 2, - /obj/item/clothing/under/dress/skirt/plaid/blue = 2, - /obj/item/clothing/under/dress/skirt/plaid/green = 2, - /obj/item/clothing/under/dress/skirt/plaid/purple = 2, - /obj/item/clothing/under/dress/skirt = 2, - /obj/item/clothing/under/dress/skirt/blue = 2, - /obj/item/clothing/under/dress/skirt/red = 2, - /obj/item/clothing/under/dress/skirt/purple = 2, - /obj/item/clothing/under/suit/white/skirt = 2, - /obj/item/clothing/under/rank/captain/suit/skirt = 2, - /obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 2, - /obj/item/clothing/suit/jacket = 2, - /obj/item/clothing/suit/hooded/wintercoat/custom = 2, - /obj/item/clothing/suit/jacket/puffer/vest = 2, - /obj/item/clothing/suit/jacket/puffer = 2, - /obj/item/clothing/suit/jacket/letterman = 2, - /obj/item/clothing/suit/jacket/letterman_red = 2, - /obj/item/clothing/glasses/regular = 2, - /obj/item/clothing/glasses/regular/jamjar = 1, - /obj/item/clothing/glasses/orange = 1, - /obj/item/clothing/glasses/red = 1, - /obj/item/clothing/under/suit/navy = 1, - /obj/item/clothing/under/suit/black_really = 1, - /obj/item/clothing/under/suit/burgundy = 1, - /obj/item/clothing/under/suit/charcoal = 1, - /obj/item/clothing/under/suit/white = 1, - /obj/item/clothing/under/suit/sl = 1, - /obj/item/clothing/accessory/waistcoat = 1, - /obj/item/clothing/head/that = 1, - /obj/item/clothing/head/fedora = 1, - /obj/item/clothing/glasses/monocle = 1, - /obj/item/clothing/head/sombrero = 1, - /obj/item/clothing/suit/poncho = 1, - /obj/item/clothing/under/costume/kilt = 1, - /obj/item/clothing/under/dress/sundress = 1, - /obj/item/clothing/under/dress/striped = 1, - /obj/item/clothing/under/dress/sailor = 1, - /obj/item/clothing/under/dress/redeveninggown = 1, - /obj/item/clothing/under/dress/blacktango = 1, - /obj/item/clothing/suit/ianshirt = 1, - /obj/item/clothing/shoes/laceup = 2, - /obj/item/clothing/shoes/sandal = 2, - /obj/item/clothing/shoes/winterboots = 2, - /obj/item/clothing/shoes/cowboy = 2, - /obj/item/clothing/shoes/cowboy/white = 2, - /obj/item/clothing/shoes/cowboy/black = 2, - /obj/item/clothing/suit/jacket/miljacket = 1, - /obj/item/clothing/suit/apron/purple_bartender = 2, - /obj/item/clothing/under/rank/civilian/bartender/purple = 2, - /obj/item/clothing/suit/toggle/suspenders/blue = 2, - /obj/item/clothing/suit/toggle/suspenders/gray = 2, - /obj/item/storage/backpack/henchmen = 20, - /obj/item/clothing/under/suit/henchmen = 20, - /obj/item/clothing/under/costume/yakuza = 20, - /obj/item/clothing/shoes/yakuza = 20, - /obj/item/clothing/suit/yakuza = 20, - /obj/item/clothing/under/costume/jackbros = 20, - /obj/item/clothing/shoes/jackbros = 20, - /obj/item/clothing/head/jackbros = 20, - /obj/item/clothing/under/costume/dutch = 20, - /obj/item/clothing/head/bowler = 20, - /obj/item/clothing/suit/dutch = 20, - /obj/item/clothing/shoes/cowboy = 20, - /obj/item/clothing/suit/irs = 20, - /obj/item/clothing/under/costume/irs = 20, - /obj/item/clothing/head/irs = 20, - /obj/item/clothing/suit/osi = 20, - /obj/item/clothing/under/costume/osi = 20, - /obj/item/clothing/glasses/osi = 20, - /obj/item/clothing/suit/tmc = 20, - /obj/item/clothing/under/costume/tmc = 20, - /obj/item/clothing/head/tmc = 20, - /obj/item/clothing/suit/pg = 20, - /obj/item/clothing/under/costume/pg = 20, - /obj/item/clothing/head/pg = 20, - /obj/item/clothing/suit/driscoll = 20, - /obj/item/clothing/under/costume/driscoll = 20, - /obj/item/clothing/mask/gas/driscoll = 20, - /obj/item/clothing/suit/deckers = 20, - /obj/item/clothing/under/costume/deckers = 20, - /obj/item/clothing/head/deckers = 20, - /obj/item/clothing/shoes/deckers = 20, - /obj/item/clothing/suit/morningstar = 20, - /obj/item/clothing/under/costume/morningstar = 20, - /obj/item/clothing/head/morningstar = 20, - /obj/item/clothing/shoes/morningstar = 20, - /obj/item/clothing/suit/saints = 20, - /obj/item/clothing/under/costume/saints = 20, - /obj/item/clothing/head/saints = 20, - /obj/item/clothing/shoes/saints = 20, - /obj/item/clothing/suit/phantom = 20, - /obj/item/clothing/under/costume/phantom = 20, - /obj/item/clothing/glasses/phantom = 20, - /obj/item/clothing/shoes/phantom = 20, - /obj/item/clothing/suit/allies = 20, - /obj/item/clothing/under/costume/allies = 20, - /obj/item/clothing/head/allies = 20, - /obj/item/clothing/suit/soviet = 20, - /obj/item/clothing/under/costume/soviet_families = 20, - /obj/item/clothing/head/ushanka/soviet = 20, - /obj/item/clothing/suit/yuri = 20, - /obj/item/clothing/under/costume/yuri = 20, - /obj/item/clothing/head/yuri = 20, - /obj/item/clothing/suit/sybil_slickers = 20, - /obj/item/clothing/under/costume/sybil_slickers = 20, - /obj/item/clothing/head/sybil_slickers = 20, - /obj/item/clothing/shoes/sybil_slickers = 20, - /obj/item/clothing/suit/basil_boys = 20, - /obj/item/clothing/under/costume/basil_boys = 20, - /obj/item/clothing/head/basil_boys = 20, - /obj/item/clothing/shoes/basil_boys = 20) - contraband = list(/obj/item/clothing/under/syndicate/tacticool = 1, - /obj/item/clothing/under/syndicate/tacticool/skirt = 1, - /obj/item/clothing/mask/balaclava = 1, - /obj/item/clothing/head/ushanka = 1, - /obj/item/clothing/under/costume/soviet = 1, - /obj/item/storage/belt/fannypack/black = 2, - /obj/item/clothing/suit/jacket/letterman_syndie = 1, - /obj/item/clothing/under/costume/jabroni = 1, - /obj/item/clothing/suit/vapeshirt = 1, - /obj/item/clothing/under/costume/geisha = 1, - /obj/item/clothing/under/rank/centcom/officer/replica = 1, - /obj/item/clothing/under/rank/centcom/officer_skirt/replica = 1) + products = list( + /obj/item/clothing/head/beanie = 3, + /obj/item/clothing/head/beanie/black = 3, + /obj/item/clothing/head/beanie/red = 3, + /obj/item/clothing/head/beanie/green = 3, + /obj/item/clothing/head/beanie/darkblue = 3, + /obj/item/clothing/head/beanie/purple = 3, + /obj/item/clothing/head/beanie/yellow = 3, + /obj/item/clothing/head/beanie/orange = 3, + /obj/item/clothing/head/beanie/cyan = 3, + /obj/item/clothing/head/beanie/christmas = 3, + /obj/item/clothing/head/beanie/striped = 3, + /obj/item/clothing/head/beanie/stripedred = 3, + /obj/item/clothing/head/beanie/stripedblue = 3, + /obj/item/clothing/head/beanie/stripedgreen = 3, + /obj/item/clothing/head/beanie/rasta = 3, + /obj/item/clothing/head/beret/black = 3, + /obj/item/clothing/head/kippah = 3, + /obj/item/clothing/head/taqiyahred = 3, + /obj/item/clothing/gloves/fingerless = 2, + /obj/item/clothing/neck/scarf/pink = 3, + /obj/item/clothing/neck/scarf/red = 3, + /obj/item/clothing/neck/scarf/green = 3, + /obj/item/clothing/neck/scarf/darkblue = 3, + /obj/item/clothing/neck/scarf/purple = 3, + /obj/item/clothing/neck/scarf/yellow = 3, + /obj/item/clothing/neck/scarf/orange = 3, + /obj/item/clothing/neck/scarf/cyan = 3, + /obj/item/clothing/neck/scarf = 3, + /obj/item/clothing/neck/scarf/black = 3, + /obj/item/clothing/neck/scarf/zebra = 3, + /obj/item/clothing/neck/scarf/christmas = 3, + /obj/item/clothing/neck/stripedredscarf = 3, + /obj/item/clothing/neck/stripedbluescarf = 3, + /obj/item/clothing/neck/stripedgreenscarf = 3, + /obj/item/clothing/neck/tie/blue = 3, + /obj/item/clothing/neck/tie/red = 3, + /obj/item/clothing/neck/tie/black = 3, + /obj/item/clothing/neck/tie/horrible = 3, + /obj/item/storage/belt/fannypack = 3, + /obj/item/storage/belt/fannypack/blue = 3, + /obj/item/storage/belt/fannypack/red = 3, + /obj/item/clothing/under/misc/overalls = 2, + /obj/item/clothing/under/pants/jeans = 2, + /obj/item/clothing/under/pants/classicjeans = 2, + /obj/item/clothing/under/pants/camo = 2, + /obj/item/clothing/under/pants/blackjeans = 2, + /obj/item/clothing/under/pants/khaki = 2, + /obj/item/clothing/under/pants/white = 2, + /obj/item/clothing/under/pants/red = 2, + /obj/item/clothing/under/pants/black = 2, + /obj/item/clothing/under/pants/tan = 2, + /obj/item/clothing/under/pants/track = 2, + /obj/item/clothing/shoes/sneakers/black = 4, + /obj/item/clothing/head/wig/natural = 4, + /obj/item/clothing/under/dress/skirt/plaid = 2, + /obj/item/clothing/under/dress/skirt/plaid/blue = 2, + /obj/item/clothing/under/dress/skirt/plaid/green = 2, + /obj/item/clothing/under/dress/skirt/plaid/purple = 2, + /obj/item/clothing/under/dress/skirt = 2, + /obj/item/clothing/under/dress/skirt/blue = 2, + /obj/item/clothing/under/dress/skirt/red = 2, + /obj/item/clothing/under/dress/skirt/purple = 2, + /obj/item/clothing/under/suit/white/skirt = 2, + /obj/item/clothing/under/rank/captain/suit/skirt = 2, + /obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 2, + /obj/item/clothing/suit/jacket = 2, + /obj/item/clothing/suit/hooded/wintercoat/custom = 2, + /obj/item/clothing/suit/jacket/puffer/vest = 2, + /obj/item/clothing/suit/jacket/puffer = 2, + /obj/item/clothing/suit/jacket/letterman = 2, + /obj/item/clothing/suit/jacket/letterman_red = 2, + /obj/item/clothing/glasses/regular = 2, + /obj/item/clothing/glasses/regular/jamjar = 1, + /obj/item/clothing/glasses/orange = 1, + /obj/item/clothing/glasses/red = 1, + /obj/item/clothing/under/suit/navy = 1, + /obj/item/clothing/under/suit/black_really = 1, + /obj/item/clothing/under/suit/burgundy = 1, + /obj/item/clothing/under/suit/charcoal = 1, + /obj/item/clothing/under/suit/white = 1, + /obj/item/clothing/under/suit/sl = 1, + /obj/item/clothing/accessory/waistcoat = 1, + /obj/item/clothing/head/that = 1, + /obj/item/clothing/head/fedora = 1, + /obj/item/clothing/glasses/monocle = 1, + /obj/item/clothing/head/sombrero = 1, + /obj/item/clothing/suit/poncho = 1, + /obj/item/clothing/under/costume/kilt = 1, + /obj/item/clothing/under/dress/sundress = 1, + /obj/item/clothing/under/dress/striped = 1, + /obj/item/clothing/under/dress/sailor = 1, + /obj/item/clothing/under/dress/redeveninggown = 1, + /obj/item/clothing/under/dress/blacktango = 1, + /obj/item/clothing/suit/ianshirt = 1, + /obj/item/clothing/shoes/laceup = 2, + /obj/item/clothing/shoes/sandal = 2, + /obj/item/clothing/shoes/winterboots = 2, + /obj/item/clothing/shoes/cowboy = 2, + /obj/item/clothing/shoes/cowboy/white = 2, + /obj/item/clothing/shoes/cowboy/black = 2, + /obj/item/clothing/suit/jacket/miljacket = 1, + /obj/item/clothing/suit/apron/purple_bartender = 2, + /obj/item/clothing/under/rank/civilian/bartender/purple = 2, + /obj/item/clothing/suit/toggle/suspenders/blue = 2, + /obj/item/clothing/suit/toggle/suspenders/gray = 2, + /obj/item/storage/backpack/henchmen = 20, + /obj/item/clothing/under/suit/henchmen = 20, + /obj/item/clothing/under/costume/yakuza = 20, + /obj/item/clothing/shoes/yakuza = 20, + /obj/item/clothing/suit/yakuza = 20, + /obj/item/clothing/under/costume/jackbros = 20, + /obj/item/clothing/shoes/jackbros = 20, + /obj/item/clothing/head/jackbros = 20, + /obj/item/clothing/under/costume/dutch = 20, + /obj/item/clothing/head/bowler = 20, + /obj/item/clothing/suit/dutch = 20, + /obj/item/clothing/shoes/cowboy = 20, + /obj/item/clothing/suit/irs = 20, + /obj/item/clothing/under/costume/irs = 20, + /obj/item/clothing/head/irs = 20, + /obj/item/clothing/suit/osi = 20, + /obj/item/clothing/under/costume/osi = 20, + /obj/item/clothing/glasses/osi = 20, + /obj/item/clothing/suit/tmc = 20, + /obj/item/clothing/under/costume/tmc = 20, + /obj/item/clothing/head/tmc = 20, + /obj/item/clothing/suit/pg = 20, + /obj/item/clothing/under/costume/pg = 20, + /obj/item/clothing/head/pg = 20, + /obj/item/clothing/suit/driscoll = 20, + /obj/item/clothing/under/costume/driscoll = 20, + /obj/item/clothing/mask/gas/driscoll = 20, + /obj/item/clothing/suit/deckers = 20, + /obj/item/clothing/under/costume/deckers = 20, + /obj/item/clothing/head/deckers = 20, + /obj/item/clothing/shoes/deckers = 20, + /obj/item/clothing/suit/morningstar = 20, + /obj/item/clothing/under/costume/morningstar = 20, + /obj/item/clothing/head/morningstar = 20, + /obj/item/clothing/shoes/morningstar = 20, + /obj/item/clothing/suit/saints = 20, + /obj/item/clothing/under/costume/saints = 20, + /obj/item/clothing/head/saints = 20, + /obj/item/clothing/shoes/saints = 20, + /obj/item/clothing/suit/phantom = 20, + /obj/item/clothing/under/costume/phantom = 20, + /obj/item/clothing/glasses/phantom = 20, + /obj/item/clothing/shoes/phantom = 20, + /obj/item/clothing/suit/allies = 20, + /obj/item/clothing/under/costume/allies = 20, + /obj/item/clothing/head/allies = 20, + /obj/item/clothing/suit/soviet = 20, + /obj/item/clothing/under/costume/soviet_families = 20, + /obj/item/clothing/head/ushanka/soviet = 20, + /obj/item/clothing/suit/yuri = 20, + /obj/item/clothing/under/costume/yuri = 20, + /obj/item/clothing/head/yuri = 20, + /obj/item/clothing/suit/sybil_slickers = 20, + /obj/item/clothing/under/costume/sybil_slickers = 20, + /obj/item/clothing/head/sybil_slickers = 20, + /obj/item/clothing/shoes/sybil_slickers = 20, + /obj/item/clothing/suit/basil_boys = 20, + /obj/item/clothing/under/costume/basil_boys = 20, + /obj/item/clothing/head/basil_boys = 20, + /obj/item/clothing/shoes/basil_boys = 20 + ) + contraband = list( + /obj/item/clothing/under/syndicate/tacticool = 1, + /obj/item/clothing/under/syndicate/tacticool/skirt = 1, + /obj/item/clothing/mask/balaclava = 1, + /obj/item/clothing/head/ushanka = 1, + /obj/item/clothing/under/costume/soviet = 1, + /obj/item/storage/belt/fannypack/black = 2, + /obj/item/clothing/suit/jacket/letterman_syndie = 1, + /obj/item/clothing/under/costume/jabroni = 1, + /obj/item/clothing/suit/vapeshirt = 1, + /obj/item/clothing/under/costume/geisha = 1, + /obj/item/clothing/under/rank/centcom/officer/replica = 1, + /obj/item/clothing/under/rank/centcom/officer_skirt/replica = 1 + ) premium = list(/obj/item/clothing/under/suit/checkered = 1, - /obj/item/clothing/head/mailman = 1, - /obj/item/clothing/under/misc/mailman = 1, - /obj/item/clothing/suit/jacket/leather = 1, - /obj/item/clothing/suit/jacket/leather/overcoat = 1, - /obj/item/clothing/under/pants/mustangjeans = 1, - /obj/item/clothing/neck/necklace/dope = 3, - /obj/item/clothing/suit/jacket/letterman_nanotrasen = 1, - /obj/item/clothing/under/costume/swagoutfit = 1, - /obj/item/clothing/shoes/swagshoes = 1, - /obj/item/instrument/piano_synth/headphones/spacepods = 1) + /obj/item/clothing/head/mailman = 1, + /obj/item/clothing/under/misc/mailman = 1, + /obj/item/clothing/suit/jacket/leather = 1, + /obj/item/clothing/suit/jacket/leather/overcoat = 1, + /obj/item/clothing/under/pants/mustangjeans = 1, + /obj/item/clothing/neck/necklace/dope = 3, + /obj/item/clothing/suit/jacket/letterman_nanotrasen = 1, + /obj/item/clothing/under/costume/swagoutfit = 1, + /obj/item/clothing/shoes/swagshoes = 1, + /obj/item/instrument/piano_synth/headphones/spacepods = 1 + ) refill_canister = /obj/item/vending_refill/clothing default_price = PAYCHECK_ASSISTANT * 0.7 //Default of extra_price = PAYCHECK_HARD diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm index 8f3685f5ead..8165be606a2 100644 --- a/code/modules/vending/coffee.dm +++ b/code/modules/vending/coffee.dm @@ -4,10 +4,14 @@ 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" icon_vend = "coffee-vend" - 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) - contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12) + 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 + ) + contraband = list( + /obj/item/reagent_containers/food/drinks/ice = 12 + ) refill_canister = /obj/item/vending_refill/coffee default_price = PAYCHECK_PRISONER extra_price = PAYCHECK_ASSISTANT diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index 1ae3fab896c..1b00fb0fd1f 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -5,22 +5,28 @@ 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/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) - contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, - /obj/item/reagent_containers/food/drinks/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) + 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 + ) + contraband = list( + /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, + /obj/item/reagent_containers/food/drinks/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 + ) refill_canister = /obj/item/vending_refill/cola default_price = PAYCHECK_ASSISTANT * 0.7 extra_price = PAYCHECK_MEDIUM @@ -82,7 +88,7 @@ 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/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, diff --git a/code/modules/vending/engineering.dm b/code/modules/vending/engineering.dm index dc9d849edd5..3f4c8608031 100644 --- a/code/modules/vending/engineering.dm +++ b/code/modules/vending/engineering.dm @@ -5,28 +5,30 @@ icon_state = "engi" icon_deny = "engi-deny" req_access = list(ACCESS_ENGINE_EQUIP) - products = list(/obj/item/clothing/under/rank/engineering/chief_engineer = 4, - /obj/item/clothing/under/rank/engineering/engineer = 4, - /obj/item/clothing/shoes/sneakers/orange = 4, - /obj/item/clothing/head/hardhat = 4, - /obj/item/storage/belt/utility = 4, - /obj/item/clothing/glasses/meson/engine = 4, - /obj/item/clothing/gloves/color/yellow = 4, - /obj/item/screwdriver = 12, - /obj/item/crowbar = 12, - /obj/item/wirecutters = 12, - /obj/item/multitool = 12, - /obj/item/wrench = 12, - /obj/item/t_scanner = 12, - /obj/item/stock_parts/cell = 8, - /obj/item/weldingtool = 8, - /obj/item/clothing/head/welding = 8, - /obj/item/light/tube = 10, - /obj/item/clothing/suit/fire = 4, - /obj/item/stock_parts/scanning_module = 5, - /obj/item/stock_parts/micro_laser = 5, - /obj/item/stock_parts/matter_bin = 5, - /obj/item/stock_parts/manipulator = 5) + products = list( + /obj/item/clothing/under/rank/engineering/chief_engineer = 4, + /obj/item/clothing/under/rank/engineering/engineer = 4, + /obj/item/clothing/shoes/sneakers/orange = 4, + /obj/item/clothing/head/hardhat = 4, + /obj/item/storage/belt/utility = 4, + /obj/item/clothing/glasses/meson/engine = 4, + /obj/item/clothing/gloves/color/yellow = 4, + /obj/item/screwdriver = 12, + /obj/item/crowbar = 12, + /obj/item/wirecutters = 12, + /obj/item/multitool = 12, + /obj/item/wrench = 12, + /obj/item/t_scanner = 12, + /obj/item/stock_parts/cell = 8, + /obj/item/weldingtool = 8, + /obj/item/clothing/head/welding = 8, + /obj/item/light/tube = 10, + /obj/item/clothing/suit/fire = 4, + /obj/item/stock_parts/scanning_module = 5, + /obj/item/stock_parts/micro_laser = 5, + /obj/item/stock_parts/matter_bin = 5, + /obj/item/stock_parts/manipulator = 5 + ) refill_canister = /obj/item/vending_refill/engineering default_price = PAYCHECK_EASY extra_price = PAYCHECK_COMMAND * 1.5 diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm index be50a0293d8..b3cb653afc6 100644 --- a/code/modules/vending/engivend.dm +++ b/code/modules/vending/engivend.dm @@ -4,21 +4,27 @@ icon_state = "engivend" icon_deny = "engivend-deny" req_access = list(ACCESS_ENGINE_EQUIP) - products = list(/obj/item/clothing/glasses/meson/engine = 2, - /obj/item/clothing/glasses/welding = 3, - /obj/item/multitool = 4, - /obj/item/grenade/chem_grenade/smart_metal_foam = 10, - /obj/item/geiger_counter = 5, - /obj/item/stock_parts/cell/high = 10, - /obj/item/electronics/airlock = 10, - /obj/item/electronics/apc = 10, - /obj/item/electronics/airalarm = 10, - /obj/item/electronics/firealarm = 10, - /obj/item/electronics/firelock = 10) - contraband = list(/obj/item/stock_parts/cell/potato = 3) - premium = list(/obj/item/storage/belt/utility = 3, - /obj/item/construction/rcd/loaded = 2, - /obj/item/storage/box/smart_metal_foam = 1) + products = list( + /obj/item/clothing/glasses/meson/engine = 2, + /obj/item/clothing/glasses/welding = 3, + /obj/item/multitool = 4, + /obj/item/grenade/chem_grenade/smart_metal_foam = 10, + /obj/item/geiger_counter = 5, + /obj/item/stock_parts/cell/high = 10, + /obj/item/electronics/airlock = 10, + /obj/item/electronics/apc = 10, + /obj/item/electronics/airalarm = 10, + /obj/item/electronics/firealarm = 10, + /obj/item/electronics/firelock = 10 + ) + contraband = list( + /obj/item/stock_parts/cell/potato = 3 + ) + premium = list( + /obj/item/storage/belt/utility = 3, + /obj/item/construction/rcd/loaded = 2, + /obj/item/storage/box/smart_metal_foam = 1 + ) refill_canister = /obj/item/vending_refill/engivend default_price = PAYCHECK_EASY extra_price = PAYCHECK_COMMAND * 1.5 diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm index 154c02f22be..b898dd87b01 100644 --- a/code/modules/vending/games.dm +++ b/code/modules/vending/games.dm @@ -3,35 +3,40 @@ desc = "Vends things that the Captain and Head of Personnel are probably not going to appreciate you fiddling with instead of your job..." product_ads = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!;Roll for initiative!;Elves and dwarves!;Paranoid computers!;Totally not satanic!;Fun times forever!" icon_state = "games" - products = list(/obj/item/toy/cards/deck = 5, - /obj/item/storage/dice = 10, - /obj/item/toy/cards/deck/cas = 3, - /obj/item/toy/cards/deck/cas/black = 3, - /obj/item/toy/cards/deck/kotahi = 3, - /obj/item/toy/cards/deck/tarot = 3, - /obj/item/toy/cards/deck/wizoff = 3, - /obj/item/hourglass = 2, - /obj/item/instrument/piano_synth/headphones = 4, - /obj/item/camera = 3, - /obj/item/cardpack/series_one = 10, - /obj/item/cardpack/resin = 10, - /obj/item/storage/card_binder = 10, - /obj/item/skillchip/basketweaving=2, - /obj/item/skillchip/bonsai=2, - /obj/item/skillchip/wine_taster=2, - /obj/item/skillchip/light_remover=2, - /obj/item/skillchip/useless_adapter=5, - /obj/item/dyespray=3, - /obj/item/razor=3, - ) - contraband = list(/obj/item/dice/fudge = 9, - /obj/item/clothing/shoes/wheelys/skishoes=4, - /obj/item/instrument/musicalmoth=1) - premium = list(/obj/item/melee/skateboard/pro = 3, - /obj/item/clothing/shoes/wheelys/rollerskates= 3, - /obj/item/melee/skateboard/hoverboard = 1, - /obj/item/storage/box/tail_pin = 1, - /obj/item/toy/intento = 3) + products = list( + /obj/item/toy/cards/deck = 5, + /obj/item/storage/dice = 10, + /obj/item/toy/cards/deck/cas = 3, + /obj/item/toy/cards/deck/cas/black = 3, + /obj/item/toy/cards/deck/kotahi = 3, + /obj/item/toy/cards/deck/tarot = 3, + /obj/item/toy/cards/deck/wizoff = 3, + /obj/item/hourglass = 2, + /obj/item/instrument/piano_synth/headphones = 4, + /obj/item/camera = 3, + /obj/item/cardpack/series_one = 10, + /obj/item/cardpack/resin = 10, + /obj/item/storage/card_binder = 10, + /obj/item/skillchip/basketweaving=2, + /obj/item/skillchip/bonsai=2, + /obj/item/skillchip/wine_taster=2, + /obj/item/skillchip/light_remover=2, + /obj/item/skillchip/useless_adapter=5, + /obj/item/dyespray=3, + /obj/item/razor=3, + ) + contraband = list( + /obj/item/dice/fudge = 9, + /obj/item/clothing/shoes/wheelys/skishoes=4, + /obj/item/instrument/musicalmoth=1 + ) + premium = list( + /obj/item/melee/skateboard/pro = 3, + /obj/item/clothing/shoes/wheelys/rollerskates= 3, + /obj/item/melee/skateboard/hoverboard = 1, + /obj/item/storage/box/tail_pin = 1, + /obj/item/toy/intento = 3 + ) refill_canister = /obj/item/vending_refill/games default_price = PAYCHECK_ASSISTANT extra_price = PAYCHECK_HARD * 1.25 diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm index f2848180c32..67790d1d543 100644 --- a/code/modules/vending/liberation.dm +++ b/code/modules/vending/liberation.dm @@ -5,27 +5,33 @@ product_slogans = "Liberation Station: Your one-stop shop for all things second amendment!;Be a patriot today, pick up a gun!;Quality weapons for cheap prices!;Better dead than red!" product_ads = "Float like an astronaut, sting like a bullet!;Express your second amendment today!;Guns don't kill people, but you can!;Who needs responsibilities when you have guns?" vend_reply = "Remember the name: Liberation Station!" - products = list(/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/gun/ballistic/automatic/pistol/deagle/gold = 2, - /obj/item/gun/ballistic/automatic/pistol/deagle/camo = 2, - /obj/item/gun/ballistic/automatic/pistol/m1911 = 2, - /obj/item/gun/ballistic/automatic/proto/unrestricted = 2, - /obj/item/gun/ballistic/shotgun/automatic/combat = 2, - /obj/item/gun/ballistic/automatic/gyropistol = 1, - /obj/item/gun/ballistic/shotgun = 2, - /obj/item/gun/ballistic/automatic/ar = 2) - premium = list(/obj/item/ammo_box/magazine/smgm9mm = 2, - /obj/item/ammo_box/magazine/m50 = 4, - /obj/item/ammo_box/magazine/m45 = 2, - /obj/item/ammo_box/magazine/m75 = 2, - /obj/item/food/cheesyfries = 5, - /obj/item/food/burger/baconburger = 5) //Premium burgers for the premium section - contraband = list(/obj/item/clothing/under/misc/patriotsuit = 3, - /obj/item/bedsheet/patriot = 5, - /obj/item/food/burger/superbite = 3) //U S A + products = list( + /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/gun/ballistic/automatic/pistol/deagle/gold = 2, + /obj/item/gun/ballistic/automatic/pistol/deagle/camo = 2, + /obj/item/gun/ballistic/automatic/pistol/m1911 = 2, + /obj/item/gun/ballistic/automatic/proto/unrestricted = 2, + /obj/item/gun/ballistic/shotgun/automatic/combat = 2, + /obj/item/gun/ballistic/automatic/gyropistol = 1, + /obj/item/gun/ballistic/shotgun = 2, + /obj/item/gun/ballistic/automatic/ar = 2 + ) + premium = list( + /obj/item/ammo_box/magazine/smgm9mm = 2, + /obj/item/ammo_box/magazine/m50 = 4, + /obj/item/ammo_box/magazine/m45 = 2, + /obj/item/ammo_box/magazine/m75 = 2, + /obj/item/food/cheesyfries = 5, + /obj/item/food/burger/baconburger = 5 //Premium burgers for the premium section + ) + contraband = list( + /obj/item/clothing/under/misc/patriotsuit = 3, + /obj/item/bedsheet/patriot = 5, + /obj/item/food/burger/superbite = 3 + ) //U S A armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50) resistance_flags = FIRE_PROOF default_price = PAYCHECK_HARD * 2.5 diff --git a/code/modules/vending/liberation_toy.dm b/code/modules/vending/liberation_toy.dm index d5c247c0a25..f1ac5ff49ca 100644 --- a/code/modules/vending/liberation_toy.dm +++ b/code/modules/vending/liberation_toy.dm @@ -6,22 +6,26 @@ product_ads = "Feel robust with your toys!;Express your inner child today!;Toy weapons don't kill people, but valid hunters do!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!" vend_reply = "Come back for more!" circuit = /obj/item/circuitboard/machine/vending/syndicatedonksofttoyvendor - products = list(/obj/item/gun/ballistic/automatic/toy/unrestricted = 10, - /obj/item/gun/ballistic/automatic/pistol/toy = 10, - /obj/item/gun/ballistic/shotgun/toy/unrestricted = 10, - /obj/item/toy/sword = 10, - /obj/item/ammo_box/foambox = 20, - /obj/item/toy/foamblade = 10, - /obj/item/toy/balloon/syndicate = 10, - /obj/item/clothing/suit/syndicatefake = 5, - /obj/item/clothing/head/syndicatefake = 5) //OPS IN DORMS oh wait it's just an assistant - contraband = list(/obj/item/gun/ballistic/shotgun/toy/crossbow = 10, //Congrats, you unlocked the +18 setting! - /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot = 10, - /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted/riot = 10, - /obj/item/ammo_box/foambox/riot = 20, - /obj/item/toy/katana = 10, - /obj/item/dualsaber/toy = 5, - /obj/item/toy/cards/deck/syndicate = 10) //Gambling and it hurts, making it a +18 item + products = list( + /obj/item/gun/ballistic/automatic/toy/unrestricted = 10, + /obj/item/gun/ballistic/automatic/pistol/toy = 10, + /obj/item/gun/ballistic/shotgun/toy/unrestricted = 10, + /obj/item/toy/sword = 10, + /obj/item/ammo_box/foambox = 20, + /obj/item/toy/foamblade = 10, + /obj/item/toy/balloon/syndicate = 10, + /obj/item/clothing/suit/syndicatefake = 5, + /obj/item/clothing/head/syndicatefake = 5 //OPS IN DORMS oh wait it's just an assistant + ) + contraband = list( + /obj/item/gun/ballistic/shotgun/toy/crossbow = 10, //Congrats, you unlocked the +18 setting! + /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot = 10, + /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted/riot = 10, + /obj/item/ammo_box/foambox/riot = 20, + /obj/item/toy/katana = 10, + /obj/item/dualsaber/toy = 5, + /obj/item/toy/cards/deck/syndicate = 10 //Gambling and it hurts, making it a +18 item + ) armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50) resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/donksoft diff --git a/code/modules/vending/magivend.dm b/code/modules/vending/magivend.dm index 894059f4a8a..8dd41a7bb29 100644 --- a/code/modules/vending/magivend.dm +++ b/code/modules/vending/magivend.dm @@ -5,14 +5,16 @@ product_slogans = "Sling spells the proper way with MagiVend!;Be your own Houdini! Use MagiVend!" vend_reply = "Have an enchanted evening!" product_ads = "FJKLFJSD;AJKFLBJAKL;1234 LOONIES LOL!;>MFW;Kill them fuckers!;GET DAT FUKKEN DISK;HONK!;EI NATH;Destroy the station!;Admin conspiracies since forever!;Space-time bending hardware!" - products = list(/obj/item/clothing/head/wizard = 1, - /obj/item/clothing/suit/wizrobe = 1, - /obj/item/clothing/head/wizard/red = 1, - /obj/item/clothing/suit/wizrobe/red = 1, - /obj/item/clothing/head/wizard/yellow = 1, - /obj/item/clothing/suit/wizrobe/yellow = 1, - /obj/item/clothing/shoes/sandal/magic = 1, - /obj/item/staff = 2) + products = list( + /obj/item/clothing/head/wizard = 1, + /obj/item/clothing/suit/wizrobe = 1, + /obj/item/clothing/head/wizard/red = 1, + /obj/item/clothing/suit/wizrobe/red = 1, + /obj/item/clothing/head/wizard/yellow = 1, + /obj/item/clothing/suit/wizrobe/yellow = 1, + /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 armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50) resistance_flags = FIRE_PROOF diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm index 231a9554a18..2d255d8e473 100644 --- a/code/modules/vending/medical.dm +++ b/code/modules/vending/medical.dm @@ -5,25 +5,31 @@ icon_deny = "med-deny" 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/stack/medical/gauze = 8, - /obj/item/reagent_containers/syringe = 12, - /obj/item/reagent_containers/dropper = 3, - /obj/item/healthanalyzer = 4, - /obj/item/wrench/medical = 1, - /obj/item/stack/sticky_tape/surgical = 3, - /obj/item/healthanalyzer/wound = 4, - /obj/item/stack/medical/ointment = 2, - /obj/item/stack/medical/suture = 2, - /obj/item/stack/medical/bone_gel/four = 4) - contraband = list(/obj/item/storage/box/gum/happiness = 3, - /obj/item/storage/box/hug/medical = 1) - premium = list(/obj/item/reagent_containers/hypospray/medipen = 3, - /obj/item/storage/belt/medical = 3, - /obj/item/sensor_device = 2, - /obj/item/pinpointer/crew = 2, - /obj/item/storage/firstaid/advanced = 2, - /obj/item/shears = 1, - /obj/item/storage/organbox = 1) + products = list( + /obj/item/stack/medical/gauze = 8, + /obj/item/reagent_containers/syringe = 12, + /obj/item/reagent_containers/dropper = 3, + /obj/item/healthanalyzer = 4, + /obj/item/wrench/medical = 1, + /obj/item/stack/sticky_tape/surgical = 3, + /obj/item/healthanalyzer/wound = 4, + /obj/item/stack/medical/ointment = 2, + /obj/item/stack/medical/suture = 2, + /obj/item/stack/medical/bone_gel/four = 4 + ) + contraband = list( + /obj/item/storage/box/gum/happiness = 3, + /obj/item/storage/box/hug/medical = 1 + ) + premium = list( + /obj/item/reagent_containers/hypospray/medipen = 3, + /obj/item/storage/belt/medical = 3, + /obj/item/sensor_device = 2, + /obj/item/pinpointer/crew = 2, + /obj/item/storage/firstaid/advanced = 2, + /obj/item/shears = 1, + /obj/item/storage/organbox = 1 + ) refill_canister = /obj/item/vending_refill/medical default_price = PAYCHECK_EASY extra_price = PAYCHECK_COMMAND @@ -62,8 +68,8 @@ /obj/item/reagent_containers/medigel/aiuri = 2, /obj/item/reagent_containers/medigel/sterilizine = 1) contraband = list(/obj/item/reagent_containers/pill/tox = 3, - /obj/item/reagent_containers/pill/morphine = 4, - /obj/item/reagent_containers/pill/multiver = 6) + /obj/item/reagent_containers/pill/morphine = 4, + /obj/item/reagent_containers/pill/multiver = 6) premium = list(/obj/item/reagent_containers/medigel/synthflesh = 2, /obj/item/storage/pill_bottle/psicodine = 2) default_price = 50 diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm index 77d1669b77f..c687a9793b1 100644 --- a/code/modules/vending/medical_wall.dm +++ b/code/modules/vending/medical_wall.dm @@ -4,18 +4,22 @@ icon_state = "wallmed" icon_deny = "wallmed-deny" density = FALSE - products = list(/obj/item/reagent_containers/syringe = 3, - /obj/item/reagent_containers/pill/patch/libital = 5, - /obj/item/reagent_containers/pill/patch/aiuri = 5, - /obj/item/reagent_containers/pill/multiver = 2, - /obj/item/reagent_containers/medigel/libital = 2, - /obj/item/reagent_containers/medigel/aiuri = 2, - /obj/item/reagent_containers/medigel/sterilizine = 1, - /obj/item/healthanalyzer/wound = 2, - /obj/item/stack/medical/bone_gel/four = 2) - contraband = list(/obj/item/reagent_containers/pill/tox = 2, - /obj/item/reagent_containers/pill/morphine = 2, - /obj/item/storage/box/gum/happiness = 1) + products = list( + /obj/item/reagent_containers/syringe = 3, + /obj/item/reagent_containers/pill/patch/libital = 5, + /obj/item/reagent_containers/pill/patch/aiuri = 5, + /obj/item/reagent_containers/pill/multiver = 2, + /obj/item/reagent_containers/medigel/libital = 2, + /obj/item/reagent_containers/medigel/aiuri = 2, + /obj/item/reagent_containers/medigel/sterilizine = 1, + /obj/item/healthanalyzer/wound = 2, + /obj/item/stack/medical/bone_gel/four = 2 + ) + contraband = list( + /obj/item/reagent_containers/pill/tox = 2, + /obj/item/reagent_containers/pill/morphine = 2, + /obj/item/storage/box/gum/happiness = 1 + ) refill_canister = /obj/item/vending_refill/wallmed default_price = PAYCHECK_HARD //Double the medical price due to being meant for public consumption, not player specfic extra_price = PAYCHECK_HARD * 1.5 diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm index 349b11d4a65..0f900ff91d4 100644 --- a/code/modules/vending/megaseed.dm +++ b/code/modules/vending/megaseed.dm @@ -5,56 +5,62 @@ product_ads = "We like plants!;Grow some crops!;Grow, baby, growww!;Aw h'yeah son!" icon_state = "seeds" light_mask = "seeds-light-mask" - products = list(/obj/item/seeds/aloe = 3, - /obj/item/seeds/ambrosia = 3, - /obj/item/seeds/apple = 3, - /obj/item/seeds/banana = 3, - /obj/item/seeds/berry = 3, - /obj/item/seeds/cabbage = 3, - /obj/item/seeds/carrot = 3, - /obj/item/seeds/cherry = 3, - /obj/item/seeds/chanter = 3, - /obj/item/seeds/chili = 3, - /obj/item/seeds/cocoapod = 3, - /obj/item/seeds/coffee = 3, - /obj/item/seeds/cotton = 3, - /obj/item/seeds/corn = 3, - /obj/item/seeds/eggplant = 3, - /obj/item/seeds/garlic = 3, - /obj/item/seeds/grape = 3, - /obj/item/seeds/grass = 3, - /obj/item/seeds/korta_nut = 3, - /obj/item/seeds/lemon = 3, - /obj/item/seeds/lime = 3, - /obj/item/seeds/onion = 3, - /obj/item/seeds/orange = 3, - /obj/item/seeds/peas = 3, - /obj/item/seeds/pineapple = 3, - /obj/item/seeds/potato = 3, - /obj/item/seeds/poppy = 3, - /obj/item/seeds/pumpkin = 3, - /obj/item/seeds/wheat/rice = 3, - /obj/item/seeds/rose = 3, - /obj/item/seeds/soya = 3, - /obj/item/seeds/sugarcane = 3, - /obj/item/seeds/sunflower = 3, - /obj/item/seeds/tea = 3, - /obj/item/seeds/tobacco = 3, - /obj/item/seeds/tomato = 3, - /obj/item/seeds/tower = 3, - /obj/item/seeds/watermelon = 3, - /obj/item/seeds/wheat = 3, - /obj/item/seeds/whitebeet = 3) - contraband = list(/obj/item/seeds/amanita = 2, - /obj/item/seeds/glowshroom = 2, - /obj/item/seeds/liberty = 2, - /obj/item/seeds/nettle = 2, - /obj/item/seeds/plump = 2, - /obj/item/seeds/reishi = 2, - /obj/item/seeds/cannabis = 3, - /obj/item/seeds/starthistle = 2, - /obj/item/seeds/random = 2) - premium = list(/obj/item/reagent_containers/spray/waterflower = 1) + products = list( + /obj/item/seeds/aloe = 3, + /obj/item/seeds/ambrosia = 3, + /obj/item/seeds/apple = 3, + /obj/item/seeds/banana = 3, + /obj/item/seeds/berry = 3, + /obj/item/seeds/cabbage = 3, + /obj/item/seeds/carrot = 3, + /obj/item/seeds/cherry = 3, + /obj/item/seeds/chanter = 3, + /obj/item/seeds/chili = 3, + /obj/item/seeds/cocoapod = 3, + /obj/item/seeds/coffee = 3, + /obj/item/seeds/cotton = 3, + /obj/item/seeds/corn = 3, + /obj/item/seeds/eggplant = 3, + /obj/item/seeds/garlic = 3, + /obj/item/seeds/grape = 3, + /obj/item/seeds/grass = 3, + /obj/item/seeds/korta_nut = 3, + /obj/item/seeds/lemon = 3, + /obj/item/seeds/lime = 3, + /obj/item/seeds/onion = 3, + /obj/item/seeds/orange = 3, + /obj/item/seeds/peas = 3, + /obj/item/seeds/pineapple = 3, + /obj/item/seeds/potato = 3, + /obj/item/seeds/poppy = 3, + /obj/item/seeds/pumpkin = 3, + /obj/item/seeds/wheat/rice = 3, + /obj/item/seeds/rose = 3, + /obj/item/seeds/soya = 3, + /obj/item/seeds/sugarcane = 3, + /obj/item/seeds/sunflower = 3, + /obj/item/seeds/tea = 3, + /obj/item/seeds/tobacco = 3, + /obj/item/seeds/tomato = 3, + /obj/item/seeds/tower = 3, + /obj/item/seeds/watermelon = 3, + /obj/item/seeds/wheat = 3, + /obj/item/seeds/whitebeet = 3 + ) + contraband = list( + /obj/item/seeds/amanita = 2, + /obj/item/seeds/glowshroom = 2, + /obj/item/seeds/liberty = 2, + /obj/item/seeds/nettle = 2, + /obj/item/seeds/plump = 2, + /obj/item/seeds/reishi = 2, + /obj/item/seeds/cannabis = 3, + /obj/item/seeds/starthistle = 2, + /obj/item/seeds/random = 2 + ) + premium = list( + /obj/item/reagent_containers/spray/waterflower = 1 + ) refill_canister = /obj/item/vending_refill/hydroseeds default_price = PAYCHECK_PRISONER extra_price = PAYCHECK_ASSISTANT diff --git a/code/modules/vending/modularpc.dm b/code/modules/vending/modularpc.dm index d18f6839c0e..8c5e632af1d 100644 --- a/code/modules/vending/modularpc.dm +++ b/code/modules/vending/modularpc.dm @@ -6,23 +6,27 @@ light_mask = "modular-light-mask" product_ads = "Get your gamer gear!;The best GPUs for all of your space-crypto needs!;The most robust cooling!;The finest RGB in space!" vend_reply = "Game on!" - products = list(/obj/item/modular_computer/laptop = 4, - /obj/item/modular_computer/tablet = 4, - /obj/item/computer_hardware/hard_drive = 4, - /obj/item/computer_hardware/hard_drive/small = 4, - /obj/item/computer_hardware/network_card = 8, - /obj/item/computer_hardware/hard_drive/portable = 8, - /obj/item/computer_hardware/battery = 8, - /obj/item/stock_parts/cell/computer = 8, - /obj/item/computer_hardware/processor_unit = 4, - /obj/item/computer_hardware/processor_unit/small = 4, - /obj/item/computer_hardware/sensorpackage = 4) - premium = list(/obj/item/computer_hardware/card_slot = 2, - /obj/item/computer_hardware/ai_slot = 2, - /obj/item/computer_hardware/printer/mini = 2, - /obj/item/computer_hardware/recharger/apc_recharger = 2, - /obj/item/paicard = 2, - /obj/item/computer_hardware/radio_card = 1) + products = list( + /obj/item/modular_computer/laptop = 4, + /obj/item/modular_computer/tablet = 4, + /obj/item/computer_hardware/hard_drive = 4, + /obj/item/computer_hardware/hard_drive/small = 4, + /obj/item/computer_hardware/network_card = 8, + /obj/item/computer_hardware/hard_drive/portable = 8, + /obj/item/computer_hardware/battery = 8, + /obj/item/stock_parts/cell/computer = 8, + /obj/item/computer_hardware/processor_unit = 4, + /obj/item/computer_hardware/processor_unit/small = 4, + /obj/item/computer_hardware/sensorpackage = 4 + ) + premium = list( + /obj/item/computer_hardware/card_slot = 2, + /obj/item/computer_hardware/ai_slot = 2, + /obj/item/computer_hardware/printer/mini = 2, + /obj/item/computer_hardware/recharger/apc_recharger = 2, + /obj/item/paicard = 2, + /obj/item/computer_hardware/radio_card = 1 + ) refill_canister = /obj/item/vending_refill/modularpc default_price = PAYCHECK_MEDIUM extra_price = PAYCHECK_HARD diff --git a/code/modules/vending/nutrimax.dm b/code/modules/vending/nutrimax.dm index ef5d663ce2f..5b2c1e8e54d 100644 --- a/code/modules/vending/nutrimax.dm +++ b/code/modules/vending/nutrimax.dm @@ -6,18 +6,22 @@ icon_state = "nutri" icon_deny = "nutri-deny" light_mask = "nutri-light-mask" - products = list(/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/spray/pestspray = 20, - /obj/item/reagent_containers/syringe = 5, - /obj/item/storage/bag/plants = 5, - /obj/item/cultivator = 3, - /obj/item/shovel/spade = 3, - /obj/item/secateurs = 3, - /obj/item/plant_analyzer = 4) - contraband = list(/obj/item/reagent_containers/glass/bottle/ammonia = 10, - /obj/item/reagent_containers/glass/bottle/diethylamine = 5) + products = list( + /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/spray/pestspray = 20, + /obj/item/reagent_containers/syringe = 5, + /obj/item/storage/bag/plants = 5, + /obj/item/cultivator = 3, + /obj/item/shovel/spade = 3, + /obj/item/secateurs = 3, + /obj/item/plant_analyzer = 4 + ) + contraband = list( + /obj/item/reagent_containers/glass/bottle/ammonia = 10, + /obj/item/reagent_containers/glass/bottle/diethylamine = 5 + ) refill_canister = /obj/item/vending_refill/hydronutrients default_price = PAYCHECK_ASSISTANT * 0.8 extra_price = PAYCHECK_HARD * 0.8 diff --git a/code/modules/vending/plasmaresearch.dm b/code/modules/vending/plasmaresearch.dm index 75d09f64c50..dfad6d3ffd8 100644 --- a/code/modules/vending/plasmaresearch.dm +++ b/code/modules/vending/plasmaresearch.dm @@ -2,14 +2,16 @@ /obj/machinery/vending/plasmaresearch name = "\improper Bombuddy 3000" desc = "All the fine parts you need in one vending machine!" - products = list(/obj/item/clothing/under/rank/rnd/scientist = 6, - /obj/item/clothing/suit/bio_suit = 6, - /obj/item/clothing/head/bio_hood = 6, - /obj/item/transfer_valve = 6, - /obj/item/assembly/timer = 6, - /obj/item/assembly/signaler = 6, - /obj/item/assembly/prox_sensor = 6, - /obj/item/assembly/igniter = 6) + products = list( + /obj/item/clothing/under/rank/rnd/scientist = 6, + /obj/item/clothing/suit/bio_suit = 6, + /obj/item/clothing/head/bio_hood = 6, + /obj/item/transfer_valve = 6, + /obj/item/assembly/timer = 6, + /obj/item/assembly/signaler = 6, + /obj/item/assembly/prox_sensor = 6, + /obj/item/assembly/igniter = 6 + ) contraband = list(/obj/item/assembly/health = 3) default_price = PAYCHECK_ASSISTANT extra_price = PAYCHECK_ASSISTANT diff --git a/code/modules/vending/robotics.dm b/code/modules/vending/robotics.dm index 7430530037b..a626a8a53f7 100644 --- a/code/modules/vending/robotics.dm +++ b/code/modules/vending/robotics.dm @@ -6,21 +6,23 @@ icon_deny = "robotics-deny" light_mask = "robotics-light-mask" req_access = list(ACCESS_ROBOTICS) - products = list(/obj/item/clothing/suit/toggle/labcoat = 4, - /obj/item/clothing/under/rank/rnd/roboticist = 4, - /obj/item/stack/cable_coil = 4, - /obj/item/assembly/flash/handheld = 4, - /obj/item/stock_parts/cell/high = 12, - /obj/item/assembly/prox_sensor = 3, - /obj/item/assembly/signaler = 3, - /obj/item/healthanalyzer = 3, - /obj/item/scalpel = 2, - /obj/item/circular_saw = 2, - /obj/item/bonesetter = 2, - /obj/item/tank/internals/anesthetic = 2, - /obj/item/clothing/mask/breath/medical = 5, - /obj/item/screwdriver = 5, - /obj/item/crowbar = 5) + products = list( + /obj/item/clothing/suit/toggle/labcoat = 4, + /obj/item/clothing/under/rank/rnd/roboticist = 4, + /obj/item/stack/cable_coil = 4, + /obj/item/assembly/flash/handheld = 4, + /obj/item/stock_parts/cell/high = 12, + /obj/item/assembly/prox_sensor = 3, + /obj/item/assembly/signaler = 3, + /obj/item/healthanalyzer = 3, + /obj/item/scalpel = 2, + /obj/item/circular_saw = 2, + /obj/item/bonesetter = 2, + /obj/item/tank/internals/anesthetic = 2, + /obj/item/clothing/mask/breath/medical = 5, + /obj/item/screwdriver = 5, + /obj/item/crowbar = 5 + ) refill_canister = /obj/item/vending_refill/robotics default_price = PAYCHECK_HARD payment_department = ACCOUNT_SCI diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index d642f27dae4..12cda45ae98 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -6,23 +6,29 @@ icon_deny = "sec-deny" light_mask = "sec-light-mask" req_access = list(ACCESS_SECURITY) - products = list(/obj/item/restraints/handcuffs = 8, - /obj/item/restraints/handcuffs/cable/zipties = 10, - /obj/item/grenade/flashbang = 4, - /obj/item/assembly/flash/handheld = 5, - /obj/item/food/donut = 12, - /obj/item/storage/box/evidence = 6, - /obj/item/flashlight/seclite = 4, - /obj/item/restraints/legcuffs/bola/energy = 7) - contraband = list(/obj/item/clothing/glasses/sunglasses = 2, - /obj/item/storage/fancy/donut_box = 2) - premium = list(/obj/item/storage/belt/security/webbing = 5, - /obj/item/coin/antagtoken = 1, - /obj/item/clothing/head/helmet/blueshirt = 1, - /obj/item/clothing/suit/armor/vest/blueshirt = 1, - /obj/item/clothing/gloves/tackler = 5, - /obj/item/grenade/stingbang = 1, - /obj/item/watertank/pepperspray = 2) + products = list( + /obj/item/restraints/handcuffs = 8, + /obj/item/restraints/handcuffs/cable/zipties = 10, + /obj/item/grenade/flashbang = 4, + /obj/item/assembly/flash/handheld = 5, + /obj/item/food/donut = 12, + /obj/item/storage/box/evidence = 6, + /obj/item/flashlight/seclite = 4, + /obj/item/restraints/legcuffs/bola/energy = 7 + ) + contraband = list( + /obj/item/clothing/glasses/sunglasses = 2, + /obj/item/storage/fancy/donut_box = 2 + ) + premium = list( + /obj/item/storage/belt/security/webbing = 5, + /obj/item/coin/antagtoken = 1, + /obj/item/clothing/head/helmet/blueshirt = 1, + /obj/item/clothing/suit/armor/vest/blueshirt = 1, + /obj/item/clothing/gloves/tackler = 5, + /obj/item/grenade/stingbang = 1, + /obj/item/watertank/pepperspray = 2 + ) refill_canister = /obj/item/vending_refill/security default_price = PAYCHECK_MEDIUM extra_price = PAYCHECK_HARD * 1.5 diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm index 0160dbe2916..bdb84f4b576 100644 --- a/code/modules/vending/snack.dm +++ b/code/modules/vending/snack.dm @@ -5,23 +5,29 @@ 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!" icon_state = "snack" light_mask = "snack-light-mask" - products = list(/obj/item/food/spacetwinkie = 6, - /obj/item/food/cheesiehonkers = 6, - /obj/item/food/candy = 6, - /obj/item/food/chips = 6, - /obj/item/food/chips/shrimp = 6, - /obj/item/food/sosjerky = 6, - /obj/item/food/no_raisin = 6, - /obj/item/food/peanuts = 6, - /obj/item/food/peanuts/random = 3, - /obj/item/food/cnds = 6, - /obj/item/food/cnds/random = 3, - /obj/item/reagent_containers/food/drinks/dry_ramen = 3, - /obj/item/storage/box/gum = 3, - /obj/item/food/energybar = 6) - contraband = list(/obj/item/food/syndicake = 6, - /obj/item/food/peanuts/ban_appeal = 3, - /obj/item/food/candy/bronx = 1) + products = list( + /obj/item/food/spacetwinkie = 6, + /obj/item/food/cheesiehonkers = 6, + /obj/item/food/candy = 6, + /obj/item/food/chips = 6, + /obj/item/food/chips/shrimp = 6, + /obj/item/food/sosjerky = 6, + /obj/item/food/chips = 6, + /obj/item/food/sosjerky = 6, + /obj/item/food/no_raisin = 6, + /obj/item/food/peanuts = 6, + /obj/item/food/peanuts/random = 3, + /obj/item/food/cnds = 6, + /obj/item/food/cnds/random = 3, + /obj/item/reagent_containers/food/drinks/dry_ramen = 3, + /obj/item/storage/box/gum = 3, + /obj/item/food/energybar = 6 + ) + contraband = list( + /obj/item/food/syndicake = 6, + /obj/item/food/peanuts/ban_appeal = 3, + /obj/item/food/candy/bronx = 1 + ) refill_canister = /obj/item/vending_refill/snack canload_access_list = list(ACCESS_KITCHEN) default_price = PAYCHECK_ASSISTANT * 0.6 diff --git a/code/modules/vending/sovietsoda.dm b/code/modules/vending/sovietsoda.dm index 61bba546b41..e17fae563ba 100644 --- a/code/modules/vending/sovietsoda.dm +++ b/code/modules/vending/sovietsoda.dm @@ -4,8 +4,12 @@ icon_state = "sovietsoda" 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) - contraband = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola = 20) + products = list( + /obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda = 30 + ) + contraband = list( + /obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola = 20 + ) resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/sovietsoda default_price = 1 diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm index fa55857fb78..68057189d18 100644 --- a/code/modules/vending/toys.dm +++ b/code/modules/vending/toys.dm @@ -16,13 +16,15 @@ /obj/item/toy/foamblade = 10, /obj/item/toy/balloon/syndicate = 10, /obj/item/clothing/suit/syndicatefake = 5, - /obj/item/clothing/head/syndicatefake = 5) + /obj/item/clothing/head/syndicatefake = 5 + ) contraband = list( /obj/item/gun/ballistic/shotgun/toy/crossbow = 10, /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted = 10, /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted = 10, /obj/item/toy/katana = 10, - /obj/item/dualsaber/toy = 5) + /obj/item/dualsaber/toy = 5 + ) refill_canister = /obj/item/vending_refill/donksoft default_price = PAYCHECK_ASSISTANT extra_price = PAYCHECK_HARD diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 40920ba4edd..6637b00d882 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -437,14 +437,16 @@ icon_state = "genedrobe" product_ads = "Perfect for the mad scientist in you!" vend_reply = "Thank you for using the GeneDrobe!" - products = list(/obj/item/clothing/under/rank/rnd/geneticist = 2, - /obj/item/clothing/under/rank/rnd/geneticist/skirt = 2, - /obj/item/clothing/shoes/sneakers/white = 2, - /obj/item/clothing/suit/toggle/labcoat/genetics = 2, - /obj/item/clothing/suit/hooded/wintercoat/science/genetics = 2, - /obj/item/storage/backpack/genetics = 2, - /obj/item/storage/backpack/satchel/gen = 2, - /obj/item/storage/backpack/duffelbag/genetics = 2) + products = list( + /obj/item/clothing/under/rank/rnd/geneticist = 2, + /obj/item/clothing/under/rank/rnd/geneticist/skirt = 2, + /obj/item/clothing/shoes/sneakers/white = 2, + /obj/item/clothing/suit/toggle/labcoat/genetics = 2, + /obj/item/clothing/suit/hooded/wintercoat/science/genetics = 2, + /obj/item/storage/backpack/genetics = 2, + /obj/item/storage/backpack/satchel/gen = 2, + /obj/item/storage/backpack/duffelbag/genetics = 2 + ) refill_canister = /obj/item/vending_refill/wardrobe/gene_wardrobe payment_department = ACCOUNT_SCI /obj/item/vending_refill/wardrobe/gene_wardrobe diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm index e064226e927..dbde97ec64b 100644 --- a/code/modules/vending/youtool.dm +++ b/code/modules/vending/youtool.dm @@ -4,24 +4,30 @@ icon_state = "tool" icon_deny = "tool-deny" light_mask = "tool-light-mask" - products = list(/obj/item/stack/cable_coil = 10, - /obj/item/crowbar = 5, - /obj/item/weldingtool = 3, - /obj/item/wirecutters = 5, - /obj/item/wrench = 5, - /obj/item/analyzer = 5, - /obj/item/t_scanner = 5, - /obj/item/screwdriver = 5, - /obj/item/flashlight/glowstick = 3, - /obj/item/flashlight/glowstick/red = 3, - /obj/item/flashlight = 5, - /obj/item/clothing/ears/earmuffs = 1) - contraband = list(/obj/item/clothing/gloves/color/fyellow = 2) - premium = list(/obj/item/storage/belt/utility = 2, - /obj/item/multitool = 2, - /obj/item/weldingtool/hugetank = 2, - /obj/item/clothing/head/welding = 2, - /obj/item/clothing/gloves/color/yellow = 1) + products = list( + /obj/item/stack/cable_coil = 10, + /obj/item/crowbar = 5, + /obj/item/weldingtool = 3, + /obj/item/wirecutters = 5, + /obj/item/wrench = 5, + /obj/item/analyzer = 5, + /obj/item/t_scanner = 5, + /obj/item/screwdriver = 5, + /obj/item/flashlight/glowstick = 3, + /obj/item/flashlight/glowstick/red = 3, + /obj/item/flashlight = 5, + /obj/item/clothing/ears/earmuffs = 1 + ) + contraband = list( + /obj/item/clothing/gloves/color/fyellow = 2 + ) + premium = list( + /obj/item/storage/belt/utility = 2, + /obj/item/multitool = 2, + /obj/item/weldingtool/hugetank = 2, + /obj/item/clothing/head/welding = 2, + /obj/item/clothing/gloves/color/yellow = 1 + ) refill_canister = /obj/item/vending_refill/youtool default_price = PAYCHECK_ASSISTANT extra_price = PAYCHECK_COMMAND * 1.5