diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm
index 7b85697c1a1..0aa86ab1101 100644
--- a/code/defines/obj/supplypacks.dm
+++ b/code/defines/obj/supplypacks.dm
@@ -290,7 +290,7 @@
 	contains = list("/obj/item/weapon/storage/toolbox/mechanical",
 					"/obj/item/weapon/storage/toolbox/electrical",
 					"/obj/item/clothing/gloves/yellow",
-					"/obj/item/weapon/storage/toolbox/utilitybelt",
+					"/obj/item/weapon/storage/utilitybelt",
 					"/obj/item/clothing/suit/hazardvest",
 					"/obj/item/clothing/head/helmet/hardhat")
 	cost = 10
diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm
index ce6a9881035..0b0ddff535b 100644
--- a/code/game/gamemodes/wizard/wizard.dm
+++ b/code/game/gamemodes/wizard/wizard.dm
@@ -70,6 +70,7 @@
 	wizard.original = wizard.current
 	if(wizardstart.len == 0)
 		wizard.current << "<B>\red A starting location for you could not be found, please report this bug!</B>"
+		return 0
 	else
 		wizard.current.loc = pick(wizardstart)
 	return 1
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index 78d0f26b53f..c3b0889d723 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -199,6 +199,7 @@ var/ordernum=0
 			A:req_access = new/list()
 			A:req_access += text2num(SP.access)
 		for(var/B in SP.contains)
+			if(!B)	continue
 			var/thepath = text2path(B)
 			var/atom/B2 = new thepath (A)
 			if(SP.amount && B2:amount) B2:amount = SP.amount
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index b298ce628ce..024c563f31a 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -7,7 +7,6 @@
 			// Debug
 //			verbs += /client/proc/radio_report //for radio debugging dont think its been used in a very long time
 //			verbs += /client/proc/air_status //does next to nothing
-			verbs += /client/proc/restartcontroller //Can call via aproccall --I_hate_easy_things.jpg, Mport --Agouri
 //			verbs += /client/proc/fix_next_move //has not been an issue in a very very long time
 //			verbs += /client/proc/Cell //More air things
 
@@ -157,7 +156,7 @@
 			verbs += /client/proc/make_sound
 			verbs += /client/proc/only_one
 			verbs += /client/proc/send_space_ninja
-
+			verbs += /client/proc/restartcontroller //Can call via aproccall --I_hate_easy_things.jpg, Mport --Agouri
 
 		if (holder.level >= 4)//Badmin********************************************************************
 			verbs += /obj/admins/proc/adrev					//toggle admin revives
diff --git a/code/modules/admin/verbs/MC.dm b/code/modules/admin/verbs/MC.dm
index 346f98cbecf..ded7740c2c1 100644
--- a/code/modules/admin/verbs/MC.dm
+++ b/code/modules/admin/verbs/MC.dm
@@ -1,5 +1,10 @@
 /client/proc/restartcontroller()
 	set category = "Debug"
 	set name = "Restart Master Controller"
-
-	master_controller.process()
\ No newline at end of file
+	switch(alert("Are you sure?  If the control is still running it will now be running twice.",,"Yes","No"))
+		if("Yes")
+			spawn(0)
+				master_controller.process()
+		if("No")
+			return 0
+	return
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 7a0dd4caddc..55ba7512e65 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -698,7 +698,7 @@
 		if(wiresexposed)
 			overlays += "ov-openpanel +w"
 		else if(cell)
-			overlays += "ov-openpanel -c"
+			overlays += "ov-openpanel +c"
 		else
 			overlays += "ov-openpanel -c"
 	return
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index e99ff69e066..ee705bb59c5 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ