diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm
index adf6d58fa00..d2c230d5b15 100644
--- a/code/controllers/subsystems/job.dm
+++ b/code/controllers/subsystems/job.dm
@@ -774,8 +774,14 @@
 			else
 				permitted = TRUE
 
-			if(G.whitelisted && !is_alien_whitelisted(H, all_species[G.whitelisted]))
-				permitted = FALSE
+			if (G.whitelisted)
+				var/found = FALSE
+				for (var/species in G.whitelisted)
+					if (is_alien_whitelisted(H, global.all_species[species]))
+						found = TRUE
+						break
+				 if (!found)
+				 	permitted = FALSE
 
 			if(!permitted)
 				H << "<span class='warning'>Your current job or whitelist status does not permit you to spawn with [thing]!</span>"
diff --git a/code/game/machinery/kitchen/icecream.dm b/code/game/machinery/kitchen/icecream.dm
index 35950cd8035..74a37559af5 100644
--- a/code/game/machinery/kitchen/icecream.dm
+++ b/code/game/machinery/kitchen/icecream.dm
@@ -92,7 +92,7 @@
 	dat += "<b>VAT CONTENT</b><br>"
 	for(var/datum/reagent/R in reagents.reagent_list)
 		dat += "[R.name]: [R.volume]"
-		dat += "<A href='?src=\ref[src];disposeI=\ref[R]'>Purge</A><BR>"
+		dat += "<A href='?src=\ref[src];disposeI=[R.id]'>Purge</A><BR>"
 	dat += "<a href='?src=\ref[src];refresh=1'>Refresh</a> <a href='?src=\ref[src];close=1'>Close</a>"
 
 	var/datum/browser/popup = new(user, "icecreamvat","Icecream Vat", 700, 500, src)
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index dc9a287e15e..97c292f079c 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index b0fbbc3b9bf..c0ca7ab53e6 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -6463,17 +6463,15 @@
 	},
 /area/turret_protected/ai)
 "mM" = (
-/obj/machinery/light/small{
-	base_state = "bulb-broken";
-	dir = 4;
-	icon_state = "bulb-broken"
-	},
 /obj/structure/window/reinforced{
 	dir = 8
 	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/machinery/light/small{
+	dir = 4
+	},
 /turf/simulated/floor/bluegrid{
 	name = "cooled mainframe floor";
 	temperature = 278
@@ -7259,11 +7257,6 @@
 	c_tag = "AI Core - Alpha Core";
 	dir = 8
 	},
-/obj/machinery/light/small{
-	base_state = "bulb-broken";
-	dir = 4;
-	icon_state = "bulb-broken"
-	},
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -7272,6 +7265,9 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
+/obj/machinery/light/small{
+	dir = 4
+	},
 /turf/simulated/floor/bluegrid{
 	name = "cooled mainframe floor";
 	temperature = 278
@@ -8916,8 +8912,7 @@
 	},
 /obj/machinery/light/small/emergency,
 /obj/machinery/camera/network/command{
-	c_tag = "Command - Telecomms Main Level Relay";
-	dir = 1
+	c_tag = "Command - Vault Access"
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/nuke_storage)
@@ -43781,7 +43776,7 @@ As
 Bf
 Cg
 Db
-SW
+SQ
 Ex
 Ff
 vt
@@ -44038,7 +44033,7 @@ At
 Bg
 Ch
 Dc
-SX
+SQ
 vb
 uD
 uD
@@ -44809,7 +44804,7 @@ Av
 Bj
 Ck
 De
-SY
+SQ
 Ey
 vx
 FQ
@@ -45066,7 +45061,7 @@ Aw
 Bk
 Cl
 Df
-SZ
+SQ
 Ez
 vv
 vT
@@ -45323,7 +45318,7 @@ Ax
 Bl
 Cm
 Dg
-Ta
+SQ
 vb
 Fg
 vT
@@ -45580,7 +45575,7 @@ SQ
 Bm
 Cn
 Dh
-Tb
+SQ
 EA
 Fh
 vT
@@ -45833,10 +45828,10 @@ xy
 xy
 xy
 zQ
-SR
-ST
-SU
-SV
+SQ
+SQ
+SQ
+SQ
 Tc
 EB
 Fi
@@ -46094,7 +46089,7 @@ vt
 Bn
 Co
 Di
-Td
+Tc
 EC
 Fh
 FR
@@ -46588,10 +46583,10 @@ aa
 ac
 rO
 SC
-SE
-SH
+SC
+SC
 tR
-SK
+SC
 rO
 vc
 vv
@@ -46608,7 +46603,7 @@ uU
 uE
 wm
 Dk
-Te
+Tc
 vb
 Fk
 FT
@@ -46809,7 +46804,7 @@ gi
 gU
 hD
 Sp
-Sr
+Sp
 cg
 cg
 cg
@@ -46832,7 +46827,7 @@ jB
 jB
 jB
 pD
-Sw
+Sv
 jB
 aa
 aa
@@ -47123,8 +47118,8 @@ Bo
 Cq
 Dl
 jB
-Tf
-Th
+Sv
+Sv
 FV
 jB
 jB
@@ -48151,8 +48146,8 @@ Br
 Ct
 Do
 jB
-Tg
-Ti
+Sv
+Sv
 FZ
 jB
 Dw
@@ -48350,8 +48345,8 @@ fJ
 gn
 ha
 hH
-Sq
-Ss
+Sp
+Sp
 cg
 cg
 cg
@@ -48901,7 +48896,7 @@ rv
 rH
 rP
 sp
-SG
+SF
 ts
 ua
 uB
@@ -49932,7 +49927,7 @@ aa
 sS
 SI
 ue
-SL
+SI
 uV
 uV
 vD
@@ -51230,7 +51225,7 @@ aa
 jB
 zx
 Ac
-SS
+Sv
 BA
 jB
 Du
@@ -65096,10 +65091,10 @@ tc
 tc
 uk
 kz
-SM
-SN
-SO
-SP
+Sv
+Sv
+Sv
+Sv
 wF
 jB
 xu
@@ -76397,7 +76392,7 @@ rh
 rh
 rm
 ry
-Sz
+Sx
 rW
 sB
 tg
@@ -76654,7 +76649,7 @@ ri
 ri
 rn
 rz
-SA
+Sx
 rX
 rC
 rC
@@ -77167,13 +77162,13 @@ kj
 rh
 rh
 Sx
-Sy
-SB
+Sx
+Sx
 rZ
-SD
+Sx
 ti
 tL
-SJ
+Sx
 uO
 rh
 rh
diff --git a/maps/aurora/aurora-8_derelict.dmm b/maps/aurora/aurora-8_derelict.dmm
index 1665767efd7..12ad84d05c1 100644
--- a/maps/aurora/aurora-8_derelict.dmm
+++ b/maps/aurora/aurora-8_derelict.dmm
@@ -3262,11 +3262,6 @@
 /turf/simulated/floor/tiled/white,
 /area/derelict/hallway/southeast)
 "kr" = (
-/obj/machinery/light/small{
-	icon_state = "bulb-broken";
-	dir = 8;
-	base_state = "bulb-broken"
-	},
 /obj/structure/table/standard,
 /obj/item/weapon/scalpel,
 /obj/item/device/mass_spectrometer,
@@ -5147,7 +5142,7 @@
 "pB" = (
 /obj/structure/table/glass,
 /obj/item/device/radio{
-	anchored = 1;
+	anchored = 0;
 	broadcasting = 0;
 	canhear_range = 4;
 	desc = "Are you going to make the call?";
@@ -37130,7 +37125,7 @@ aa
 ac
 df
 iu
-up
+ac
 iX
 uR
 ir
@@ -38897,7 +38892,7 @@ ac
 aa
 aa
 aa
-nB
+aa
 aA
 ac
 ac
@@ -46596,7 +46591,7 @@ aa
 ac
 ir
 iq
-jB
+jz
 jz
 jz
 jz