diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index 9e263df3f42..f863d73710f 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -30,6 +30,9 @@
 	light_range = 7
 	light_color = "#ff3232"
 
+	//Trick to get the glowing overlay visible from a distance
+	luminosity = 1
+
 	var/detecting = 1
 	var/buildstage = 2 // 2 = complete, 1 = no wires, 0 = circuit gone
 	var/last_alarm = 0
diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm
index e10d82e5b32..a2d565d5974 100644
--- a/code/game/machinery/lightswitch.dm
+++ b/code/game/machinery/lightswitch.dm
@@ -24,9 +24,13 @@
 	update_icon()
 
 /obj/machinery/light_switch/update_icon_state()
+	SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
+	luminosity = 0
 	if(machine_stat & NOPOWER)
 		icon_state = "light-p"
 	else
+		luminosity = 1
+		SSvis_overlays.add_vis_overlay(src, icon, "light-glow", EMISSIVE_LAYER, EMISSIVE_PLANE, dir, alpha)
 		if(area.lightswitch)
 			icon_state = "light1"
 		else
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 0e8678582b2..bb1df8ea8cd 100755
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -1,7 +1,7 @@
 /obj/machinery/recharger
 	name = "recharger"
 	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "recharger0"
+	icon_state = "recharger"
 	desc = "A charging dock for energy based weaponry."
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 4
@@ -158,16 +158,24 @@
 			if(B.cell)
 				B.cell.charge = 0
 
-
-/obj/machinery/recharger/update_icon_state()
+/obj/machinery/recharger/update_overlays()
+	. = ..()
+	SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
+	luminosity = 0
 	if(machine_stat & (NOPOWER|BROKEN) || !anchored)
-		icon_state = "rechargeroff"
-	else if(panel_open)
-		icon_state = "rechargeropen"
-	else if(charging)
+		return
+	if(panel_open)
+		SSvis_overlays.add_vis_overlay(src, icon, "recharger-open", layer, plane, dir, alpha)
+		return
+
+	luminosity = 1
+	if (charging)
 		if(using_power)
-			icon_state = "recharger1"
+			SSvis_overlays.add_vis_overlay(src, icon, "recharger-charging", layer, plane, dir, alpha)
+			SSvis_overlays.add_vis_overlay(src, icon, "recharger-charging", EMISSIVE_LAYER, EMISSIVE_PLANE, dir, alpha)
 		else
-			icon_state = "recharger2"
+			SSvis_overlays.add_vis_overlay(src, icon, "recharger-full", layer, plane, dir, alpha)
+			SSvis_overlays.add_vis_overlay(src, icon, "recharger-full", EMISSIVE_LAYER, EMISSIVE_PLANE, dir, alpha)
 	else
-		icon_state = "recharger0"
+		SSvis_overlays.add_vis_overlay(src, icon, "recharger-empty", layer, plane, dir, alpha)
+		SSvis_overlays.add_vis_overlay(src, icon, "recharger-empty", EMISSIVE_LAYER, EMISSIVE_PLANE, dir, alpha)
diff --git a/code/game/objects/effects/effect_system/effects_sparks.dm b/code/game/objects/effects/effect_system/effects_sparks.dm
index 00eac5b0a09..2cd2469637b 100644
--- a/code/game/objects/effects/effect_system/effects_sparks.dm
+++ b/code/game/objects/effects/effect_system/effects_sparks.dm
@@ -29,7 +29,7 @@
 	return INITIALIZE_HINT_LATELOAD
 
 /obj/effect/particle_effect/sparks/LateInitialize()
-	flick(icon_state, src) // replay the animation
+	flick(icon_state, src)
 	playsound(src, "sparks", 100, TRUE)
 	var/turf/T = loc
 	if(isturf(T))
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 11e8aa881f6..80fb7a438f5 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -72,6 +72,8 @@
 
 /obj/structure/closet/proc/closet_update_overlays(list/new_overlays)
 	. = new_overlays
+	SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
+	luminosity = 0
 	if(!opened)
 		if(icon_door)
 			. += "[icon_door]_door"
@@ -80,6 +82,9 @@
 		if(welded)
 			. += icon_welded
 		if(secure && !broken)
+			//Overlay is similar enough for both that we can use the same mask for both
+			luminosity = 1
+			SSvis_overlays.add_vis_overlay(src, icon, "locked", EMISSIVE_LAYER, EMISSIVE_PLANE, dir, alpha)
 			if(locked)
 				. += "locked"
 			else
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 7466bd73f54..033a9729f32 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -42,7 +42,9 @@
 		. += "<span class='notice'>The status display reads: This unit can hold a maximum of <b>[max_n_of_items]</b> items.</span>"
 
 /obj/machinery/smartfridge/update_icon_state()
+	SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
 	if(!machine_stat)
+		SSvis_overlays.add_vis_overlay(src, icon, "smartfridge-light-mask", EMISSIVE_LAYER, EMISSIVE_PLANE, dir, alpha)
 		if (visible_contents)
 			switch(contents.len)
 				if(0)
diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
index b7037f50368..5aa6d590f3b 100644
--- a/code/modules/recycling/disposal/bin.dm
+++ b/code/modules/recycling/disposal/bin.dm
@@ -347,6 +347,10 @@
 
 /obj/machinery/disposal/bin/update_overlays()
 	. = ..()
+
+	SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
+	luminosity = 0
+
 	if(machine_stat & BROKEN)
 		return
 
@@ -358,15 +362,19 @@
 	if(machine_stat & NOPOWER || panel_open)
 		return
 
+	luminosity = 1
 	//check for items in disposal - occupied light
 	if(contents.len > 0)
 		. += "dispover-full"
+		SSvis_overlays.add_vis_overlay(src, icon, "dispover-full", EMISSIVE_LAYER, EMISSIVE_PLANE, dir, alpha)
 
 	//charging and ready light
 	if(pressure_charging)
 		. += "dispover-charge"
+		SSvis_overlays.add_vis_overlay(src, icon, "dispover-charge-glow", EMISSIVE_LAYER, EMISSIVE_PLANE, dir, alpha)
 	else if(full_pressure)
 		. += "dispover-ready"
+		SSvis_overlays.add_vis_overlay(src, icon, "dispover-ready-glow", EMISSIVE_LAYER, EMISSIVE_PLANE, dir, alpha)
 
 /obj/machinery/disposal/bin/proc/do_flush()
 	set waitfor = FALSE
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index c0e0b803dd2..bc2802cf22a 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -55,6 +55,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70)
 	circuit = /obj/item/circuitboard/machine/vendor
 	payment_department = ACCOUNT_SRV
+	light_power = 0.5
+	light_range = MINIMUM_USEFUL_LIGHT_RANGE
 	/// Is the machine active (No sales pitches if off)!
 	var/active = 1
 	///Are we ready to vend?? Is it time??
@@ -157,6 +159,9 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	/// how many items have been inserted in a vendor
 	var/loaded_items = 0
 
+	///Name of lighting mask for the vending machine
+	var/light_mask
+
 /obj/item/circuitboard
     ///determines if the circuit board originated from a vendor off station or not.
 	var/onstation = TRUE
@@ -233,10 +238,23 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 /obj/machinery/vending/update_icon_state()
 	if(machine_stat & BROKEN)
 		icon_state = "[initial(icon_state)]-broken"
+		set_light(0)
 	else if(powered())
 		icon_state = initial(icon_state)
+		set_light(1.4)
 	else
 		icon_state = "[initial(icon_state)]-off"
+		set_light(0)
+
+
+/obj/machinery/vending/update_overlays()
+	. = ..()
+	if(!light_mask)
+		return
+
+	SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
+	if(!(machine_stat & BROKEN) && powered())
+		SSvis_overlays.add_vis_overlay(src, icon, light_mask, EMISSIVE_LAYER, EMISSIVE_PLANE)
 
 /obj/machinery/vending/obj_break(damage_flag)
 	. = ..()
diff --git a/code/modules/vending/assist.dm b/code/modules/vending/assist.dm
index 40b183160b5..a2529428b85 100644
--- a/code/modules/vending/assist.dm
+++ b/code/modules/vending/assist.dm
@@ -21,6 +21,7 @@
 	default_price = 125
 	extra_price = 100
 	payment_department = NO_FREEBIES
+	light_mask = "generic-light-mask"
 
 /obj/item/vending_refill/assist
 	machine_name = "Vendomat"
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index da517e4ff7f..40626c41e87 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -145,6 +145,7 @@
 	default_price = 180
 	extra_price = 360
 	payment_department = ACCOUNT_SRV
+	light_mask="theater-light-mask"
 
 /obj/machinery/vending/autodrobe/canLoadItem(obj/item/I,mob/user)
 	return (I.type in products)
diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm
index 8dbe23a8e60..f3ed1652afb 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -49,6 +49,7 @@
 	default_price = 120
 	extra_price = 200
 	payment_department = ACCOUNT_SRV
+	light_mask = "boozeomat-light-mask"
 
 /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."
diff --git a/code/modules/vending/cartridge.dm b/code/modules/vending/cartridge.dm
index 120cbf08ee2..36db52996e1 100644
--- a/code/modules/vending/cartridge.dm
+++ b/code/modules/vending/cartridge.dm
@@ -17,6 +17,7 @@
 	default_price = 250
 	extra_price = 500
 	payment_department = ACCOUNT_SRV
+	light_mask="cart-light-mask"
 
 /obj/item/vending_refill/cart
 	machine_name = "PTech"
diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm
index a5fbb472efc..194e46869fb 100644
--- a/code/modules/vending/cigarette.dm
+++ b/code/modules/vending/cigarette.dm
@@ -24,6 +24,7 @@
 	default_price = 75
 	extra_price = 250
 	payment_department = ACCOUNT_SRV
+	light_mask = "cigs-light-mask"
 
 /obj/machinery/vending/cigarette/syndicate
 	products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 7,
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 504a3572f8c..69622f13cc3 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -131,6 +131,8 @@
 	default_price = 60
 	extra_price = 120
 	payment_department = NO_FREEBIES
+	light_mask = "wardrobe-light-mask"
+	light_color = "#00FF00"
 
 /obj/machinery/vending/clothing/canLoadItem(obj/item/I,mob/user)
 	return (I.type in products)
diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm
index c6b47757eb5..44f4d9e054d 100644
--- a/code/modules/vending/coffee.dm
+++ b/code/modules/vending/coffee.dm
@@ -12,6 +12,9 @@
 	default_price = 45
 	extra_price = 150
 	payment_department = ACCOUNT_SRV
+	light_mask = "coffee-light-mask"
+	light_color = "#8b633b"
+
 /obj/item/vending_refill/coffee
 	machine_name = "Solar's Best Hot Drinks"
 	icon_state = "refill_joe"
diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm
index 4fa24c7dbbd..eac9fe477f9 100644
--- a/code/modules/vending/cola.dm
+++ b/code/modules/vending/cola.dm
@@ -24,6 +24,8 @@
 	default_price = 45
 	extra_price = 200
 	payment_department = ACCOUNT_SRV
+
+
 /obj/item/vending_refill/cola
 	machine_name = "Robust Softdrinks"
 	icon_state = "refill_cola"
@@ -41,36 +43,49 @@
 
 /obj/machinery/vending/cola/blue
 	icon_state = "Cola_Machine"
+	light_mask = "cola-light-mask"
+	light_color = "#555cc2"
 
 /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 = "#a50824"
 
 /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 = "#44964a"
 
 /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 = "#ffc44d"
 
 /obj/machinery/vending/cola/sodie
 	icon_state = "soda"
+	light_mask = "soda-light-mask"
+	light_color = ""
 
 /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 = "#6927c5"
 
 /obj/machinery/vending/cola/shamblers
 	name = "\improper Shambler's Vendor"
@@ -87,3 +102,5 @@
 					/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_mask = "#e4005b"
diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm
index 0069c4797f8..465ac0d40f6 100644
--- a/code/modules/vending/drinnerware.dm
+++ b/code/modules/vending/drinnerware.dm
@@ -22,6 +22,7 @@
 	default_price = 50
 	extra_price = 250
 	payment_department = ACCOUNT_SRV
+	light_mask = "dinnerware-light-mask"
 
 /obj/item/vending_refill/dinnerware
 	machine_name = "Plasteel Chef's Dinnerware Vendor"
diff --git a/code/modules/vending/engineering.dm b/code/modules/vending/engineering.dm
index bd0015d5bf6..8c6cf86939e 100644
--- a/code/modules/vending/engineering.dm
+++ b/code/modules/vending/engineering.dm
@@ -31,6 +31,7 @@
 	default_price = 450
 	extra_price = 500
 	payment_department = ACCOUNT_ENG
+	light_mask = "engi-light-mask"
 
 /obj/item/vending_refill/engineering
 	machine_name = "Robco Tool Maker"
diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm
index 41ac52904bc..bc891fe8fdb 100644
--- a/code/modules/vending/engivend.dm
+++ b/code/modules/vending/engivend.dm
@@ -23,6 +23,7 @@
 	default_price = 450
 	extra_price = 500
 	payment_department = ACCOUNT_ENG
+	light_mask = "engivend-light-mask"
 
 /obj/item/vending_refill/engivend
 	machine_name = "Engi-Vend"
diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm
index 24a4744a7ec..0670fa03b44 100644
--- a/code/modules/vending/games.dm
+++ b/code/modules/vending/games.dm
@@ -17,6 +17,7 @@
 	default_price = 50
 	extra_price = 250
 	payment_department = ACCOUNT_SRV
+	light_mask = "games-light-mask"
 
 /obj/item/vending_refill/games
 	machine_name = "\improper Good Clean Fun"
diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm
index 3821f94e7fe..11f9de6b2c5 100644
--- a/code/modules/vending/liberation.dm
+++ b/code/modules/vending/liberation.dm
@@ -31,3 +31,4 @@
 	default_price = 150
 	extra_price = 500
 	payment_department = ACCOUNT_SEC
+	light_mask = "liberation-light-mask"
diff --git a/code/modules/vending/liberation_toy.dm b/code/modules/vending/liberation_toy.dm
index e91c7685611..9e228fb7aae 100644
--- a/code/modules/vending/liberation_toy.dm
+++ b/code/modules/vending/liberation_toy.dm
@@ -28,3 +28,4 @@
 	default_price = 150
 	extra_price = 300
 	payment_department = ACCOUNT_SRV
+	light_mask = "donksoft-light-mask"
diff --git a/code/modules/vending/magivend.dm b/code/modules/vending/magivend.dm
index b1eb72e179f..6b1245cec80 100644
--- a/code/modules/vending/magivend.dm
+++ b/code/modules/vending/magivend.dm
@@ -19,3 +19,4 @@
 	default_price = 250
 	extra_price = 500
 	payment_department = ACCOUNT_SRV
+	light_mask = "magivend-light-mask"
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index 00868bf96af..d6a15a7f683 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -45,6 +45,7 @@
 	default_price = 250
 	extra_price = 500
 	payment_department = ACCOUNT_MED
+	light_mask = "med-light-mask"
 
 /obj/item/vending_refill/medical
 	machine_name = "NanoMed Plus"
diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm
index 1f7e5152af8..706fde6295a 100644
--- a/code/modules/vending/medical_wall.dm
+++ b/code/modules/vending/medical_wall.dm
@@ -21,6 +21,7 @@
 	extra_price = 500
 	payment_department = ACCOUNT_MED
 	tiltable = FALSE
+	light_mask = "wallmed-light-mask"
 
 /obj/item/vending_refill/wallmed
 	machine_name = "NanoMed"
diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm
index fb00127c8c5..b99cfa3388a 100644
--- a/code/modules/vending/megaseed.dm
+++ b/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,
diff --git a/code/modules/vending/modularpc.dm b/code/modules/vending/modularpc.dm
index c94e0b70569..89b7065bc88 100644
--- a/code/modules/vending/modularpc.dm
+++ b/code/modules/vending/modularpc.dm
@@ -3,6 +3,7 @@
 	desc = "All the parts you need to build your own custom pc."
 	icon_state = "modularpc"
 	icon_deny = "modularpc-deny"
+	light_mask = "modular-light-mask"
 	product_ads = "Get your gamer gear!;The best GPUs for all of your space-crypto needs!;The most robust cooling!;The finest RGB in space!"
 	vend_reply = "Game on!"
 	products = list(/obj/item/modular_computer/laptop = 4,
diff --git a/code/modules/vending/nutrimax.dm b/code/modules/vending/nutrimax.dm
index 3529d115c3a..6e4be04d68a 100644
--- a/code/modules/vending/nutrimax.dm
+++ b/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,
diff --git a/code/modules/vending/robotics.dm b/code/modules/vending/robotics.dm
index 9d0bf7be02b..e8b377db3db 100644
--- a/code/modules/vending/robotics.dm
+++ b/code/modules/vending/robotics.dm
@@ -4,6 +4,7 @@
 	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,
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index 8a25cd96b0c..3ad57d1eddb 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -4,6 +4,7 @@
 	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?"
 	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,
diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm
index fefad806b8d..ddddf8daee3 100644
--- a/code/modules/vending/snack.dm
+++ b/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/spacetwinkie = 6,
 					/obj/item/reagent_containers/food/snacks/cheesiehonkers = 6,
 					/obj/item/reagent_containers/food/snacks/candy = 6,
diff --git a/code/modules/vending/sovietsoda.dm b/code/modules/vending/sovietsoda.dm
index 6e2ecd54524..0e9f6ea9825 100644
--- a/code/modules/vending/sovietsoda.dm
+++ b/code/modules/vending/sovietsoda.dm
@@ -2,6 +2,7 @@
 	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)
@@ -10,6 +11,7 @@
 	default_price = 1
 	extra_price = 1
 	payment_department = NO_FREEBIES
+	light_color = "#ffbe9d"
 
 /obj/item/vending_refill/sovietsoda
 	machine_name = "BODA"
diff --git a/code/modules/vending/sustenance.dm b/code/modules/vending/sustenance.dm
index 606ea8c7ca1..dc6c70cc46e 100644
--- a/code/modules/vending/sustenance.dm
+++ b/code/modules/vending/sustenance.dm
@@ -3,6 +3,7 @@
 	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!;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/prison = 24,
 					/obj/item/reagent_containers/food/snacks/breadslice/moldy = 15,
diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm
index 068ee1998ed..e9329dbe53c 100644
--- a/code/modules/vending/toys.dm
+++ b/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,
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index bd8484f7cb6..b0c2619f87f 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -6,6 +6,7 @@
 	extra_price = 450
 	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,6 +36,7 @@
 					/obj/item/clothing/head/beret/sec/navyofficer = 3)
 	refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe
 	payment_department = ACCOUNT_SEC
+	light_color = "#ff3300"
 
 /obj/item/vending_refill/wardrobe/sec_wardrobe
 	machine_name = "SecDrobe"
@@ -65,6 +67,7 @@
 					/obj/item/clothing/mask/surgical = 4)
 	refill_canister = /obj/item/vending_refill/wardrobe/medi_wardrobe
 	payment_department = ACCOUNT_MED
+
 /obj/item/vending_refill/wardrobe/medi_wardrobe
 	machine_name = "MediDrobe"
 
@@ -88,6 +91,8 @@
 					/obj/item/clothing/head/hardhat/weldhat = 3)
 	refill_canister = /obj/item/vending_refill/wardrobe/engi_wardrobe
 	payment_department = ACCOUNT_ENG
+	light_color = "#fbff23"
+
 /obj/item/vending_refill/wardrobe/engi_wardrobe
 	machine_name = "EngiDrobe"
 
@@ -107,6 +112,8 @@
 					/obj/item/clothing/shoes/sneakers/black = 3)
 	refill_canister = /obj/item/vending_refill/wardrobe/atmos_wardrobe
 	payment_department = ACCOUNT_ENG
+	light_color = "#fbff23"
+
 /obj/item/vending_refill/wardrobe/atmos_wardrobe
 	machine_name = "AtmosDrobe"
 
@@ -190,6 +197,8 @@
 					/obj/item/clothing/accessory/armband/hydro = 3)
 	refill_canister = /obj/item/vending_refill/wardrobe/hydro_wardrobe
 	payment_department = ACCOUNT_SRV
+	light_color = "#00FF00"
+
 /obj/item/vending_refill/wardrobe/hydro_wardrobe
 	machine_name = "HyDrobe"
 
@@ -299,6 +308,8 @@
 					/obj/item/storage/belt/janitor = 2)
 	refill_canister = /obj/item/vending_refill/wardrobe/jani_wardrobe
 	payment_department = ACCOUNT_SRV
+	light_color = "#b800b8"
+
 /obj/item/vending_refill/wardrobe/jani_wardrobe
 	machine_name = "JaniDrobe"
 
diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm
index f3e4288dd6b..ad7fe82d420 100644
--- a/code/modules/vending/youtool.dm
+++ b/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 = 10,
 					/obj/item/crowbar = 5,
 					/obj/item/weldingtool = 3,
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 9b9e7c567d4..e155eb89938 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/obj/atmospherics/pipes/disposal.dmi b/icons/obj/atmospherics/pipes/disposal.dmi
index f8f16ba86f4..61ea15ed5a7 100644
Binary files a/icons/obj/atmospherics/pipes/disposal.dmi and b/icons/obj/atmospherics/pipes/disposal.dmi differ
diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi
index 615621fcce3..be92ffb20d6 100644
Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index 0d487ca493a..43be36019d7 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 0b64fc28e66..b40ce9c3e10 100644
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ