i think it works

MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)

code/modules/vending/assist.dm

@@ -1,4 +1,9 @@
 /obj/machinery/vending/assist
+	name = "\improper Part-Mart"
+	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 = 7,
 					/obj/item/assembly/igniter = 6,
 					/obj/item/assembly/playback = 4,
@@ -15,13 +20,13 @@
 	premium = list(/obj/item/stock_parts/cell/upgraded/plus = 2,
 					/obj/item/flashlight/lantern = 2,
 					/obj/item/beacon = 2)
-	product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!"
-	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
 	refill_canister = /obj/item/vending_refill/assist
-	resistance_flags = FIRE_PROOF
+	product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!"
 	default_price = PRICE_REALLY_CHEAP
 	extra_price = PRICE_ALMOST_CHEAP
 	payment_department = NO_FREEBIES
+	// light_mask = "parts-light-mask"
 
 /obj/item/vending_refill/assist
-	icon_state = "refill_engi"
+	machine_name = "Part-Mart"
+	icon_state = "refill_parts"

code/modules/vending/autodrobe.dm

@@ -3,32 +3,39 @@
 	desc = "A vending machine for costumes."
 	icon_state = "theater"
 	icon_deny = "theater-deny"
+	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/costume/gladiator = 1,
-						/obj/item/clothing/head/helmet/gladiator = 1,
-						/obj/item/clothing/under/rank/captain/suit = 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 = 1,
-						/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/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/rank/civilian/victorian_redsleeves = 1,
 						/obj/item/clothing/under/rank/civilian/victorian_redvest = 1,
 						/obj/item/clothing/under/rank/civilian/victorian_vest = 1,
@@ -39,110 +46,111 @@
 						/obj/item/clothing/under/rank/civilian/victorianblackdress = 1,
 						/obj/item/clothing/suit/vickyblack =1,
 						/obj/item/clothing/under/rank/civilian/dutch = 2,
-						/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/chaplain/holidaypriest = 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/under/rank/civilian/mime/skirt = 1,
-						/obj/item/clothing/under/rank/captain/suit/skirt = 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/chaplain/holidaypriest = 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/clown_hat/sexy = 1,
-						/obj/item/clothing/under/rank/civilian/clown/sexy = 1,
+					/obj/item/clothing/under/rank/civilian/clown/sexy = 1,
 						/obj/item/clothing/mask/gas/mime/sexy = 1,
-						/obj/item/clothing/under/rank/civilian/mime/sexy = 1,
-						/obj/item/clothing/mask/rat/bat = 1,
-						/obj/item/clothing/mask/rat/bee = 1,
-						/obj/item/clothing/mask/rat/bear = 1,
-						/obj/item/clothing/mask/rat/raven = 1,
-						/obj/item/clothing/mask/rat/jackal = 1,
-						/obj/item/clothing/mask/rat/fox = 1,
-						/obj/item/clothing/mask/frog = 1,
-						/obj/item/clothing/mask/rat/tribal = 1,
-						/obj/item/clothing/mask/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/head/maid = 1,
-						/obj/item/clothing/under/costume/maid = 1,
-						/obj/item/clothing/under/rank/civilian/janitor/maid = 1,
+					/obj/item/clothing/under/rank/civilian/mime/sexy = 1,
+					/obj/item/clothing/under/rank/civilian/mime/skirt = 1,
+					/obj/item/clothing/mask/rat/bat = 1,
+					/obj/item/clothing/mask/rat/bee = 1,
+					/obj/item/clothing/mask/rat/bear = 1,
+					/obj/item/clothing/mask/rat/raven = 1,
+					/obj/item/clothing/mask/rat/jackal = 1,
+					/obj/item/clothing/mask/rat/fox = 1,
+					/obj/item/clothing/mask/frog = 1,
+					/obj/item/clothing/mask/rat/tribal = 1,
+					/obj/item/clothing/mask/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/head/maid = 1,
+					/obj/item/clothing/under/costume/maid = 1,
+					/obj/item/clothing/under/rank/civilian/janitor/maid = 1,
 						/obj/item/clothing/gloves/evening = 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/ears/headphones = 2,
-						/obj/item/clothing/head/wig/random = 3,
-						/obj/item/clothing/suit/ran = 2,
-						/obj/item/clothing/head/ran = 2,
-						/obj/item/clothing/mask/gas/timidcostume = 3,
-						/obj/item/clothing/suit/hooded/wintercoat/timidcostume = 3,
-						/obj/item/clothing/shoes/timidcostume = 3,
-						/obj/item/clothing/mask/gas/timidcostume/man = 3,
-						/obj/item/clothing/suit/hooded/wintercoat/timidcostume/man = 3,
-						/obj/item/clothing/shoes/timidcostume/man = 3,
-						)
+					/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/ears/headphones = 2,
+					/obj/item/clothing/head/wig/random = 3,
+					/obj/item/clothing/suit/ran = 2,
+					/obj/item/clothing/head/ran = 2,
+					/obj/item/clothing/mask/gas/timidcostume = 3,
+					/obj/item/clothing/suit/hooded/wintercoat/timidcostume = 3,
+					/obj/item/clothing/shoes/timidcostume = 3,
+					/obj/item/clothing/mask/gas/timidcostume/man = 3,
+					/obj/item/clothing/suit/hooded/wintercoat/timidcostume/man = 3,
+					/obj/item/clothing/shoes/timidcostume/man = 3,
+					)
 	contraband = list(/obj/item/clothing/suit/judgerobe = 1,
-						/obj/item/clothing/head/powdered_wig = 1,
-						/obj/item/gun/magic/wand = 2,
-						/obj/item/clothing/glasses/sunglasses/garb = 2,
-						/obj/item/clothing/glasses/sunglasses/blindfold = 1,
-						/obj/item/clothing/mask/muzzle = 2,
-						/obj/item/clothing/under/syndicate/camo/cosmetic = 3)
+					  /obj/item/clothing/head/powdered_wig = 1,
+					  /obj/item/gun/magic/wand = 2,
+					  /obj/item/clothing/glasses/sunglasses/garb = 2,
+					  /obj/item/clothing/glasses/sunglasses/blindfold = 1,
+					  /obj/item/clothing/mask/muzzle = 2,
+					  /obj/item/clothing/under/syndicate/camo/cosmetic = 3
+					  )
 	premium = list(/obj/item/clothing/suit/pirate/captain = 2,
-					/obj/item/clothing/head/pirate/captain = 2,
-					/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/skub = 1,
+				   /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/skub = 1,
 					/obj/item/clothing/under/costume/lobster = 1,
 					/obj/item/clothing/head/lobsterhat = 1,
 					/obj/item/clothing/head/drfreezehat = 1,
@@ -157,11 +165,11 @@
 					/obj/item/clothing/head/christmashat = 3,
 					/obj/item/clothing/head/christmashatg = 3,
 					/obj/item/clothing/under/costume/drfreeze = 1)
-
 	refill_canister = /obj/item/vending_refill/autodrobe
 	default_price = PRICE_ALMOST_CHEAP
 	extra_price = PRICE_ALMOST_EXPENSIVE
 	payment_department = ACCOUNT_SRV
+	light_mask="theater-light-mask"
 
 /obj/machinery/vending/autodrobe/Initialize()
 	. = ..()
@@ -170,6 +178,10 @@
 /obj/machinery/vending/autodrobe/canLoadItem(obj/item/I,mob/user)
 	return (I.type in products)
 
+/obj/machinery/vending/autodrobe/all_access
+	desc = "A vending machine for costumes. This model appears to have no access restrictions."
+	req_access = null
+
 /obj/item/vending_refill/autodrobe
 	machine_name = "AutoDrobe"
 	icon_state = "refill_costume"

code/modules/vending/boozeomat.dm

@@ -41,13 +41,15 @@
 	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)
+
 	product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"
 	product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!"
+
 	refill_canister = /obj/item/vending_refill/boozeomat
 	default_price = PRICE_ALMOST_CHEAP
 	extra_price = PRICE_EXPENSIVE
 	payment_department = ACCOUNT_SRV
-	cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
+	light_mask = "boozeomat-light-mask"
 
 /obj/machinery/vending/boozeomat/pubby_maint //abandoned bar on Pubbystation
 	products = list(/obj/item/reagent_containers/food/drinks/bottle/whiskey = 1,
@@ -67,12 +69,14 @@
 					/obj/item/reagent_containers/food/drinks/drinkingglass = 6,
 					/obj/item/reagent_containers/food/drinks/ice = 1,
 					/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 4);
+	payment_department = ACCOUNT_SEC
 
-/obj/machinery/vending/boozeomat/pubby_captain/Initialize()
-	. = ..()
-	cost_multiplier_per_dept = list("[ACCESS_CAPTAIN]" = 0)
-
+/obj/machinery/vending/boozeomat/all_access
+	desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one. This model appears to have no access restrictions."
+	req_access = null
 /obj/machinery/vending/boozeomat/syndicate_access
+	req_access = list(ACCESS_SYNDICATE)
+	age_restrictions = FALSE
 	payment_department = NO_FREEBIES
 
 /obj/machinery/vending/boozeomat/syndicate_access/Initialize()

code/modules/vending/cartridge.dm

@@ -11,19 +11,18 @@
 					/obj/item/cartridge/janitor = 10,
 					/obj/item/cartridge/signal/toxins = 10,
 					/obj/item/cartridge/roboticist = 10,
-					/obj/item/pda/heads = 10)
-	premium = list(/obj/item/cartridge/captain = 2,
-					/obj/item/cartridge/quartermaster = 2)
+					/obj/item/pda/heads = 10,
+					/obj/item/cartridge/captain = 3,
+					/obj/item/cartridge/quartermaster = 10)
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
 	refill_canister = /obj/item/vending_refill/cart
 	resistance_flags = FIRE_PROOF
 	default_price = PRICE_ALMOST_EXPENSIVE
 	extra_price = PRICE_ALMOST_ONE_GRAND
 	payment_department = ACCOUNT_SRV
-
-/obj/machinery/vending/cart/Initialize()
-	. = ..()
-	cost_multiplier_per_dept = list("[ACCESS_CHANGE_IDS]" = 0)
+	light_mask="cart-light-mask"
 
 /obj/item/vending_refill/cart
-	icon_state = "refill_pda"
+	machine_name = "PTech"
+	icon_state = "refill_smoke"
+

code/modules/vending/cigarette.dm

@@ -17,13 +17,15 @@
 					/obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 1,
 					/obj/item/clothing/mask/cigarette/dart = 3)
 	premium = list(/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 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/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 = PRICE_ALMOST_CHEAP
 	extra_price = PRICE_ABOVE_NORMAL
 	payment_department = ACCOUNT_SRV
+	light_mask = "cigs-light-mask"
 
 /obj/machinery/vending/cigarette/syndicate
 	products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 7,
@@ -34,7 +36,6 @@
 					/obj/item/storage/box/matches = 10,
 					/obj/item/lighter/greyscale = 4,
 					/obj/item/storage/fancy/rollingpapers = 5)
-	payment_department = NO_FREEBIES
 
 /obj/machinery/vending/cigarette/syndicate/Initialize()
 	. = ..()

code/modules/vending/clothesmate.dm

@@ -1,10 +1,9 @@
-//DON'T FORGET TO CHANGE THE REFILL SIZE IF YOU CHANGE THE MACHINE'S CONTENTS!
 /obj/machinery/vending/clothing
 	name = "ClothesMate" //renamed to make the slogan rhyme
 	desc = "A vending machine for clothing."
 	icon_state = "clothes"
 	icon_deny = "clothes-deny"
-	product_slogans = "Dress for success!;Prepare to look swagalicious!;Look at all this free swag!;Why leave style up to fate? Use the ClothesMate!"
+	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/that = 4,
 					/obj/item/clothing/head/fedora = 3,
@@ -231,9 +230,11 @@
 					/obj/item/clothing/suit/jacket/bluehoodie = 4,
 					/obj/item/clothing/suit/toggle/jacket/whitehoodie = 4)
 	refill_canister = /obj/item/vending_refill/clothing
-	default_price = PRICE_CHEAP
+	default_price = PRICE_CHEAP //Default of
 	extra_price = PRICE_BELOW_NORMAL
 	payment_department = NO_FREEBIES
+	light_mask = "wardrobe-light-mask"
+	light_color = LIGHT_COLOR_ELECTRIC_GREEN
 
 /obj/machinery/vending/clothing/canLoadItem(obj/item/I,mob/user)
 	return (I.type in products)

code/modules/vending/coffee.dm

@@ -1,7 +1,7 @@
 /obj/machinery/vending/coffee
 	name = "\improper Solar's Best Hot Drinks"
 	desc = "A vending machine which dispenses hot drinks."
-	product_ads = "Just what you need!;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"
+	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 = 25,
@@ -15,11 +15,12 @@
 					/obj/item/reagent_containers/food/drinks/bottle/cream = 2,
 					/obj/item/reagent_containers/food/condiment/sugar = 1,
 					/obj/item/reagent_containers/food/drinks/mug/tea/forest = 3,)
-
 	refill_canister = /obj/item/vending_refill/coffee
 	default_price = PRICE_REALLY_CHEAP
 	extra_price = PRICE_PRETTY_CHEAP
 	payment_department = ACCOUNT_SRV
+	light_mask = "coffee-light-mask"
+	light_color = COLOR_DARK_MODERATE_ORANGE
 
 /obj/item/vending_refill/coffee
 	machine_name = "Solar's Best Hot Drinks"

code/modules/vending/cola.dm

@@ -6,7 +6,7 @@
 	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/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,
@@ -18,14 +18,15 @@
 					/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6,
 					/obj/item/reagent_containers/glass/beaker/waterbottle/wataur = 2)
 	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/grey_bull = 1,
-					/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 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 = PRICE_CHEAP_AS_FREE
 	extra_price = PRICE_ABOVE_NORMAL
 	payment_department = ACCOUNT_SRV
 
+
 /obj/item/vending_refill/cola
 	machine_name = "Robust Softdrinks"
 	icon_state = "refill_cola"
@@ -43,43 +44,56 @@
 
 /obj/machinery/vending/cola/blue
 	icon_state = "Cola_Machine"
+	light_mask = "cola-light-mask"
+	light_color = COLOR_MODERATE_BLUE
 
 /obj/machinery/vending/cola/black
 	icon_state = "cola_black"
+	light_mask = "cola-light-mask"
 
 /obj/machinery/vending/cola/red
 	icon_state = "red_cola"
 	name = "\improper Space Cola Vendor"
 	desc = "It vends cola, in space."
 	product_slogans = "Cola in space!"
+	light_mask = "red_cola-light-mask"
+	light_color = COLOR_DARK_RED
 
 /obj/machinery/vending/cola/space_up
 	icon_state = "space_up"
 	name = "\improper Space-up! Vendor"
 	desc = "Indulge in an explosion of flavor."
 	product_slogans = "Space-up! Like a hull breach in your mouth."
+	light_mask = "space_up-light-mask"
+	light_color = COLOR_DARK_MODERATE_LIME_GREEN
 
 /obj/machinery/vending/cola/starkist
 	icon_state = "starkist"
 	name = "\improper Star-kist Vendor"
 	desc = "The taste of a star in liquid form."
 	product_slogans = "Drink the stars! Star-kist!"
+	light_mask = "starkist-light-mask"
+	light_color = COLOR_LIGHT_ORANGE
 
 /obj/machinery/vending/cola/sodie
 	icon_state = "soda"
+	light_mask = "soda-light-mask"
+	light_color = COLOR_WHITE
 
 /obj/machinery/vending/cola/pwr_game
 	icon_state = "pwr_game"
 	name = "\improper Pwr Game Vendor"
 	desc = "You want it, we got it. Brought to you in partnership with Vlad's Salads."
 	product_slogans = "The POWER that gamers crave! PWR GAME!"
+	light_mask = "pwr_game-light-mask"
+	light_color = COLOR_STRONG_VIOLET
 
 /obj/machinery/vending/cola/shamblers
 	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/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,
@@ -89,7 +103,8 @@
 					/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"
+	light_color = COLOR_MOSTLY_PURE_PINK
 /obj/machinery/vending/cola/buzz_fuzz
 	name = "\improper Buzz Fuzz Vendor"
 	desc = "~A hive of Flavour!~"

code/modules/vending/engineering.dm

@@ -5,9 +5,9 @@
 	icon_state = "engi"
 	icon_deny = "engi-deny"
 	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/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,
@@ -26,9 +26,13 @@
 					/obj/item/stock_parts/micro_laser = 5,
 					/obj/item/stock_parts/matter_bin = 5,
 					/obj/item/stock_parts/manipulator = 5)
-	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+	refill_canister = /obj/item/vending_refill/engineering
 	resistance_flags = FIRE_PROOF
 	default_price = PRICE_NORMAL
 	extra_price = PRICE_NORMAL
 	payment_department = ACCOUNT_ENG
-	cost_multiplier_per_dept = list(ACCOUNT_ENG = 0)
+	light_mask = "engi-light-mask"
+
+/obj/item/vending_refill/engineering
+	machine_name = "Robco Tool Maker"
+	icon_state = "refill_engi"

code/modules/vending/engivend.dm

@@ -27,13 +27,13 @@
 					/obj/item/rcd_ammo/large = 5,
 					/obj/item/storage/bag/material = 3
 					)
-	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
 	refill_canister = /obj/item/vending_refill/engivend
 	resistance_flags = FIRE_PROOF
 	default_price = PRICE_ALMOST_EXPENSIVE
 	extra_price = PRICE_ABOVE_EXPENSIVE
 	payment_department = ACCOUNT_ENG
-	cost_multiplier_per_dept = list(ACCOUNT_ENG = 0)
+	light_mask = "engivend-light-mask"
 
 /obj/item/vending_refill/engivend
+	machine_name = "Engi-Vend"
 	icon_state = "refill_engi"

code/modules/vending/games.dm

@@ -4,15 +4,17 @@
 	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/storage/dice = 10,
+		            /obj/item/toy/cards/deck/cas = 3,
+		            /obj/item/toy/cards/deck/cas/black = 3,
 					/obj/item/toy/cards/deck/unum = 3,
+					/obj/item/camera = 3,
 					/obj/item/cardpack/series_one = 10,
-					/obj/item/dyespray=3,
 					/obj/item/tcgcard_binder = 5,
 					/obj/item/canvas = 3,
-					/obj/item/toy/crayon/spraycan = 3)
+					/obj/item/toy/crayon/spraycan = 3,
+					/obj/item/dyespray=3,
+					)
 	contraband = list(/obj/item/dice/fudge = 9)
 	premium = list(/obj/item/melee/skateboard/pro = 3,
 					/obj/item/melee/skateboard/hoverboard = 1)
@@ -20,7 +22,7 @@
 	default_price = PRICE_CHEAP
 	extra_price = PRICE_ALMOST_EXPENSIVE
 	payment_department = ACCOUNT_SRV
-	cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
+	light_mask = "games-light-mask"
 
 /obj/item/vending_refill/games
 	machine_name = "\improper Good Clean Fun"

code/modules/vending/liberation.dm

@@ -2,15 +2,15 @@
 	name = "\improper Liberation Station"
 	desc = "An overwhelming amount of <b>ancient patriotism</b> washes over you just by looking at the machine."
 	icon_state = "liberationstation"
-	product_slogans = "Liberation Station: Your one-stop shop for all things second ammendment!;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 ammendment today!;Guns don't kill people, but you can!;Who needs responsibilities when you have guns?"
+	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/reagent_containers/food/snacks/burger/plain = 5, //O say can you see, by the dawn's early light
 					/obj/item/reagent_containers/food/snacks/burger/baseball = 3, //What so proudly we hailed at the twilight's last gleaming
 					/obj/item/reagent_containers/food/snacks/fries = 5, //Whose broad stripes and bright stars through the perilous fight
 					/obj/item/reagent_containers/food/drinks/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/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,
@@ -18,16 +18,16 @@
 					/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/ammo_box/magazine/m50 = 4,
+		           /obj/item/ammo_box/magazine/m45 = 2,
+		           /obj/item/ammo_box/magazine/m75 = 2,
 					/obj/item/reagent_containers/food/snacks/cheesyfries = 5,
 					/obj/item/reagent_containers/food/snacks/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/bedsheet/patriot = 5,
 					/obj/item/reagent_containers/food/snacks/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 = PRICE_ABOVE_NORMAL
 	extra_price = PRICE_ABOVE_EXPENSIVE
 	payment_department = ACCOUNT_SEC
+	light_mask = "liberation-light-mask"

code/modules/vending/liberation_toy.dm

@@ -16,19 +16,16 @@
 					/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
+					  /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
 	default_price = PRICE_ABOVE_NORMAL
 	extra_price = PRICE_EXPENSIVE
-	payment_department = NO_FREEBIES
-
-/obj/machinery/vending/toyliberationstation/Initialize()
-	. = ..()
-	cost_multiplier_per_dept = list("[ACCESS_SYNDICATE]" = 0)
+	payment_department = ACCOUNT_SRV
+	light_mask = "donksoft-light-mask"

code/modules/vending/magivend.dm

@@ -4,18 +4,19 @@
 	icon_state = "MagiVend"
 	product_slogans = "Sling spells the proper way with MagiVend!;Be your own Houdini! Use MagiVend!"
 	vend_reply = "Have an enchanted evening!"
-	product_ads = "EI NATH;Destroy the station!;Admin conspiracies since forever!;Space-time bending hardware!;Now-magic proofing venders!"
+	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)
-	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
+		            /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, "magic" = 100)
 	resistance_flags = FIRE_PROOF
-	default_price = PRICE_EXPENSIVE
+	default_price = 0 //Just in case, since it's primary use is storage.
 	extra_price = PRICE_ABOVE_EXPENSIVE
 	payment_department = ACCOUNT_SRV
+	light_mask = "magivend-light-mask"

code/modules/vending/medical.dm

@@ -4,6 +4,7 @@
 	icon_state = "med"
 	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/reagent_containers/syringe = 12,
 					/obj/item/reagent_containers/dropper = 3,
 					/obj/item/healthanalyzer = 4,
@@ -50,13 +51,11 @@
 					/obj/item/storage/briefcase/medical = 2,
 					/obj/item/plunger/reinforced = 2)
 
-	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/medical
 	default_price = PRICE_ALMOST_CHEAP
 	extra_price = PRICE_ABOVE_NORMAL
 	payment_department = ACCOUNT_MED
-	cost_multiplier_per_dept = list(ACCOUNT_MED = 0)
+	light_mask = "med-light-mask"
 
 /obj/item/vending_refill/medical
 	machine_name = "NanoMed Plus"
@@ -64,8 +63,9 @@
 
 /obj/machinery/vending/medical/syndicate_access
 	name = "\improper SyndiMed Plus"
-	payment_department = NO_FREEBIES
+	req_access = list(ACCESS_SYNDICATE)
 
-/obj/machinery/vending/medical/syndicate_access/Initialize()
+
+/obj/machinery/vending/medical/syndicate_access/Initialize(mapload)
 	. = ..()
 	cost_multiplier_per_dept = list("[ACCESS_SYNDICATE]" = 0)

code/modules/vending/medical_wall.dm

@@ -18,14 +18,28 @@
 	contraband = list(/obj/item/reagent_containers/pill/tox = 2,
 					/obj/item/reagent_containers/pill/morphine = 2)
 	premium = list(/obj/item/reagent_containers/medspray/synthflesh = 2)
-	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/wallmed
 	default_price = PRICE_FREE
 	extra_price = PRICE_NORMAL
 	payment_department = ACCOUNT_MED
-	cost_multiplier_per_dept = list(ACCOUNT_MED = 0)
 	tiltable = FALSE
+	light_mask = "wallmed-light-mask"
+
+/obj/machinery/vending/wallmed/directional/north
+	dir = SOUTH
+	pixel_y = 32
+
+/obj/machinery/vending/wallmed/directional/south
+	dir = NORTH
+	pixel_y = -32
+
+/obj/machinery/vending/wallmed/directional/east
+	dir = WEST
+	pixel_x = 32
+
+/obj/machinery/vending/wallmed/directional/west
+	dir = EAST
+	pixel_x = -32
 
 /obj/item/vending_refill/wallmed
 	machine_name = "NanoMed"

code/modules/vending/megaseed.dm

@@ -4,6 +4,7 @@
 	product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!"
 	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,
@@ -20,6 +21,7 @@
 					/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/lemon = 3,
@@ -56,13 +58,11 @@
 					/obj/item/seeds/starthistle = 2,
 					/obj/item/seeds/random = 2)
 	premium = list(/obj/item/reagent_containers/spray/waterflower = 1)
-	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
 	refill_canister = /obj/item/vending_refill/hydroseeds
-	resistance_flags = FIRE_PROOF
 	default_price = PRICE_ALMOST_CHEAP
 	extra_price = PRICE_NORMAL
 	payment_department = ACCOUNT_SRV
-	cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
 
 /obj/item/vending_refill/hydroseeds
-	icon_state = "refill_hydro"
+	machine_name = "MegaSeed Servitor"
+	icon_state = "refill_plant"

code/modules/vending/nutrimax.dm

@@ -5,6 +5,7 @@
 	product_ads = "We like plants!;Don't you want some?;The greenest thumbs ever.;We like big plants.;Soft soil..."
 	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,
@@ -15,14 +16,12 @@
 					/obj/item/shovel/spade = 3,
 					/obj/item/plant_analyzer = 4)
 	contraband = list(/obj/item/reagent_containers/glass/bottle/ammonia = 10,
-					/obj/item/reagent_containers/glass/bottle/diethylamine = 5)
-	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+					  /obj/item/reagent_containers/glass/bottle/diethylamine = 5)
 	refill_canister = /obj/item/vending_refill/hydronutrients
-	resistance_flags = FIRE_PROOF
 	default_price = PRICE_REALLY_CHEAP
 	extra_price = PRICE_CHEAP
 	payment_department = ACCOUNT_SRV
-	cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
 
 /obj/item/vending_refill/hydronutrients
-	icon_state = "refill_hydro"
+	machine_name = "NutriMax"
+	icon_state = "refill_plant"

code/modules/vending/plasmaresearch.dm

@@ -1,10 +1,10 @@
 //This one's from bay12
 /obj/machinery/vending/plasmaresearch
-	name = "\improper Toximate 3000"
+	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/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,
@@ -14,4 +14,3 @@
 	default_price = PRICE_EXPENSIVE
 	extra_price = PRICE_REALLY_EXPENSIVE
 	payment_department = ACCOUNT_SCI
-	cost_multiplier_per_dept = list(ACCOUNT_SCI = 0)

code/modules/vending/robotics.dm

@@ -4,6 +4,8 @@
 	desc = "All the tools you need to create your own robot army."
 	icon_state = "robotics"
 	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,
@@ -14,13 +16,16 @@
 					/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 = 6,
+					/obj/item/crowbar = 5,
 					/obj/item/stack/medical/nanogel = 5)
-	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/robotics
 	default_price = PRICE_EXPENSIVE
 	payment_department = ACCOUNT_SCI
-	cost_multiplier_per_dept = list(ACCOUNT_SCI = 0)
+
+/obj/item/vending_refill/robotics
+	machine_name = "Robotech Deluxe"
+	icon_state = "refill_engi"

code/modules/vending/security.dm

@@ -1,9 +1,11 @@
 /obj/machinery/vending/security
 	name = "\improper SecTech"
 	desc = "A security equipment vendor."
-	product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"
+	product_ads = "Crack communist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"
 	icon_state = "sec"
 	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,
@@ -17,20 +19,17 @@
 					/obj/item/storage/fancy/donut_box = 2,
 					/obj/item/storage/belt/sabre/secbelt = 1)
 	premium = list(/obj/item/coin/antagtoken = 1,
-					/obj/item/clothing/head/helmet/blueshirt = 1,
-					/obj/item/clothing/suit/armor/vest/blueshirt = 1,
+				   /obj/item/clothing/head/helmet/blueshirt = 1,
+				   /obj/item/clothing/suit/armor/vest/blueshirt = 1,
 					/obj/item/clothing/under/rank/security/officer/blueshirt = 1,
-					/obj/item/clothing/gloves/tackler = 5,
-					/obj/item/grenade/stingbang = 1,
+				   /obj/item/clothing/gloves/tackler = 5,
+				   /obj/item/grenade/stingbang = 1,
 					/obj/item/ssword_kit = 1,
 					/obj/item/storage/bag/ammo = 3)
-	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/security
 	default_price = PRICE_ALMOST_EXPENSIVE
 	extra_price = PRICE_REALLY_EXPENSIVE
 	payment_department = ACCOUNT_SEC
-	cost_multiplier_per_dept = list(ACCOUNT_SEC = 0)
 
 /obj/machinery/vending/security/pre_throw(obj/item/I)
 	if(istype(I, /obj/item/grenade))
@@ -42,4 +41,4 @@
 		F.update_brightness()
 
 /obj/item/vending_refill/security
-	icon_state = "refill_games"
+	icon_state = "refill_sec"

code/modules/vending/snack.dm

@@ -4,6 +4,7 @@
 	product_slogans = "Try our new nougat bar!;Twice the calories for half the price!"
 	product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!"
 	icon_state = "snack"
+	light_mask = "snack-light-mask"
 	products = list(/obj/item/reagent_containers/food/snacks/candy = 5,
 					/obj/item/reagent_containers/food/snacks/chocolatebar = 5,
 					/obj/item/reagent_containers/food/drinks/dry_ramen = 5,
@@ -25,13 +26,11 @@
 					/obj/item/reagent_containers/food/snacks/chococoin = 1,
 					/obj/item/storage/box/marshmallow = 1,
 					/obj/item/storage/box/donkpockets = 2)
-
 	refill_canister = /obj/item/vending_refill/snack
 	canload_access_list = list(ACCESS_KITCHEN)
 	default_price = PRICE_REALLY_CHEAP
 	extra_price = PRICE_ALMOST_CHEAP
 	payment_department = ACCOUNT_SRV
-	cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
 	input_display_header = "Chef's Food Selection"
 
 /obj/item/vending_refill/snack

code/modules/vending/sovietsoda.dm

@@ -2,11 +2,17 @@
 	name = "\improper BODA"
 	desc = "Old sweet water vending machine."
 	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)
-	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 = PRICE_FREE
-	extra_price = PRICE_FREE
+	refill_canister = /obj/item/vending_refill/sovietsoda
+	default_price = 1
+	extra_price = 2 //One credit for every state of FREEDOM
 	payment_department = NO_FREEBIES
+	light_color = COLOR_PALE_ORANGE
+
+/obj/item/vending_refill/sovietsoda
+	machine_name = "BODA"
+	icon_state = "refill_cola"

code/modules/vending/sustenance.dm

@@ -2,21 +2,24 @@
 	name = "\improper Sustenance Vendor"
 	desc = "A vending machine which vends food, as required by section 47-C of the NT's Prisoner Ethical Treatment Agreement."
 	product_slogans = "Enjoy your meal.;Enough calories to support strenuous labor."
-	product_ads = "Sufficiently healthy.;Efficiently produced tofu!;Mmm! So good!;Have a meal.;You need food to live!;Have some more candy corn!;Try our new ice cups!"
+	product_ads = "Sufficiently healthy.;Efficiently produced tofu!;Mmm! So good!;Have a meal.;You need food to live!;Even prisoners deserve their daily bread!;Have some more candy corn!;Try our new ice cups!"
+	light_mask = "snack-light-mask"
 	icon_state = "sustenance"
 	products = list(/obj/item/reagent_containers/food/snacks/tofu = 24,
 					/obj/item/reagent_containers/food/drinks/ice/sustanance = 12,
-					/obj/item/reagent_containers/food/snacks/candy_corn = 6)
+					/obj/item/reagent_containers/food/snacks/candy_corn = 6
+					)
 	contraband = list(/obj/item/kitchen/knife = 6,
 					/obj/item/reagent_containers/food/drinks/coffee = 12,
 					/obj/item/tank/internals/emergency_oxygen = 6,
-					/obj/item/clothing/mask/breath = 6)
-	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+					/obj/item/clothing/mask/breath = 6
+					)
+
 	refill_canister = /obj/item/vending_refill/sustenance
-	resistance_flags = FIRE_PROOF
 	default_price = PRICE_FREE
 	extra_price = PRICE_FREE
 	payment_department = NO_FREEBIES
 
 /obj/item/vending_refill/sustenance
-	icon_state = "refill_cook"
+	machine_name = "Sustenance Vendor"
+	icon_state = "refill_snack"

code/modules/vending/toys.dm

@@ -5,6 +5,7 @@
 	product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get permabrigged!"
 	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!"
+	light_mask = "donksoft-light-mask"
 	circuit = /obj/item/circuitboard/machine/vending/donksofttoyvendor
 	products = list(
 		/obj/item/gun/ballistic/automatic/toy/unrestricted = 10,
@@ -22,8 +23,6 @@
 		/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted = 10,
 		/obj/item/toy/katana = 10,
 		/obj/item/dualsaber/toy = 5)
-	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
 	default_price = PRICE_ABOVE_NORMAL
 	extra_price = PRICE_EXPENSIVE

code/modules/vending/wardrobes.dm

@@ -6,6 +6,7 @@
 	extra_price = PRICE_EXPENSIVE
 	payment_department = NO_FREEBIES
 	input_display_header = "Returned Clothing"
+	light_mask = "wardrobe-light-mask"
 
 /obj/machinery/vending/wardrobe/canLoadItem(obj/item/I,mob/user)
 	return (I.type in products)
@@ -35,51 +36,11 @@
 					/obj/item/clothing/head/beret/sec/navyofficer = 5)
 	refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe
 	payment_department = ACCOUNT_SEC
-	cost_multiplier_per_dept = list(ACCOUNT_SEC = 0)
-	default_price = PRICE_ABOVE_NORMAL
-	extra_price = PRICE_EXPENSIVE
+	light_color = COLOR_MOSTLY_PURE_RED
 
 /obj/item/vending_refill/wardrobe/sec_wardrobe
 	machine_name = "SecDrobe"
 
-
-/obj/machinery/vending/wardrobe/det_wardrobe
-	name = "\improper DetDrobe"
-	desc = "A machine for all your detective needs, as long as you need clothes."
-	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/under/rank/security/detective/brown = 2,
-					/obj/item/clothing/under/rank/security/detective/brown/brown2 = 2,
-					/obj/item/clothing/under/rank/security/officer/blueshirt/seccorp/detcorp = 2,
-					/obj/item/clothing/under/rank/security/officer/util = 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/grey = 2,
-					/obj/item/clothing/under/rank/security/detective/grey/skirt = 2,
-					/obj/item/clothing/accessory/waistcoat = 2,
-					/obj/item/clothing/shoes/laceup = 2,
-					/obj/item/clothing/suit/det_suit/grey = 1,
-					/obj/item/clothing/suit/det_suit/forensicsred = 1,
-					/obj/item/clothing/suit/det_suit/forensicsred/long = 1,
-					/obj/item/clothing/suit/det_suit/forensicsblue = 1,
-					/obj/item/clothing/suit/det_suit/forensicsblue/long = 1,
-					/obj/item/clothing/head/fedora = 2,
-					/obj/item/clothing/gloves/color/black = 2,
-					/obj/item/clothing/gloves/color/latex = 2,
-					/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 = 350
-	payment_department = ACCOUNT_SEC
-
-/obj/item/vending_refill/wardrobe/det_wardrobe
-	machine_name = "DetDrobe"
-
 /obj/machinery/vending/wardrobe/medi_wardrobe
 	name = "\improper MediDrobe"
 	desc = "A vending machine rumoured to be capable of dispensing clothing for medical personnel."
@@ -118,7 +79,6 @@
 					/obj/item/clothing/suit/toggle/labcoat/emt/highvis = 5)
 	refill_canister = /obj/item/vending_refill/wardrobe/medi_wardrobe
 	payment_department = ACCOUNT_MED
-	cost_multiplier_per_dept = list(ACCOUNT_MED = 0)
 
 /obj/item/vending_refill/wardrobe/medi_wardrobe
 	machine_name = "MediDrobe"
@@ -149,7 +109,7 @@
 					/obj/item/clothing/head/hardhat/weldhat = 3)
 	refill_canister = /obj/item/vending_refill/wardrobe/engi_wardrobe
 	payment_department = ACCOUNT_ENG
-	cost_multiplier_per_dept = list(ACCOUNT_ENG = 0)
+	light_color = COLOR_VIVID_YELLOW
 
 /obj/item/vending_refill/wardrobe/engi_wardrobe
 	machine_name = "EngiDrobe"
@@ -172,7 +132,7 @@
 					/obj/item/clothing/shoes/sneakers/black = 5)
 	refill_canister = /obj/item/vending_refill/wardrobe/atmos_wardrobe
 	payment_department = ACCOUNT_ENG
-	cost_multiplier_per_dept = list(ACCOUNT_ENG = 0)
+	light_color = COLOR_VIVID_YELLOW
 
 /obj/item/vending_refill/wardrobe/atmos_wardrobe
 	machine_name = "AtmosDrobe"
@@ -195,7 +155,6 @@
 					/obj/item/radio/headset/headset_cargo = 3)
 	refill_canister = /obj/item/vending_refill/wardrobe/cargo_wardrobe
 	payment_department = ACCOUNT_CAR
-	cost_multiplier_per_dept = list(ACCOUNT_CAR = 0)
 
 /obj/item/vending_refill/wardrobe/cargo_wardrobe
 	machine_name = "CargoDrobe"
@@ -223,17 +182,16 @@
 					/obj/item/clothing/under/misc/mechsuitblue = 1)
 	contraband = list(/obj/item/clothing/suit/hooded/techpriest = 2)
 	refill_canister = /obj/item/vending_refill/wardrobe/robo_wardrobe
+	extra_price = PRICE_EXPENSIVE * 1.2
 	payment_department = ACCOUNT_SCI
-	cost_multiplier_per_dept = list(ACCOUNT_SCI = 0)
-
 /obj/item/vending_refill/wardrobe/robo_wardrobe
 	machine_name = "RoboDrobe"
 
 /obj/machinery/vending/wardrobe/science_wardrobe
 	name = "SciDrobe"
-	desc = "A simple vending machine suitable to dispense well tailored science clothing. Endorsed by Cubans."
+	desc = "A simple vending machine suitable to dispense well tailored science clothing. Endorsed by Space Cubans."
 	icon_state = "scidrobe"
-	product_ads = "Longing for the smell of flesh plasma? Buy your science clothing now!;Made with 10% Auxetics, so you don't have to worry losing your arm!"
+	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 = 5,
 					/obj/item/clothing/head/beret/sci = 3,
@@ -251,8 +209,6 @@
 					/obj/item/clothing/mask/gas = 5)
 	refill_canister = /obj/item/vending_refill/wardrobe/science_wardrobe
 	payment_department = ACCOUNT_SCI
-	cost_multiplier_per_dept = list(ACCOUNT_SCI = 0)
-
 /obj/item/vending_refill/wardrobe/science_wardrobe
 	machine_name = "SciDrobe"
 
@@ -274,7 +230,7 @@
 					/obj/item/clothing/mask/bandana = 4)
 	refill_canister = /obj/item/vending_refill/wardrobe/hydro_wardrobe
 	payment_department = ACCOUNT_SRV
-	cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
+	light_color = LIGHT_COLOR_ELECTRIC_GREEN
 
 /obj/item/vending_refill/wardrobe/hydro_wardrobe
 	machine_name = "HyDrobe"
@@ -299,9 +255,7 @@
 					/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_CIV
-	cost_multiplier_per_dept = list(ACCOUNT_CIV = 0)
-
+	payment_department = ACCOUNT_SRV
 /obj/item/vending_refill/wardrobe/curator_wardrobe
 	machine_name = "CuraDrobe"
 
@@ -331,8 +285,6 @@
 					/obj/item/storage/belt/bandolier = 1)
 	refill_canister = /obj/item/vending_refill/wardrobe/bar_wardrobe
 	payment_department = ACCOUNT_SRV
-	cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
-
 /obj/item/vending_refill/wardrobe/bar_wardrobe
 	machine_name = "BarDrobe"
 
@@ -340,8 +292,8 @@
 	name = "ChefDrobe"
 	desc = "This vending machine might not dispense meat, but it certainly dispenses chef related clothing."
 	icon_state = "chefdrobe"
-	product_ads = "Our clothes are guaranteed to protect you from food splatters!;Now stocking recipe books!"
-	vend_reply = "Thank you for using the ChefDrobe!;Just like your grandmother's old recipes!"
+	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 = 3,
 					/obj/item/radio/headset/headset_srv = 4,
 					/obj/item/clothing/accessory/waistcoat = 3,
@@ -358,8 +310,6 @@
 					/obj/item/book/granter/crafting_recipe/coldcooking = 2)
 	refill_canister = /obj/item/vending_refill/wardrobe/chef_wardrobe
 	payment_department = ACCOUNT_SRV
-	cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
-
 /obj/item/vending_refill/wardrobe/chef_wardrobe
 	machine_name = "ChefDrobe"
 
@@ -390,8 +340,10 @@
 					/obj/item/screwdriver = 2,
 					/obj/item/stack/cable_coil/random = 4)
 	refill_canister = /obj/item/vending_refill/wardrobe/jani_wardrobe
+	default_price = PRICE_CHEAP
+	extra_price = PRICE_EXPENSIVE * 0.8
 	payment_department = ACCOUNT_SRV
-	cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
+	light_color = COLOR_STRONG_MAGENTA
 
 /obj/item/vending_refill/wardrobe/jani_wardrobe
 	machine_name = "JaniDrobe"
@@ -423,18 +375,16 @@
 					/obj/item/clothing/shoes/laceup = 3,
 					/obj/item/clothing/accessory/lawyers_badge = 3)
 	refill_canister = /obj/item/vending_refill/wardrobe/law_wardrobe
-	payment_department = ACCOUNT_CIV
-	cost_multiplier_per_dept = list(ACCOUNT_CIV = 0)
-
+	payment_department = ACCOUNT_SRV
 /obj/item/vending_refill/wardrobe/law_wardrobe
 	machine_name = "LawDrobe"
 
 /obj/machinery/vending/wardrobe/chap_wardrobe
-	name = "ChapDrobe"
-	desc = "This most blessed and holy machine vends clothing only suitable for chaplains to gaze upon."
+	name = "DeusVend"
+	desc = "God wills your purchase."
 	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 ChapDrobe!"
+	vend_reply = "Thank you for using the DeusVend!"
 	products = list(/obj/item/choice_beacon/holy = 1,
 					/obj/item/storage/backpack/cultpack = 2,
 					/obj/item/clothing/accessory/pocketprotector/cosmetology = 2,
@@ -451,11 +401,9 @@
 	premium = list(/obj/item/toy/plush/plushvar = 1,
 					/obj/item/toy/plush/narplush = 1)
 	refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe
-	payment_department = ACCOUNT_CIV
-	cost_multiplier_per_dept = list(ACCOUNT_CIV = 0)
-
+	payment_department = ACCOUNT_SRV
 /obj/item/vending_refill/wardrobe/chap_wardrobe
-	machine_name = "ChapDrobe"
+	machine_name = "DeusVend"
 
 /obj/machinery/vending/wardrobe/chem_wardrobe
 	name = "ChemDrobe"
@@ -475,8 +423,6 @@
 					/obj/item/fermichem/pHbooklet = 3)
 	refill_canister = /obj/item/vending_refill/wardrobe/chem_wardrobe
 	payment_department = ACCOUNT_MED
-	cost_multiplier_per_dept = list(ACCOUNT_MED = 0)
-
 /obj/item/vending_refill/wardrobe/chem_wardrobe
 	machine_name = "ChemDrobe"
 
@@ -494,9 +440,7 @@
 					/obj/item/storage/backpack/genetics = 3,
 					/obj/item/storage/backpack/satchel/gen = 3)
 	refill_canister = /obj/item/vending_refill/wardrobe/gene_wardrobe
-	payment_department = ACCOUNT_MED
-	cost_multiplier_per_dept = list(ACCOUNT_MED = 0)
-
+	payment_department = ACCOUNT_SCI
 /obj/item/vending_refill/wardrobe/gene_wardrobe
 	machine_name = "GeneDrobe"
 
@@ -517,11 +461,46 @@
 					/obj/item/storage/backpack/satchel/vir = 3)
 	refill_canister = /obj/item/vending_refill/wardrobe/viro_wardrobe
 	payment_department = ACCOUNT_MED
-	cost_multiplier_per_dept = list(ACCOUNT_MED = 0)
-
 /obj/item/vending_refill/wardrobe/viro_wardrobe
 	machine_name = "ViroDrobe"
 
+/obj/machinery/vending/wardrobe/det_wardrobe
+	name = "\improper DetDrobe"
+	desc = "A machine for all your detective needs, as long as you need clothes."
+	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/under/rank/security/detective/brown = 2,
+					/obj/item/clothing/under/rank/security/detective/brown/brown2 = 2,
+					/obj/item/clothing/under/rank/security/officer/blueshirt/seccorp/detcorp = 2,
+					/obj/item/clothing/under/rank/security/officer/util = 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/grey = 2,
+					/obj/item/clothing/under/rank/security/detective/grey/skirt = 2,
+					/obj/item/clothing/accessory/waistcoat = 2,
+					/obj/item/clothing/shoes/laceup = 2,
+					/obj/item/clothing/suit/det_suit/grey = 1,
+					/obj/item/clothing/suit/det_suit/forensicsred = 1,
+					/obj/item/clothing/suit/det_suit/forensicsred/long = 1,
+					/obj/item/clothing/suit/det_suit/forensicsblue = 1,
+					/obj/item/clothing/suit/det_suit/forensicsblue/long = 1,
+					/obj/item/clothing/head/fedora = 2,
+					/obj/item/clothing/gloves/color/black = 2,
+					/obj/item/clothing/gloves/color/latex = 2,
+					/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 = PRICE_EXPENSIVE * 1.75
+	payment_department = ACCOUNT_SEC
+
+/obj/item/vending_refill/wardrobe/det_wardrobe
+	machine_name = "DetDrobe"
+
 /obj/machinery/vending/wardrobe/cap_wardrobe
 	name = "Captain's Wardrobe"
 	desc = "The latest and greatest in Nanotrasen fashion for your great leader."
@@ -552,10 +531,6 @@
 	default_price = PRICE_ALMOST_EXPENSIVE
 	extra_price = PRICE_ABOVE_EXPENSIVE
 
-/obj/machinery/vending/wardrobe/cap_wardrobe/Initialize()
-	. = ..()
-	cost_multiplier_per_dept = list("[ACCESS_CAPTAIN]" = 0)
-
 /obj/item/vending_refill/wardrobe/cap_wardrobe
 	machine_name = "Captain's Wardrobe"
 	icon_state = "refill_caps"

code/modules/vending/youtool.dm

@@ -3,6 +3,7 @@
 	desc = "Tools for tools."
 	icon_state = "tool"
 	icon_deny = "tool-deny"
+	light_mask = "tool-light-mask"
 	products = list(/obj/item/stack/cable_coil/random = 15,
 					/obj/item/crowbar = 10,
 					/obj/item/weldingtool = 6,
@@ -19,13 +20,11 @@
 					/obj/item/multitool = 2)
 	premium = list(/obj/item/clothing/gloves/color/yellow = 2,
 					/obj/item/weldingtool/hugetank = 2)
-	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
-	refill_canister = /obj/item/vending_refill/tool
-	resistance_flags = FIRE_PROOF
+	refill_canister = /obj/item/vending_refill/youtool
 	default_price = PRICE_REALLY_CHEAP
 	extra_price = PRICE_EXPENSIVE
 	payment_department = ACCOUNT_ENG
-	cost_multiplier_per_dept = list(ACCOUNT_ENG = 0)
 
-/obj/item/vending_refill/tool
+/obj/item/vending_refill/youtool
+	machine_name = "YouTool"
 	icon_state = "refill_engi"