diff --git a/code/modules/vending/assist.dm b/code/modules/vending/assist.dm index 07f0d24476f..f4694ca83cd 100644 --- a/code/modules/vending/assist.dm +++ b/code/modules/vending/assist.dm @@ -5,28 +5,28 @@ icon_deny = "parts-deny" panel_type = "panel10" products = list( - /obj/item/assembly/prox_sensor = 5, /obj/item/assembly/igniter = 3, + /obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, - /obj/item/wirecutters = 1, /obj/item/computer_hardware/hard_drive/portable/ordnance = 4, - /obj/item/stock_parts/matter_bin = 3, + /obj/item/stock_parts/capacitor = 3, /obj/item/stock_parts/manipulator = 3, + /obj/item/stock_parts/matter_bin = 3, /obj/item/stock_parts/micro_laser = 3, /obj/item/stock_parts/scanning_module = 3, - /obj/item/stock_parts/capacitor = 3 + /obj/item/wirecutters = 1, ) contraband = list( + /obj/item/assembly/health = 2, /obj/item/assembly/timer = 2, /obj/item/assembly/voice = 2, - /obj/item/assembly/health = 2, - /obj/item/stock_parts/cell/high = 1 + /obj/item/stock_parts/cell/high = 1, ) premium = list( + /obj/item/assembly/igniter/condenser = 2, + /obj/item/circuitboard/machine/vendor = 3, /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 diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index e753e94dbc2..60870a5acab 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -145,7 +145,7 @@ /obj/item/gun/magic/wand/nothing = 2, /obj/item/clothing/glasses/sunglasses/gar = 2, /obj/item/clothing/glasses/blindfold = 1, - /obj/item/clothing/mask/muzzle = 2 + /obj/item/clothing/mask/muzzle = 2, ) premium = list( /obj/item/clothing/suit/pirate/captain = 2, @@ -163,7 +163,7 @@ /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 + /obj/item/storage/belt/cummerbund = 1, ) refill_canister = /obj/item/vending_refill/autodrobe default_price = PAYCHECK_CREW * 0.8 //Default of 40. diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 5a4691de741..2b3acb7f0dd 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -40,7 +40,7 @@ /obj/item/reagent_containers/food/drinks/bottle/sake = 5, /obj/item/reagent_containers/food/drinks/bottle/applejack = 5, /obj/item/reagent_containers/food/drinks/bottle = 15, - /obj/item/reagent_containers/food/drinks/bottle/small = 15 + /obj/item/reagent_containers/food/drinks/bottle/small = 15, ) contraband = list( /obj/item/reagent_containers/food/drinks/mug/tea = 12, diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm index 13183e5618b..620e0cbbdf6 100644 --- a/code/modules/vending/cigarette.dm +++ b/code/modules/vending/cigarette.dm @@ -14,10 +14,10 @@ /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 + /obj/item/storage/fancy/rollingpapers = 5, ) contraband = list( - /obj/item/clothing/mask/vape = 5 + /obj/item/clothing/mask/vape = 5, ) premium = list( /obj/item/storage/fancy/cigarettes/cigpack_robustgold = 3, @@ -25,7 +25,7 @@ /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 + /obj/item/storage/fancy/cigarettes/cigars/cohiba = 1, ) refill_canister = /obj/item/vending_refill/cigarette @@ -44,7 +44,7 @@ /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/item/storage/fancy/rollingpapers = 5, ) /obj/machinery/vending/cigarette/beach //Used in the lavaland_biodome_beach.dmm ruin @@ -61,12 +61,12 @@ /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 + /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/lighter = 3, ) /obj/item/vending_refill/cigarette diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 358ea734e18..5a1e9591e62 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -95,8 +95,8 @@ /obj/item/clothing/accessory/waistcoat = 1, /obj/item/clothing/head/that = 1, /obj/item/clothing/head/fedora = 1, - /obj/item/clothing/head/cowboy_hat_white =1, - /obj/item/clothing/head/cowboy_hat_grey =1, + /obj/item/clothing/head/cowboy_hat_white = 1, + /obj/item/clothing/head/cowboy_hat_grey = 1, /obj/item/clothing/glasses/monocle = 1, /obj/item/clothing/head/sombrero = 1, /obj/item/clothing/suit/poncho = 1, @@ -193,7 +193,7 @@ /obj/item/clothing/under/costume/jabroni = 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 + /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, @@ -205,7 +205,7 @@ /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/instrument/piano_synth/headphones/spacepods = 1, ) refill_canister = /obj/item/vending_refill/clothing default_price = PAYCHECK_CREW * 0.7 //Default of diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm index 9a879390a1c..ccbe3221ac7 100644 --- a/code/modules/vending/coffee.dm +++ b/code/modules/vending/coffee.dm @@ -8,10 +8,10 @@ products = list( /obj/item/reagent_containers/food/drinks/coffee = 6, /obj/item/reagent_containers/food/drinks/mug/tea = 6, - /obj/item/reagent_containers/food/drinks/mug/coco = 3 + /obj/item/reagent_containers/food/drinks/mug/coco = 3, ) contraband = list( - /obj/item/reagent_containers/food/drinks/ice = 12 + /obj/item/reagent_containers/food/drinks/ice = 12, ) refill_canister = /obj/item/vending_refill/coffee default_price = PAYCHECK_LOWER diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index 06cd4c4f322..d03e77d7b0a 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -16,18 +16,18 @@ /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10, /obj/item/reagent_containers/food/drinks/waterbottle = 10, - /obj/item/reagent_containers/food/drinks/bottle/mushi_kombucha = 3 + /obj/item/reagent_containers/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 + /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, - /obj/item/reagent_containers/food/drinks/bottle/rootbeer = 1 + /obj/item/reagent_containers/food/drinks/bottle/rootbeer = 1, ) refill_canister = /obj/item/vending_refill/cola default_price = PAYCHECK_CREW * 0.7 @@ -91,15 +91,17 @@ name = "\improper Shambler's Vendor" desc = "~Shake me up some of that Shambler's Juice!~" icon_state = "shamblers_juice" - products = list(/obj/item/reagent_containers/food/drinks/soda_cans/cola = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 10) + products = list( + /obj/item/reagent_containers/food/drinks/soda_cans/cola = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 10, + ) product_slogans = "~Shake me up some of that Shambler's Juice!~" product_ads = "Refreshing!;Jyrbv dv lg jfdv fw kyrk Jyrdscvi'j Alztv!;Over 1 trillion souls drank!;Thirsty? Nyp efk uizeb kyv uribevjj?;Kyv Jyrdscvi uizebj kyv ezxyk!;Drink up!;Krjkp." light_mask = "shamblers-light-mask" diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm index 947d8645d68..a2690ec5be2 100644 --- a/code/modules/vending/drinnerware.dm +++ b/code/modules/vending/drinnerware.dm @@ -21,7 +21,7 @@ /obj/item/book/granter/crafting_recipe/cooking_sweets_101 = 2, /obj/item/plate/small = 5, /obj/item/plate = 10, - /obj/item/plate/large = 5 + /obj/item/plate/large = 5, ) contraband = list( /obj/item/kitchen/rollingpin = 2, diff --git a/code/modules/vending/engineering.dm b/code/modules/vending/engineering.dm index dc8705ddbe5..baedc8203fb 100644 --- a/code/modules/vending/engineering.dm +++ b/code/modules/vending/engineering.dm @@ -28,7 +28,7 @@ /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 + /obj/item/stock_parts/manipulator = 5, ) refill_canister = /obj/item/vending_refill/engineering default_price = PAYCHECK_CREW diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm index f92935c30d0..ce7e1bf12bd 100644 --- a/code/modules/vending/engivend.dm +++ b/code/modules/vending/engivend.dm @@ -16,15 +16,15 @@ /obj/item/electronics/apc = 10, /obj/item/electronics/airalarm = 10, /obj/item/electronics/firealarm = 10, - /obj/item/electronics/firelock = 10 + /obj/item/electronics/firelock = 10, ) contraband = list( - /obj/item/stock_parts/cell/potato = 3 + /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 + /obj/item/storage/box/smart_metal_foam = 1, ) refill_canister = /obj/item/vending_refill/engivend default_price = PAYCHECK_CREW diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm index 4839620c8cb..aa06f18c8ba 100644 --- a/code/modules/vending/games.dm +++ b/code/modules/vending/games.dm @@ -24,13 +24,13 @@ /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, + /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, /obj/item/canvas/nineteen_nineteen = 5, /obj/item/canvas/twentythree_nineteen = 5, /obj/item/canvas/twentythree_twentythree = 5, @@ -39,8 +39,8 @@ ) contraband = list( /obj/item/dice/fudge = 9, - /obj/item/clothing/shoes/wheelys/skishoes=4, - /obj/item/instrument/musicalmoth=1 + /obj/item/clothing/shoes/wheelys/skishoes = 4, + /obj/item/instrument/musicalmoth = 1, ) premium = list( /obj/item/disk/holodisk = 5, diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm index 6fa86ac40d8..c90b5655da4 100644 --- a/code/modules/vending/liberation.dm +++ b/code/modules/vending/liberation.dm @@ -18,7 +18,7 @@ /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 + /obj/item/gun/ballistic/automatic/ar = 2, ) premium = list( /obj/item/ammo_box/magazine/smgm9mm = 2, @@ -26,12 +26,12 @@ /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 + /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 + /obj/item/food/burger/superbite = 3, ) //U S A armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, FIRE = 100, ACID = 50) resistance_flags = FIRE_PROOF diff --git a/code/modules/vending/liberation_toy.dm b/code/modules/vending/liberation_toy.dm index da07477efc9..2b37f4aacf4 100644 --- a/code/modules/vending/liberation_toy.dm +++ b/code/modules/vending/liberation_toy.dm @@ -16,7 +16,7 @@ /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 + /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! @@ -25,7 +25,7 @@ /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 + /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, FIRE = 100, ACID = 50) resistance_flags = FIRE_PROOF diff --git a/code/modules/vending/magivend.dm b/code/modules/vending/magivend.dm index 8494a5d0e50..0cd87dc93f1 100644 --- a/code/modules/vending/magivend.dm +++ b/code/modules/vending/magivend.dm @@ -14,7 +14,7 @@ /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 + /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, FIRE = 100, ACID = 50) diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm index 5baf3720018..ed0a4a58ef9 100644 --- a/code/modules/vending/medical.dm +++ b/code/modules/vending/medical.dm @@ -16,11 +16,11 @@ /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 + /obj/item/stack/medical/bone_gel/four = 4, ) contraband = list( /obj/item/storage/box/gum/happiness = 3, - /obj/item/storage/box/hug/medical = 1 + /obj/item/storage/box/hug/medical = 1, ) premium = list( /obj/item/reagent_containers/hypospray/medipen = 3, @@ -29,7 +29,7 @@ /obj/item/pinpointer/crew = 2, /obj/item/storage/medkit/advanced = 2, /obj/item/shears = 1, - /obj/item/storage/organbox = 1 + /obj/item/storage/organbox = 1, ) refill_canister = /obj/item/vending_refill/medical default_price = PAYCHECK_CREW @@ -54,26 +54,32 @@ panel_type = "panel11" 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/reagent_containers/pill/patch/libital = 5, - /obj/item/reagent_containers/pill/patch/aiuri = 5, - /obj/item/reagent_containers/syringe/convermol = 2, - /obj/item/reagent_containers/pill/insulin = 5, - /obj/item/reagent_containers/glass/bottle/multiver = 2, - /obj/item/reagent_containers/glass/bottle/syriniver = 2, - /obj/item/reagent_containers/glass/bottle/epinephrine = 3, - /obj/item/reagent_containers/glass/bottle/morphine = 4, - /obj/item/reagent_containers/glass/bottle/potass_iodide = 1, - /obj/item/reagent_containers/glass/bottle/salglu_solution = 3, - /obj/item/reagent_containers/glass/bottle/toxin = 3, - /obj/item/reagent_containers/syringe/antiviral = 6, - /obj/item/reagent_containers/medigel/libital = 2, - /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) - premium = list(/obj/item/reagent_containers/medigel/synthflesh = 2, - /obj/item/storage/pill_bottle/psicodine = 2) + products = list( + /obj/item/reagent_containers/pill/patch/libital = 5, + /obj/item/reagent_containers/pill/patch/aiuri = 5, + /obj/item/reagent_containers/syringe/convermol = 2, + /obj/item/reagent_containers/pill/insulin = 5, + /obj/item/reagent_containers/glass/bottle/multiver = 2, + /obj/item/reagent_containers/glass/bottle/syriniver = 2, + /obj/item/reagent_containers/glass/bottle/epinephrine = 3, + /obj/item/reagent_containers/glass/bottle/morphine = 4, + /obj/item/reagent_containers/glass/bottle/potass_iodide = 1, + /obj/item/reagent_containers/glass/bottle/salglu_solution = 3, + /obj/item/reagent_containers/glass/bottle/toxin = 3, + /obj/item/reagent_containers/syringe/antiviral = 6, + /obj/item/reagent_containers/medigel/libital = 2, + /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, + ) + premium = list( + /obj/item/reagent_containers/medigel/synthflesh = 2, + /obj/item/storage/pill_bottle/psicodine = 2, + ) default_price = 50 extra_price = 100 payment_department = ACCOUNT_MED diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm index ca47032510e..c9b3e663ba6 100644 --- a/code/modules/vending/medical_wall.dm +++ b/code/modules/vending/medical_wall.dm @@ -14,12 +14,12 @@ /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 + /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 + /obj/item/storage/box/gum/happiness = 1, ) refill_canister = /obj/item/vending_refill/wallmed default_price = PAYCHECK_COMMAND //Double the medical price due to being meant for public consumption, not player specfic diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm index 81e9ad965e8..d9ca3c40bc8 100644 --- a/code/modules/vending/megaseed.dm +++ b/code/modules/vending/megaseed.dm @@ -50,7 +50,7 @@ /obj/item/seeds/tower = 3, /obj/item/seeds/watermelon = 3, /obj/item/seeds/wheat = 3, - /obj/item/seeds/whitebeet = 3 + /obj/item/seeds/whitebeet = 3, ) contraband = list( /obj/item/seeds/amanita = 2, @@ -61,10 +61,10 @@ /obj/item/seeds/reishi = 2, /obj/item/seeds/cannabis = 3, /obj/item/seeds/starthistle = 2, - /obj/item/seeds/random = 2 + /obj/item/seeds/random = 2, ) premium = list( - /obj/item/reagent_containers/spray/waterflower = 1 + /obj/item/reagent_containers/spray/waterflower = 1, ) refill_canister = /obj/item/vending_refill/hydroseeds default_price = PAYCHECK_LOWER diff --git a/code/modules/vending/modularpc.dm b/code/modules/vending/modularpc.dm index a2affcbb0c9..1e35339044b 100644 --- a/code/modules/vending/modularpc.dm +++ b/code/modules/vending/modularpc.dm @@ -8,18 +8,18 @@ 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/portable = 8, /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/modular_computer/laptop = 4, + /obj/item/modular_computer/tablet = 4, /obj/item/stock_parts/cell/computer = 8, ) premium = list( - /obj/item/computer_hardware/card_slot = 2, /obj/item/computer_hardware/ai_slot = 2, + /obj/item/computer_hardware/card_slot = 2, /obj/item/computer_hardware/printer/mini = 2, /obj/item/computer_hardware/recharger/apc_recharger = 2, /obj/item/paicard = 2, diff --git a/code/modules/vending/nutrimax.dm b/code/modules/vending/nutrimax.dm index 247d734816e..24f8e3ee206 100644 --- a/code/modules/vending/nutrimax.dm +++ b/code/modules/vending/nutrimax.dm @@ -8,20 +8,20 @@ panel_type = "panel2" light_mask = "nutri-light-mask" products = list( + /obj/item/cultivator = 3, + /obj/item/plant_analyzer = 4, /obj/item/reagent_containers/glass/bottle/nutrient/ez = 30, /obj/item/reagent_containers/glass/bottle/nutrient/l4z = 20, /obj/item/reagent_containers/glass/bottle/nutrient/rh = 10, /obj/item/reagent_containers/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 + /obj/item/shovel/spade = 3, + /obj/item/storage/bag/plants = 5, ) contraband = list( /obj/item/reagent_containers/glass/bottle/ammonia = 10, - /obj/item/reagent_containers/glass/bottle/diethylamine = 5 + /obj/item/reagent_containers/glass/bottle/diethylamine = 5, ) refill_canister = /obj/item/vending_refill/hydronutrients default_price = PAYCHECK_CREW * 0.8 diff --git a/code/modules/vending/plasmaresearch.dm b/code/modules/vending/plasmaresearch.dm index 44e33b3601d..fbe8f00dcde 100644 --- a/code/modules/vending/plasmaresearch.dm +++ b/code/modules/vending/plasmaresearch.dm @@ -3,14 +3,14 @@ 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/igniter = 6, /obj/item/assembly/prox_sensor = 6, - /obj/item/assembly/igniter = 6 + /obj/item/assembly/signaler = 6, + /obj/item/assembly/timer = 6, + /obj/item/clothing/head/bio_hood = 6, + /obj/item/clothing/suit/bio_suit = 6, + /obj/item/clothing/under/rank/rnd/scientist = 6, + /obj/item/transfer_valve = 6, ) contraband = list(/obj/item/assembly/health = 3) default_price = PAYCHECK_CREW diff --git a/code/modules/vending/robotics.dm b/code/modules/vending/robotics.dm index 8a4145c27ac..30bf8543d50 100644 --- a/code/modules/vending/robotics.dm +++ b/code/modules/vending/robotics.dm @@ -22,7 +22,7 @@ /obj/item/tank/internals/anesthetic = 2, /obj/item/clothing/mask/breath/medical = 5, /obj/item/screwdriver = 5, - /obj/item/crowbar = 5 + /obj/item/crowbar = 5, ) refill_canister = /obj/item/vending_refill/robotics default_price = PAYCHECK_COMMAND diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index de38e8a46d7..f7eb0a3d150 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -15,11 +15,11 @@ /obj/item/food/donut/plain = 12, /obj/item/storage/box/evidence = 6, /obj/item/flashlight/seclite = 4, - /obj/item/restraints/legcuffs/bola/energy = 7 + /obj/item/restraints/legcuffs/bola/energy = 7, ) contraband = list( /obj/item/clothing/glasses/sunglasses = 2, - /obj/item/storage/fancy/donut_box = 2 + /obj/item/storage/fancy/donut_box = 2, ) premium = list( /obj/item/storage/belt/security/webbing = 5, @@ -28,7 +28,7 @@ /obj/item/clothing/suit/armor/vest/blueshirt = 1, /obj/item/clothing/gloves/tackler = 5, /obj/item/grenade/stingbang = 1, - /obj/item/watertank/pepperspray = 2 + /obj/item/watertank/pepperspray = 2, ) refill_canister = /obj/item/vending_refill/security default_price = PAYCHECK_CREW diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm index 26a35ba9b60..2dbf5070e60 100644 --- a/code/modules/vending/snack.dm +++ b/code/modules/vending/snack.dm @@ -23,16 +23,16 @@ /obj/item/food/semki = 6, /obj/item/reagent_containers/food/drinks/dry_ramen = 3, /obj/item/storage/box/gum = 3, - /obj/item/food/energybar = 6 + /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 + /obj/item/food/candy/bronx = 1, ) premium = list( /obj/item/food/spacers_sidekick = 3, - /obj/item/food/pistachios = 3 + /obj/item/food/pistachios = 3, ) refill_canister = /obj/item/vending_refill/snack canload_access_list = list(ACCESS_KITCHEN) diff --git a/code/modules/vending/sovietsoda.dm b/code/modules/vending/sovietsoda.dm index 6ab78fc3dee..5779841aff3 100644 --- a/code/modules/vending/sovietsoda.dm +++ b/code/modules/vending/sovietsoda.dm @@ -6,10 +6,10 @@ light_mask = "soviet-light-mask" product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem." products = list( - /obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda = 30 + /obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda = 30, ) contraband = list( - /obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola = 20 + /obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola = 20, ) resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/sovietsoda diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm index 89a82159cf2..d969c25a750 100644 --- a/code/modules/vending/toys.dm +++ b/code/modules/vending/toys.dm @@ -17,14 +17,14 @@ /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_CREW diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index e3b298191ed..d98bcada55d 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -15,23 +15,27 @@ icon_state = "secdrobe" product_ads = "Beat perps in style!;It's red so you can't see the blood!;You have the right to be fashionable!;Now you can be the fashion police you always wanted to be!" vend_reply = "Thank you for using the SecDrobe!" - products = list(/obj/item/clothing/suit/hooded/wintercoat/security = 3, - /obj/item/storage/backpack/security = 3, - /obj/item/storage/backpack/satchel/sec = 3, - /obj/item/storage/backpack/duffelbag/sec = 3, - /obj/item/clothing/under/rank/security/officer = 3, - /obj/item/clothing/shoes/jackboots = 3, - /obj/item/clothing/head/beret/sec = 3, - /obj/item/clothing/head/soft/sec = 3, - /obj/item/clothing/mask/bandana/striped/security = 3, - /obj/item/clothing/gloves/color/black = 3, - /obj/item/clothing/under/rank/security/officer/skirt = 3, - /obj/item/clothing/under/rank/security/officer/grey = 3, - /obj/item/clothing/under/pants/khaki = 3, - /obj/item/clothing/under/rank/security/officer/blueshirt = 3) - premium = list(/obj/item/clothing/under/rank/security/officer/formal = 3, - /obj/item/clothing/suit/security/officer = 3, - /obj/item/clothing/head/beret/sec/navyofficer = 3) + products = list( + /obj/item/clothing/suit/hooded/wintercoat/security = 3, + /obj/item/storage/backpack/security = 3, + /obj/item/storage/backpack/satchel/sec = 3, + /obj/item/storage/backpack/duffelbag/sec = 3, + /obj/item/clothing/under/rank/security/officer = 3, + /obj/item/clothing/shoes/jackboots = 3, + /obj/item/clothing/head/beret/sec = 3, + /obj/item/clothing/head/soft/sec = 3, + /obj/item/clothing/mask/bandana/striped/security = 3, + /obj/item/clothing/gloves/color/black = 3, + /obj/item/clothing/under/rank/security/officer/skirt = 3, + /obj/item/clothing/under/rank/security/officer/grey = 3, + /obj/item/clothing/under/pants/khaki = 3, + /obj/item/clothing/under/rank/security/officer/blueshirt = 3, + ) + premium = list( + /obj/item/clothing/under/rank/security/officer/formal = 3, + /obj/item/clothing/suit/security/officer = 3, + /obj/item/clothing/head/beret/sec/navyofficer = 3, + ) refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe payment_department = ACCOUNT_SEC light_color = COLOR_MOSTLY_PURE_RED @@ -45,30 +49,32 @@ icon_state = "medidrobe" product_ads = "Make those blood stains look fashionable!!" vend_reply = "Thank you for using the MediDrobe!" - products = list(/obj/item/clothing/accessory/pocketprotector = 4, - /obj/item/storage/backpack/duffelbag/med = 4, - /obj/item/storage/backpack/medic = 4, - /obj/item/storage/backpack/satchel/med = 4, - /obj/item/clothing/suit/hooded/wintercoat/medical = 4, - /obj/item/clothing/suit/hooded/wintercoat/medical/paramedic = 4, - /obj/item/clothing/under/rank/medical/paramedic = 4, - /obj/item/clothing/under/rank/medical/paramedic/skirt = 4, - /obj/item/clothing/head/nursehat = 4, - /obj/item/clothing/head/beret/medical = 4, - /obj/item/clothing/mask/bandana/striped/medical = 4, - /obj/item/clothing/under/rank/medical/doctor = 4, - /obj/item/clothing/under/rank/medical/doctor/skirt = 4, - /obj/item/clothing/under/rank/medical/scrubs/blue = 4, - /obj/item/clothing/under/rank/medical/scrubs/green = 4, - /obj/item/clothing/under/rank/medical/scrubs/purple = 4, - /obj/item/clothing/suit/toggle/labcoat = 4, - /obj/item/clothing/suit/toggle/labcoat/paramedic = 4, - /obj/item/clothing/shoes/sneakers/white = 4, - /obj/item/clothing/head/beret/medical/paramedic = 4, - /obj/item/clothing/head/soft/paramedic = 4, - /obj/item/clothing/shoes/sneakers/blue = 4, - /obj/item/clothing/suit/apron/surgical = 4, - /obj/item/clothing/mask/surgical = 4) + products = list( + /obj/item/clothing/accessory/pocketprotector = 4, + /obj/item/storage/backpack/duffelbag/med = 4, + /obj/item/storage/backpack/medic = 4, + /obj/item/storage/backpack/satchel/med = 4, + /obj/item/clothing/suit/hooded/wintercoat/medical = 4, + /obj/item/clothing/suit/hooded/wintercoat/medical/paramedic = 4, + /obj/item/clothing/under/rank/medical/paramedic = 4, + /obj/item/clothing/under/rank/medical/paramedic/skirt = 4, + /obj/item/clothing/head/nursehat = 4, + /obj/item/clothing/head/beret/medical = 4, + /obj/item/clothing/mask/bandana/striped/medical = 4, + /obj/item/clothing/under/rank/medical/doctor = 4, + /obj/item/clothing/under/rank/medical/doctor/skirt = 4, + /obj/item/clothing/under/rank/medical/scrubs/blue = 4, + /obj/item/clothing/under/rank/medical/scrubs/green = 4, + /obj/item/clothing/under/rank/medical/scrubs/purple = 4, + /obj/item/clothing/suit/toggle/labcoat = 4, + /obj/item/clothing/suit/toggle/labcoat/paramedic = 4, + /obj/item/clothing/shoes/sneakers/white = 4, + /obj/item/clothing/head/beret/medical/paramedic = 4, + /obj/item/clothing/head/soft/paramedic = 4, + /obj/item/clothing/shoes/sneakers/blue = 4, + /obj/item/clothing/suit/apron/surgical = 4, + /obj/item/clothing/mask/surgical = 4, + ) refill_canister = /obj/item/vending_refill/wardrobe/medi_wardrobe payment_department = ACCOUNT_MED @@ -81,20 +87,22 @@ icon_state = "engidrobe" product_ads = "Guaranteed to protect your feet from industrial accidents!;Afraid of radiation? Then wear yellow!" vend_reply = "Thank you for using the EngiDrobe!" - products = list(/obj/item/clothing/accessory/pocketprotector = 3, - /obj/item/storage/backpack/duffelbag/engineering = 3, - /obj/item/storage/backpack/industrial = 3, - /obj/item/storage/backpack/satchel/eng = 3, - /obj/item/clothing/suit/hooded/wintercoat/engineering = 3, - /obj/item/clothing/under/rank/engineering/engineer = 3, - /obj/item/clothing/under/rank/engineering/engineer/skirt = 3, - /obj/item/clothing/under/rank/engineering/engineer/hazard = 3, - /obj/item/clothing/suit/hazardvest = 3, - /obj/item/clothing/shoes/workboots = 3, - /obj/item/clothing/head/beret/engi = 3, - /obj/item/clothing/mask/bandana/striped/engineering = 3, - /obj/item/clothing/head/hardhat = 3, - /obj/item/clothing/head/hardhat/weldhat = 3) + products = list( + /obj/item/clothing/accessory/pocketprotector = 3, + /obj/item/storage/backpack/duffelbag/engineering = 3, + /obj/item/storage/backpack/industrial = 3, + /obj/item/storage/backpack/satchel/eng = 3, + /obj/item/clothing/suit/hooded/wintercoat/engineering = 3, + /obj/item/clothing/under/rank/engineering/engineer = 3, + /obj/item/clothing/under/rank/engineering/engineer/skirt = 3, + /obj/item/clothing/under/rank/engineering/engineer/hazard = 3, + /obj/item/clothing/suit/hazardvest = 3, + /obj/item/clothing/shoes/workboots = 3, + /obj/item/clothing/head/beret/engi = 3, + /obj/item/clothing/mask/bandana/striped/engineering = 3, + /obj/item/clothing/head/hardhat = 3, + /obj/item/clothing/head/hardhat/weldhat = 3, + ) refill_canister = /obj/item/vending_refill/wardrobe/engi_wardrobe payment_department = ACCOUNT_ENG light_color = COLOR_VIVID_YELLOW @@ -108,15 +116,17 @@ icon_state = "atmosdrobe" product_ads = "Get your inflammable clothing right here!!!" vend_reply = "Thank you for using the AtmosDrobe!" - products = list(/obj/item/clothing/accessory/pocketprotector = 2, - /obj/item/storage/backpack/duffelbag/engineering = 2, - /obj/item/storage/backpack/satchel/eng = 2, - /obj/item/storage/backpack/industrial = 2, - /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3, - /obj/item/clothing/under/rank/engineering/atmospheric_technician = 3, - /obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt = 3, - /obj/item/clothing/head/beret/atmos = 3, - /obj/item/clothing/shoes/sneakers/black = 3) + products = list( + /obj/item/clothing/accessory/pocketprotector = 2, + /obj/item/storage/backpack/duffelbag/engineering = 2, + /obj/item/storage/backpack/satchel/eng = 2, + /obj/item/storage/backpack/industrial = 2, + /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3, + /obj/item/clothing/under/rank/engineering/atmospheric_technician = 3, + /obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt = 3, + /obj/item/clothing/head/beret/atmos = 3, + /obj/item/clothing/shoes/sneakers/black = 3, + ) refill_canister = /obj/item/vending_refill/wardrobe/atmos_wardrobe payment_department = ACCOUNT_ENG light_color = COLOR_VIVID_YELLOW @@ -140,12 +150,12 @@ /obj/item/clothing/head/beret/cargo = 3, /obj/item/clothing/mask/bandana/striped/cargo = 3, /obj/item/clothing/head/soft = 3, - /obj/item/radio/headset/headset_cargo = 3 + /obj/item/radio/headset/headset_cargo = 3, ) premium = list( /obj/item/clothing/under/rank/cargo/miner = 3, /obj/item/clothing/head/mailman = 1, - /obj/item/clothing/under/misc/mailman = 1 + /obj/item/clothing/under/misc/mailman = 1, ) refill_canister = /obj/item/vending_refill/wardrobe/cargo_wardrobe payment_department = ACCOUNT_CAR @@ -159,18 +169,22 @@ icon_state = "robodrobe" product_ads = "You turn me TRUE, use defines!;0110001101101100011011110111010001101000011001010111001101101000011001010111001001100101" vend_reply = "Thank you for using the RoboDrobe!" - products = list(/obj/item/clothing/glasses/hud/diagnostic = 2, - /obj/item/clothing/under/rank/rnd/roboticist = 2, - /obj/item/clothing/under/rank/rnd/roboticist/skirt = 2, - /obj/item/clothing/suit/toggle/labcoat/roboticist = 2, - /obj/item/clothing/suit/hooded/wintercoat/science/robotics = 3, - /obj/item/clothing/shoes/sneakers/black = 2, - /obj/item/clothing/gloves/fingerless = 2, - /obj/item/clothing/head/soft/black = 2, - /obj/item/clothing/mask/bandana/skull/black = 2) - contraband = list(/obj/item/clothing/suit/hooded/techpriest = 2, - /obj/item/clothing/under/costume/mech_suit = 2, - /obj/item/organ/tongue/robot = 2) + products = list( + /obj/item/clothing/glasses/hud/diagnostic = 2, + /obj/item/clothing/under/rank/rnd/roboticist = 2, + /obj/item/clothing/under/rank/rnd/roboticist/skirt = 2, + /obj/item/clothing/suit/toggle/labcoat/roboticist = 2, + /obj/item/clothing/suit/hooded/wintercoat/science/robotics = 3, + /obj/item/clothing/shoes/sneakers/black = 2, + /obj/item/clothing/gloves/fingerless = 2, + /obj/item/clothing/head/soft/black = 2, + /obj/item/clothing/mask/bandana/skull/black = 2, + ) + contraband = list( + /obj/item/clothing/suit/hooded/techpriest = 2, + /obj/item/clothing/under/costume/mech_suit = 2, + /obj/item/organ/tongue/robot = 2, + ) refill_canister = /obj/item/vending_refill/wardrobe/robo_wardrobe extra_price = PAYCHECK_COMMAND * 1.2 payment_department = ACCOUNT_SCI @@ -183,20 +197,22 @@ icon_state = "scidrobe" product_ads = "Longing for the smell of plasma burnt flesh? Buy your science clothing now!;Made with 10% Auxetics, so you don't have to worry about losing your arm!" vend_reply = "Thank you for using the SciDrobe!" - products = list(/obj/item/clothing/accessory/pocketprotector = 3, - /obj/item/storage/backpack/science = 3, - /obj/item/storage/backpack/satchel/science = 3, - /obj/item/storage/backpack/duffelbag/science = 3, - /obj/item/clothing/head/beret/science = 3, - /obj/item/clothing/head/beret/science/fancy = 3, - /obj/item/clothing/mask/bandana/striped/science = 3, - /obj/item/clothing/suit/hooded/wintercoat/science = 3, - /obj/item/clothing/under/rank/rnd/scientist = 3, - /obj/item/clothing/under/rank/rnd/scientist/skirt = 3, - /obj/item/clothing/suit/toggle/labcoat/science = 3, - /obj/item/clothing/shoes/sneakers/white = 3, - /obj/item/radio/headset/headset_sci = 3, - /obj/item/clothing/mask/gas = 3) + products = list( + /obj/item/clothing/accessory/pocketprotector = 3, + /obj/item/storage/backpack/science = 3, + /obj/item/storage/backpack/satchel/science = 3, + /obj/item/storage/backpack/duffelbag/science = 3, + /obj/item/clothing/head/beret/science = 3, + /obj/item/clothing/head/beret/science/fancy = 3, + /obj/item/clothing/mask/bandana/striped/science = 3, + /obj/item/clothing/suit/hooded/wintercoat/science = 3, + /obj/item/clothing/under/rank/rnd/scientist = 3, + /obj/item/clothing/under/rank/rnd/scientist/skirt = 3, + /obj/item/clothing/suit/toggle/labcoat/science = 3, + /obj/item/clothing/shoes/sneakers/white = 3, + /obj/item/radio/headset/headset_sci = 3, + /obj/item/clothing/mask/gas = 3, + ) refill_canister = /obj/item/vending_refill/wardrobe/science_wardrobe payment_department = ACCOUNT_SCI /obj/item/vending_refill/wardrobe/science_wardrobe @@ -208,17 +224,19 @@ icon_state = "hydrobe" product_ads = "Do you love soil? Then buy our clothes!;Get outfits to match your green thumb here!" vend_reply = "Thank you for using the Hydrobe!" - products = list(/obj/item/storage/backpack/botany = 2, - /obj/item/storage/backpack/satchel/hyd = 2, - /obj/item/storage/backpack/duffelbag/hydroponics = 2, - /obj/item/clothing/suit/hooded/wintercoat/hydro = 2, - /obj/item/clothing/suit/apron = 2, - /obj/item/clothing/suit/apron/overalls = 3, - /obj/item/clothing/suit/apron/waders = 3, - /obj/item/clothing/under/rank/civilian/hydroponics = 3, - /obj/item/clothing/under/rank/civilian/hydroponics/skirt = 3, - /obj/item/clothing/mask/bandana/striped/botany = 3, - /obj/item/clothing/accessory/armband/hydro = 3) + products = list( + /obj/item/storage/backpack/botany = 2, + /obj/item/storage/backpack/satchel/hyd = 2, + /obj/item/storage/backpack/duffelbag/hydroponics = 2, + /obj/item/clothing/suit/hooded/wintercoat/hydro = 2, + /obj/item/clothing/suit/apron = 2, + /obj/item/clothing/suit/apron/overalls = 3, + /obj/item/clothing/suit/apron/waders = 3, + /obj/item/clothing/under/rank/civilian/hydroponics = 3, + /obj/item/clothing/under/rank/civilian/hydroponics/skirt = 3, + /obj/item/clothing/mask/bandana/striped/botany = 3, + /obj/item/clothing/accessory/armband/hydro = 3, + ) refill_canister = /obj/item/vending_refill/wardrobe/hydro_wardrobe payment_department = ACCOUNT_SRV light_color = LIGHT_COLOR_ELECTRIC_GREEN @@ -232,22 +250,24 @@ icon_state = "curadrobe" product_ads = "Glasses for your eyes and literature for your soul, Curadrobe has it all!; Impress & enthrall your library guests with Curadrobe's extended line of pens!" vend_reply = "Thank you for using the CuraDrobe!" - products = list(/obj/item/pen = 4, - /obj/item/pen/red = 2, - /obj/item/pen/blue = 2, - /obj/item/pen/fourcolor = 1, - /obj/item/pen/fountain = 2, - /obj/item/clothing/accessory/pocketprotector = 2, - /obj/item/clothing/under/rank/civilian/curator = 1, - /obj/item/clothing/under/rank/civilian/curator/skirt = 1, - /obj/item/clothing/under/rank/captain/suit = 1, - /obj/item/clothing/under/rank/captain/suit/skirt = 1, - /obj/item/clothing/under/rank/civilian/head_of_personnel/suit = 1, - /obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 1, - /obj/item/storage/backpack/satchel/explorer = 1, - /obj/item/clothing/glasses/regular = 2, - /obj/item/clothing/glasses/regular/jamjar = 1, - /obj/item/storage/bag/books = 1) + products = list( + /obj/item/pen = 4, + /obj/item/pen/red = 2, + /obj/item/pen/blue = 2, + /obj/item/pen/fourcolor = 1, + /obj/item/pen/fountain = 2, + /obj/item/clothing/accessory/pocketprotector = 2, + /obj/item/clothing/under/rank/civilian/curator = 1, + /obj/item/clothing/under/rank/civilian/curator/skirt = 1, + /obj/item/clothing/under/rank/captain/suit = 1, + /obj/item/clothing/under/rank/captain/suit/skirt = 1, + /obj/item/clothing/under/rank/civilian/head_of_personnel/suit = 1, + /obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 1, + /obj/item/storage/backpack/satchel/explorer = 1, + /obj/item/clothing/glasses/regular = 2, + /obj/item/clothing/glasses/regular/jamjar = 1, + /obj/item/storage/bag/books = 1. + ) refill_canister = /obj/item/vending_refill/wardrobe/curator_wardrobe payment_department = ACCOUNT_SRV /obj/item/vending_refill/wardrobe/curator_wardrobe @@ -259,26 +279,30 @@ icon_state = "bardrobe" product_ads = "Guaranteed to prevent stains from spilled drinks!" vend_reply = "Thank you for using the BarDrobe!" - products = list(/obj/item/clothing/head/that = 2, - /obj/item/radio/headset/headset_srv = 2, - /obj/item/clothing/under/suit/sl = 2, - /obj/item/clothing/under/rank/civilian/bartender = 2, - /obj/item/clothing/under/rank/civilian/bartender/purple = 2, - /obj/item/clothing/under/rank/civilian/bartender/skirt = 2, - /obj/item/clothing/accessory/waistcoat = 2, - /obj/item/clothing/suit/apron/purple_bartender = 2, - /obj/item/clothing/head/soft/black = 2, - /obj/item/clothing/shoes/sneakers/black = 2, - /obj/item/reagent_containers/glass/rag = 2, - /obj/item/storage/box/beanbag = 1, - /obj/item/clothing/suit/armor/vest/alt = 1, - /obj/item/circuitboard/machine/dish_drive = 1, - /obj/item/clothing/glasses/sunglasses/reagent = 1, - /obj/item/clothing/neck/petcollar = 1, - /obj/item/storage/belt/bandolier = 1, - /obj/item/storage/dice/hazard = 1, - /obj/item/storage/bag/money = 2) - premium = list(/obj/item/storage/box/dishdrive = 1) + products = list( + /obj/item/clothing/head/that = 2, + /obj/item/radio/headset/headset_srv = 2, + /obj/item/clothing/under/suit/sl = 2, + /obj/item/clothing/under/rank/civilian/bartender = 2, + /obj/item/clothing/under/rank/civilian/bartender/purple = 2, + /obj/item/clothing/under/rank/civilian/bartender/skirt = 2, + /obj/item/clothing/accessory/waistcoat = 2, + /obj/item/clothing/suit/apron/purple_bartender = 2, + /obj/item/clothing/head/soft/black = 2, + /obj/item/clothing/shoes/sneakers/black = 2, + /obj/item/reagent_containers/glass/rag = 2, + /obj/item/storage/box/beanbag = 1, + /obj/item/clothing/suit/armor/vest/alt = 1, + /obj/item/circuitboard/machine/dish_drive = 1, + /obj/item/clothing/glasses/sunglasses/reagent = 1, + /obj/item/clothing/neck/petcollar = 1, + /obj/item/storage/belt/bandolier = 1, + /obj/item/storage/dice/hazard = 1, + /obj/item/storage/bag/money = 2, + ) + premium = list( + /obj/item/storage/box/dishdrive = 1, + ) refill_canister = /obj/item/vending_refill/wardrobe/bar_wardrobe payment_department = ACCOUNT_SRV extra_price = PAYCHECK_COMMAND @@ -291,21 +315,23 @@ icon_state = "chefdrobe" product_ads = "Our clothes are guaranteed to protect you from food splatters!" vend_reply = "Thank you for using the ChefDrobe!" - products = list(/obj/item/clothing/under/suit/waiter = 2, - /obj/item/radio/headset/headset_srv = 2, - /obj/item/clothing/accessory/waistcoat = 2, - /obj/item/clothing/suit/apron/chef = 3, - /obj/item/clothing/head/soft/mime = 2, - /obj/item/storage/box/mousetraps = 2, - /obj/item/circuitboard/machine/dish_drive = 1, - /obj/item/clothing/suit/toggle/chef = 1, - /obj/item/clothing/under/rank/civilian/chef = 1, - /obj/item/clothing/under/rank/civilian/chef/skirt = 2, - /obj/item/clothing/head/chefhat = 1, - /obj/item/clothing/under/rank/civilian/cookjorts = 2, - /obj/item/clothing/shoes/cookflops = 2, - /obj/item/reagent_containers/glass/rag = 1, - /obj/item/clothing/suit/hooded/wintercoat = 2) + products = list( + /obj/item/clothing/under/suit/waiter = 2, + /obj/item/radio/headset/headset_srv = 2, + /obj/item/clothing/accessory/waistcoat = 2, + /obj/item/clothing/suit/apron/chef = 3, + /obj/item/clothing/head/soft/mime = 2, + /obj/item/storage/box/mousetraps = 2, + /obj/item/circuitboard/machine/dish_drive = 1, + /obj/item/clothing/suit/toggle/chef = 1, + /obj/item/clothing/under/rank/civilian/chef = 1, + /obj/item/clothing/under/rank/civilian/chef/skirt = 2, + /obj/item/clothing/head/chefhat = 1, + /obj/item/clothing/under/rank/civilian/cookjorts = 2, + /obj/item/clothing/shoes/cookflops = 2, + /obj/item/reagent_containers/glass/rag = 1, + /obj/item/clothing/suit/hooded/wintercoat = 2, + ) refill_canister = /obj/item/vending_refill/wardrobe/chef_wardrobe payment_department = ACCOUNT_SRV /obj/item/vending_refill/wardrobe/chef_wardrobe @@ -317,24 +343,26 @@ icon_state = "janidrobe" product_ads = "Come and get your janitorial clothing, now endorsed by lizard janitors everywhere!" vend_reply = "Thank you for using the JaniDrobe!" - products = list(/obj/item/clothing/under/rank/civilian/janitor = 2, - /obj/item/clothing/under/rank/civilian/janitor/skirt = 2, - /obj/item/clothing/suit/hooded/wintercoat/janitor = 2, - /obj/item/clothing/gloves/color/black = 2, - /obj/item/clothing/head/soft/purple = 2, - /obj/item/clothing/mask/bandana/purple = 2, - /obj/item/pushbroom = 2, - /obj/item/paint/paint_remover = 2, - /obj/item/melee/flyswatter = 2, - /obj/item/flashlight = 2, - /obj/item/clothing/suit/caution = 6, - /obj/item/holosign_creator = 2, - /obj/item/lightreplacer = 2, - /obj/item/soap/nanotrasen = 2, - /obj/item/storage/bag/trash = 2, - /obj/item/clothing/shoes/galoshes = 2, - /obj/item/watertank/janitor = 1, - /obj/item/storage/belt/janitor = 2) + products = list( + /obj/item/clothing/under/rank/civilian/janitor = 2, + /obj/item/clothing/under/rank/civilian/janitor/skirt = 2, + /obj/item/clothing/suit/hooded/wintercoat/janitor = 2, + /obj/item/clothing/gloves/color/black = 2, + /obj/item/clothing/head/soft/purple = 2, + /obj/item/clothing/mask/bandana/purple = 2, + /obj/item/pushbroom = 2, + /obj/item/paint/paint_remover = 2, + /obj/item/melee/flyswatter = 2, + /obj/item/flashlight = 2, + /obj/item/clothing/suit/caution = 6, + /obj/item/holosign_creator = 2, + /obj/item/lightreplacer = 2, + /obj/item/soap/nanotrasen = 2, + /obj/item/storage/bag/trash = 2, + /obj/item/clothing/shoes/galoshes = 2, + /obj/item/watertank/janitor = 1, + /obj/item/storage/belt/janitor = 2, + ) refill_canister = /obj/item/vending_refill/wardrobe/jani_wardrobe default_price = PAYCHECK_CREW extra_price = PAYCHECK_COMMAND * 0.8 @@ -350,27 +378,29 @@ icon_state = "lawdrobe" product_ads = "OBJECTION! Get the rule of law for yourself!" vend_reply = "Thank you for using the LawDrobe!" - products = list(/obj/item/clothing/under/rank/civilian/lawyer/bluesuit = 1, - /obj/item/clothing/under/rank/civilian/lawyer/bluesuit/skirt = 1, - /obj/item/clothing/suit/toggle/lawyer = 1, - /obj/item/clothing/under/rank/civilian/lawyer/purpsuit = 1, - /obj/item/clothing/under/rank/civilian/lawyer/purpsuit/skirt = 1, - /obj/item/clothing/suit/toggle/lawyer/purple = 1, - /obj/item/clothing/under/suit/black = 1, - /obj/item/clothing/under/suit/black/skirt = 1, - /obj/item/clothing/suit/toggle/lawyer/black = 1, - /obj/item/clothing/under/rank/civilian/lawyer/beige = 1, - /obj/item/clothing/under/rank/civilian/lawyer/beige/skirt = 1, - /obj/item/clothing/under/suit/black_really = 1, - /obj/item/clothing/under/suit/black_really/skirt = 1, - /obj/item/clothing/under/rank/civilian/lawyer/blue = 1, - /obj/item/clothing/under/rank/civilian/lawyer/blue/skirt = 1, - /obj/item/clothing/under/rank/civilian/lawyer/red = 1, - /obj/item/clothing/under/rank/civilian/lawyer/red/skirt = 1, - /obj/item/clothing/under/rank/civilian/lawyer/black = 1, - /obj/item/clothing/under/rank/civilian/lawyer/black/skirt = 1, - /obj/item/clothing/shoes/laceup = 2, - /obj/item/clothing/accessory/lawyers_badge = 2) + products = list( + /obj/item/clothing/under/rank/civilian/lawyer/bluesuit = 1, + /obj/item/clothing/under/rank/civilian/lawyer/bluesuit/skirt = 1, + /obj/item/clothing/suit/toggle/lawyer = 1, + /obj/item/clothing/under/rank/civilian/lawyer/purpsuit = 1, + /obj/item/clothing/under/rank/civilian/lawyer/purpsuit/skirt = 1, + /obj/item/clothing/suit/toggle/lawyer/purple = 1, + /obj/item/clothing/under/suit/black = 1, + /obj/item/clothing/under/suit/black/skirt = 1, + /obj/item/clothing/suit/toggle/lawyer/black = 1, + /obj/item/clothing/under/rank/civilian/lawyer/beige = 1, + /obj/item/clothing/under/rank/civilian/lawyer/beige/skirt = 1, + /obj/item/clothing/under/suit/black_really = 1, + /obj/item/clothing/under/suit/black_really/skirt = 1, + /obj/item/clothing/under/rank/civilian/lawyer/blue = 1, + /obj/item/clothing/under/rank/civilian/lawyer/blue/skirt = 1, + /obj/item/clothing/under/rank/civilian/lawyer/red = 1, + /obj/item/clothing/under/rank/civilian/lawyer/red/skirt = 1, + /obj/item/clothing/under/rank/civilian/lawyer/black = 1, + /obj/item/clothing/under/rank/civilian/lawyer/black/skirt = 1, + /obj/item/clothing/shoes/laceup = 2, + /obj/item/clothing/accessory/lawyers_badge = 2, + ) refill_canister = /obj/item/vending_refill/wardrobe/law_wardrobe payment_department = ACCOUNT_SRV /obj/item/vending_refill/wardrobe/law_wardrobe @@ -382,30 +412,36 @@ icon_state = "chapdrobe" product_ads = "Are you being bothered by cultists or pesky revenants? Then come and dress like the holy man!;Clothes for men of the cloth!" vend_reply = "Thank you for using the DeusVend!" - products = list(/obj/item/choice_beacon/holy = 1, - /obj/item/storage/backpack/cultpack = 1, - /obj/item/clothing/accessory/pocketprotector/cosmetology = 1, - /obj/item/clothing/under/rank/civilian/chaplain = 1, - /obj/item/clothing/under/rank/civilian/chaplain/skirt = 2, - /obj/item/clothing/shoes/sneakers/black = 1, - /obj/item/clothing/suit/chaplainsuit/nun = 1, - /obj/item/clothing/head/nun_hood = 1, - /obj/item/clothing/suit/chaplainsuit/holidaypriest = 1, - /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit = 1, - /obj/item/storage/fancy/candle_box = 2, - /obj/item/clothing/head/kippah = 3, - /obj/item/clothing/suit/chaplainsuit/whiterobe = 1, - /obj/item/clothing/head/taqiyahwhite = 1, - /obj/item/clothing/head/taqiyahred = 3, - /obj/item/clothing/suit/chaplainsuit/monkrobeeast = 1, - /obj/item/clothing/head/beanie/rasta = 1) - contraband = list(/obj/item/toy/plush/ratplush = 1, - /obj/item/toy/plush/narplush = 1, - /obj/item/clothing/head/medievaljewhat = 3, - /obj/item/clothing/suit/chaplainsuit/clownpriest = 1, - /obj/item/clothing/head/clownmitre = 1) - premium = list(/obj/item/clothing/suit/chaplainsuit/bishoprobe = 1, - /obj/item/clothing/head/bishopmitre = 1) + products = list( + /obj/item/choice_beacon/holy = 1, + /obj/item/storage/backpack/cultpack = 1, + /obj/item/clothing/accessory/pocketprotector/cosmetology = 1, + /obj/item/clothing/under/rank/civilian/chaplain = 1, + /obj/item/clothing/under/rank/civilian/chaplain/skirt = 2, + /obj/item/clothing/shoes/sneakers/black = 1, + /obj/item/clothing/suit/chaplainsuit/nun = 1, + /obj/item/clothing/head/nun_hood = 1, + /obj/item/clothing/suit/chaplainsuit/holidaypriest = 1, + /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit = 1, + /obj/item/storage/fancy/candle_box = 2, + /obj/item/clothing/head/kippah = 3, + /obj/item/clothing/suit/chaplainsuit/whiterobe = 1, + /obj/item/clothing/head/taqiyahwhite = 1, + /obj/item/clothing/head/taqiyahred = 3, + /obj/item/clothing/suit/chaplainsuit/monkrobeeast = 1, + /obj/item/clothing/head/beanie/rasta = 1, + ) + contraband = list( + /obj/item/toy/plush/ratplush = 1, + /obj/item/toy/plush/narplush = 1, + /obj/item/clothing/head/medievaljewhat = 3, + /obj/item/clothing/suit/chaplainsuit/clownpriest = 1, + /obj/item/clothing/head/clownmitre = 1, + ) + premium = list( + /obj/item/clothing/suit/chaplainsuit/bishoprobe = 1, + /obj/item/clothing/head/bishopmitre = 1, + ) refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe payment_department = ACCOUNT_SRV /obj/item/vending_refill/wardrobe/chap_wardrobe @@ -417,18 +453,22 @@ icon_state = "chemdrobe" product_ads = "Our clothes are 0.5% more resistant to acid spills! Get yours now!" vend_reply = "Thank you for using the ChemDrobe!" - products = list(/obj/item/clothing/under/rank/medical/chemist = 2, - /obj/item/clothing/under/rank/medical/chemist/skirt = 2, - /obj/item/clothing/head/beret/medical = 2, - /obj/item/clothing/shoes/sneakers/white = 2, - /obj/item/clothing/suit/toggle/labcoat/chemist = 2, - /obj/item/clothing/suit/hooded/wintercoat/medical/chemistry = 2, - /obj/item/storage/backpack/chemistry = 2, - /obj/item/storage/backpack/satchel/chem = 2, - /obj/item/storage/backpack/duffelbag/chemistry = 2, - /obj/item/storage/bag/chemistry = 2, - /obj/item/ph_booklet = 3) - contraband = list(/obj/item/reagent_containers/spray/syndicate = 2) + products = list( + /obj/item/clothing/under/rank/medical/chemist = 2, + /obj/item/clothing/under/rank/medical/chemist/skirt = 2, + /obj/item/clothing/head/beret/medical = 2, + /obj/item/clothing/shoes/sneakers/white = 2, + /obj/item/clothing/suit/toggle/labcoat/chemist = 2, + /obj/item/clothing/suit/hooded/wintercoat/medical/chemistry = 2, + /obj/item/storage/backpack/chemistry = 2, + /obj/item/storage/backpack/satchel/chem = 2, + /obj/item/storage/backpack/duffelbag/chemistry = 2, + /obj/item/storage/bag/chemistry = 2, + /obj/item/ph_booklet = 3, + ) + contraband = list( + /obj/item/reagent_containers/spray/syndicate = 2, + ) refill_canister = /obj/item/vending_refill/wardrobe/chem_wardrobe payment_department = ACCOUNT_MED /obj/item/vending_refill/wardrobe/chem_wardrobe @@ -448,7 +488,7 @@ /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 + /obj/item/storage/backpack/duffelbag/genetics = 2, ) refill_canister = /obj/item/vending_refill/wardrobe/gene_wardrobe payment_department = ACCOUNT_SCI @@ -461,16 +501,18 @@ icon_state = "virodrobe" product_ads = " Viruses getting you down? Then upgrade to sterilized clothing today!" vend_reply = "Thank you for using the ViroDrobe" - products = list(/obj/item/clothing/under/rank/medical/virologist = 2, - /obj/item/clothing/under/rank/medical/virologist/skirt = 2, - /obj/item/clothing/head/beret/medical = 2, - /obj/item/clothing/shoes/sneakers/white = 2, - /obj/item/clothing/suit/toggle/labcoat/virologist = 2, - /obj/item/clothing/suit/hooded/wintercoat/medical/viro = 2, - /obj/item/clothing/mask/surgical = 2, - /obj/item/storage/backpack/virology = 2, - /obj/item/storage/backpack/satchel/vir = 2, - /obj/item/storage/backpack/duffelbag/virology = 2) + products = list( + /obj/item/clothing/under/rank/medical/virologist = 2, + /obj/item/clothing/under/rank/medical/virologist/skirt = 2, + /obj/item/clothing/head/beret/medical = 2, + /obj/item/clothing/shoes/sneakers/white = 2, + /obj/item/clothing/suit/toggle/labcoat/virologist = 2, + /obj/item/clothing/suit/hooded/wintercoat/medical/viro = 2, + /obj/item/clothing/mask/surgical = 2, + /obj/item/storage/backpack/virology = 2, + /obj/item/storage/backpack/satchel/vir = 2, + /obj/item/storage/backpack/duffelbag/virology = 2, + ) refill_canister = /obj/item/vending_refill/wardrobe/viro_wardrobe payment_department = ACCOUNT_MED /obj/item/vending_refill/wardrobe/viro_wardrobe @@ -482,32 +524,36 @@ icon_state = "detdrobe" product_ads = "Apply your brilliant deductive methods in style!" vend_reply = "Thank you for using the DetDrobe!" - products = list(/obj/item/clothing/under/rank/security/detective = 2, - /obj/item/clothing/under/rank/security/detective/skirt = 2, - /obj/item/clothing/shoes/sneakers/brown = 2, - /obj/item/clothing/suit/det_suit = 2, - /obj/item/clothing/head/fedora/det_hat = 2, - /obj/item/clothing/under/rank/security/detective/noir = 2, - /obj/item/clothing/under/rank/security/detective/noir/skirt = 2, - /obj/item/clothing/accessory/waistcoat = 2, - /obj/item/clothing/shoes/laceup = 2, - /obj/item/clothing/suit/det_suit/dark = 1, - /obj/item/clothing/suit/det_suit/noir = 1, - /obj/item/clothing/head/fedora = 2, - /obj/item/clothing/gloves/color/black = 2, - /obj/item/clothing/gloves/color/latex = 2, - /obj/item/clothing/under/rank/security/detective/disco = 1, - /obj/item/clothing/suit/det_suit/disco = 1, - /obj/item/clothing/shoes/discoshoes = 1, - /obj/item/clothing/neck/tie/disco = 1, - /obj/item/clothing/under/rank/security/detective/kim = 1, - /obj/item/clothing/suit/det_suit/kim = 1, - /obj/item/clothing/shoes/kim = 1, - /obj/item/clothing/gloves/kim = 1, - /obj/item/clothing/glasses/regular/kim = 1, - /obj/item/reagent_containers/food/drinks/flask/det = 2, - /obj/item/storage/fancy/cigarettes = 5) - premium = list(/obj/item/clothing/head/flatcap = 1) + products = list( + /obj/item/clothing/under/rank/security/detective = 2, + /obj/item/clothing/under/rank/security/detective/skirt = 2, + /obj/item/clothing/shoes/sneakers/brown = 2, + /obj/item/clothing/suit/det_suit = 2, + /obj/item/clothing/head/fedora/det_hat = 2, + /obj/item/clothing/under/rank/security/detective/noir = 2, + /obj/item/clothing/under/rank/security/detective/noir/skirt = 2, + /obj/item/clothing/accessory/waistcoat = 2, + /obj/item/clothing/shoes/laceup = 2, + /obj/item/clothing/suit/det_suit/dark = 1, + /obj/item/clothing/suit/det_suit/noir = 1, + /obj/item/clothing/head/fedora = 2, + /obj/item/clothing/gloves/color/black = 2, + /obj/item/clothing/gloves/color/latex = 2, + /obj/item/clothing/under/rank/security/detective/disco = 1, + /obj/item/clothing/suit/det_suit/disco = 1, + /obj/item/clothing/shoes/discoshoes = 1, + /obj/item/clothing/neck/tie/disco = 1, + /obj/item/clothing/under/rank/security/detective/kim = 1, + /obj/item/clothing/suit/det_suit/kim = 1, + /obj/item/clothing/shoes/kim = 1, + /obj/item/clothing/gloves/kim = 1, + /obj/item/clothing/glasses/regular/kim = 1, + /obj/item/reagent_containers/food/drinks/flask/det = 2, + /obj/item/storage/fancy/cigarettes = 5, + ) + premium = list( + /obj/item/clothing/head/flatcap = 1, + ) refill_canister = /obj/item/vending_refill/wardrobe/det_wardrobe extra_price = PAYCHECK_COMMAND * 1.75 payment_department = ACCOUNT_SEC diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm index c9f2b46c303..3b82e0c1788 100644 --- a/code/modules/vending/youtool.dm +++ b/code/modules/vending/youtool.dm @@ -17,17 +17,17 @@ /obj/item/flashlight/glowstick = 3, /obj/item/flashlight/glowstick/red = 3, /obj/item/flashlight = 5, - /obj/item/clothing/ears/earmuffs = 1 + /obj/item/clothing/ears/earmuffs = 1, ) contraband = list( - /obj/item/clothing/gloves/color/fyellow = 2 + /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 + /obj/item/clothing/gloves/color/yellow = 1, ) refill_canister = /obj/item/vending_refill/youtool default_price = PAYCHECK_CREW