diff --git a/code/game/vote.dm b/code/game/vote.dm
index 1307349a05b..add2eb8f2a5 100644
--- a/code/game/vote.dm
+++ b/code/game/vote.dm
@@ -59,7 +59,7 @@
 	calcwin()
 
 	if(mode)
-		if(ticker.current_state == GAME_STATE_PREGAME)
+		if(ticker.current_state == 1)
 			if(!going)
 				world << "<B>The game will start soon.</B>"
 				going = 1
@@ -74,7 +74,7 @@
 		world << "Result is change to \red [wintext]"
 		world.save_mode(winner)
 
-		if(ticker.current_state != GAME_STATE_PREGAME)
+		if(ticker.current_state != 1)
 			world <<"\red <B>World will reboot in 10 seconds</B>"
 
 			feedback_set_details("end_error","mode vote - [winner]")
@@ -263,8 +263,8 @@
 		if(!vote.canvote())		// not time to vote yet
 			if(config.allow_vote_restart) text+="Voting to restart is enabled.<BR>"
 			if(config.allow_vote_mode)
-				if(ticker.current_state == GAME_STATE_PREGAME) text+="Voting to change mode is enabled.<BR>"
-				else text =+ "Change mode votes are disabled while a round is in progress, vote to restart first.<BR>"
+				if(ticker.current_state == 1) text+="Voting to change mode is enabled.<BR>"
+				else text += "Change mode votes are disabled while a round is in progress, vote to restart first.<BR>"
 
 			text+="<BR><P>Next vote can begin in [vote.nextwait()]."
 			text+=footer
@@ -275,10 +275,10 @@
 			if(config.allow_vote_restart)
 				text += "<A href='?src=\ref[vote];voter=\ref[src];vmode=1'>Begin restart vote.</A><BR>"
 			if(config.allow_vote_mode)
-				if(ticker.current_state == GAME_STATE_PREGAME)
+				if(ticker.current_state == 1)
 					text += "<A href='?src=\ref[vote];voter=\ref[src];vmode=2'>Begin change mode vote.</A><BR>"
 				else
-					text =+ "Change mode votes are disabled while a round is in progress, vote to restart first.<BR>"
+					text += "Change mode votes are disabled while a round is in progress, vote to restart first.<BR>"
 
 			text += footer
 			usr << browse(text, "window=vote")
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index dec2d5d35e0..d2253885023 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -79,15 +79,19 @@
 		return
 
 		//if(icon_state == initial(icon_state))
-	var/icontype = input("Please, select a display!", "AI", null/*, null*/) in list("Clown", "HAL9000", "Monochrome", "Blue", "HAL9000 Mark2", "Inverted", "Firewall", "Green")
-	if(icontype == "Clown")
-		icon_state = "ai-clown2"
+	var/icontype = ""
+	if (src.name == "B.A.N.N.E.D." && src.ckey == "Spaceman96")
+		icontype = input("Please, select a display!", "AI", null/*, null*/) in list("B.A.N.N.E.D.", "Blue", "HAL9000", "Monochrome", "Rainbow", "HAL9000 Mark2", "Inverted", "Firewall", "Green", "Text", "Smiley", "Angry", "Dorf", "Matrix")
+	else
+		icontype = input("Please, select a display!", "AI", null/*, null*/) in list("Blue", "HAL9000", "Monochrome", "Rainbow", "HAL9000 Mark2", "Inverted", "Firewall", "Green", "Text", "Smiley", "Angry", "Dorf", "Matrix")
+	if(icontype == "Blue")
+		icon_state = "ai"
 	else if(icontype == "HAL9000")
 		icon_state = "ai-hal9000-2"
 	else if(icontype == "Monochrome")
 		icon_state = "ai-mono"
-	else if(icontype == "Blue")
-		icon_state = "ai"
+	else if(icontype == "Rainbow")
+		icon_state = "ai-clown"
 	else if(icontype == "HAL9000 Mark2")
 		icon_state = "ai-hal9000-3"
 	else if(icontype == "Inverted")
@@ -96,8 +100,20 @@
 		icon_state = "ai-magma"
 	else if(icontype == "Funny")
 		icon_state = "ai-yesman"
-	else//(icontype == "Green")
+	else if(icontype == "Green")
 		icon_state = "ai-wierd"
+	else if(icontype == "Text")
+		icon_state = "ai-text"
+	else if(icontype == "Smiley")
+		icon_state = "ai-smiley"
+	else if(icontype == "Angry")
+		icon_state = "ai-angryface"
+	else if(icontype == "Dorf")
+		icon_state = "ai-dorf"
+	else if(icontype == "B.A.N.N.E.D.")
+		icon_state = "ai-banned"
+	else//(icontype == "Matrix")
+		icon_state = "ai-matrix"
 
 	//else
 			//usr <<"You can only change your display once!"
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index e57fe1443b6..ebc2983033d 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -95,27 +95,43 @@
 			modtype = "Miner"
 
 		if("Medical")
+			var/sprite = input(src,"Chassis Style", "Chassis Style", "Cancel") in list("Humanoid","Non-Humanoid")
 			module = new /obj/item/weapon/robot_module/medical(src)
 			hands.icon_state = "medical"
-			icon_state = "surgeon"
+			if (sprite == "Humanoid")
+				src.icon_state = "medicalrobot"
+			if (sprite == "Non-Humanoid")
+				src.icon_state = "surgeon"
 			modtype = "Med"
 
 		if("Security")
+			var/sprite = input(src,"Chassis Style", "Chassis Style", "Cancel") in list("Humanoid","Non-Humanoid")
 			module = new /obj/item/weapon/robot_module/security(src)
 			hands.icon_state = "security"
-			icon_state = "bloodhound"
+			if (sprite == "Humanoid")
+				src.icon_state = "securityrobot"
+			if (sprite == "Non-Humanoid")
+				src.icon_state = "bloodhound"
 			modtype = "Sec"
 
 		if("Engineering")
+			var/sprite = input(src,"Chassis Style", "Chassis Style", "Cancel") in list("Humanoid","Non-Humanoid")
 			module = new /obj/item/weapon/robot_module/engineering(src)
 			hands.icon_state = "engineer"
-			icon_state = "landmate"
+			if (sprite == "Humanoid")
+				src.icon_state = "engineerrobot"
+			if (sprite == "Non-Humanoid")
+				src.icon_state = "landmate"
 			modtype = "Eng"
 
 		if("Janitor")
+			var/sprite = input(src,"Chassis Style", "Chassis Style", "Cancel") in list("Humanoid","Non-Humanoid")
 			module = new /obj/item/weapon/robot_module/janitor(src)
 			hands.icon_state = "janitor"
-			icon_state = "mopgearrex"
+			if (sprite == "Humanoid")
+				src.icon_state = "janitorrobot"
+			if (sprite == "Non-Humanoid")
+				src.icon_state = "mopgearrex"
 			modtype = "Jan"
 
 	overlays -= "eyes" //Takes off the eyes that it started with
diff --git a/icons/mob/AI.dmi b/icons/mob/AI.dmi
index 3802d6cecb6..585ec0880ac 100644
Binary files a/icons/mob/AI.dmi and b/icons/mob/AI.dmi differ
diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi
index 614db60373b..920dffd4cd0 100644
Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ