diff --git a/code/defines/obj/clothing.dm b/code/defines/obj/clothing.dm
index 1745fac688..0dc98dfc3b 100644
--- a/code/defines/obj/clothing.dm
+++ b/code/defines/obj/clothing.dm
@@ -207,6 +207,11 @@
 	desc = "Strange-looking hat-wear that most certainly belongs to a real magic user."
 	icon_state = "wizard"
 
+/obj/item/clothing/head/wizard/red
+	name = "wizard hat"
+	desc = "Strange-looking, red, hat-wear that most certainly belongs to a real magic user."
+	icon_state = "redwizard"
+
 /obj/item/clothing/head/wizard_fake
 	name = "wizard hat"
 	desc = "It has WIZZARD written across it in sequins. Comes with a cool beard."
@@ -560,6 +565,16 @@
 	heat_transfer_coefficient = 0.01
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 
+/obj/item/clothing/suit/wizrobe/red
+	name = "wizard robe"
+	desc = "A magnificant, red, gem-lined robe that seems to radiate power."
+	icon_state = "redwizard"
+	item_state = "redwizrobe"
+	gas_transfer_coefficient = 0.01 // IT'S MAGICAL OKAY JEEZ +1 TO NOT DIE
+	permeability_coefficient = 0.01
+	heat_transfer_coefficient = 0.01
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+
 /obj/item/clothing/suit/wizrobe_fake
 	name = "wizard robe"
 	desc = "A rather dull, blue robe one could probably find in Space-Walmart."
diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm
index d37a459882..33e143d1f7 100644
--- a/code/defines/obj/machinery.dm
+++ b/code/defines/obj/machinery.dm
@@ -654,6 +654,18 @@
 	product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium"
 	product_hideamt = "1;2;2;2"
 
+/obj/machinery/vending/magivend
+	name = "MagiVend"
+	desc = "A magic vending machine."
+	icon_state = "MagiVend"
+	product_amounts = "1;1;1;2"
+	product_slogans = "Sling spells the proper way with MagiVend!;Be your own Houdini! Use MagiVend!"
+	product_paths = "/obj/item/clothing/head/wizard;/obj/item/clothing/suit/wizrobe;/obj/item/clothing/shoes/sandal;/obj/item/weapon/staff"
+	vend_delay = 15
+	vend_reply = "Have an enchanted evening!"
+	product_hidden = "/obj/item/clothing/head/wizard/red;/obj/item/clothing/suit/wizrobe/red"
+	product_hideamt = "1;1"
+
 /obj/machinery/microwave
 	name = "Microwave"
 	icon = 'kitchen.dmi'
diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
index 6fa072d491..af6088dbee 100644
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -1,7 +1,7 @@
 /obj/machinery/computer/robotics
 	name = "Robotics Control"
 	icon = 'computer.dmi'
-	icon_state = "id"
+	icon_state = "robot"
 	req_access = list(access_captain, access_robotics)
 
 	var/id = 0.0
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 61c239c9bc..797f8aa47d 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index ce0f4e0c2f..9e40498eac 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index fa73cdffff..927fd2cf8d 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 45bc33bc34..7895f90f38 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi
index 30c8a2514c..17cda3ff9d 100644
Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index c111d71ea4..245534467c 100644
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/maps/tgstation.1.3.1.dmm b/maps/tgstation.1.3.1.dmm
index 39a1626ee7..ecd714ecca 100644
--- a/maps/tgstation.1.3.1.dmm
+++ b/maps/tgstation.1.3.1.dmm
@@ -9,7 +9,7 @@
 "aai" = (/turf/simulated/shuttle/floor{icon_state = "floor5"},/area/wizard_station)
 "aaj" = (/obj/machinery/atmospherics/pipe/simple,/turf/simulated/shuttle/floor{icon_state = "floor5"},/area/wizard_station)
 "aak" = (/obj/table,/obj/machinery/light/lamp{pixel_y = 6},/turf/simulated/shuttle/floor{icon_state = "floor5"},/area/wizard_station)
-"aal" = (/obj/machinery/vending{desc = "A magic vending machine."; name = "MagiVend"; product_amounts = "1;1;1;2"; product_paths = "/obj/item/clothing/head/wizard;/obj/item/clothing/suit/wizrobe;/obj/item/clothing/shoes/sandal;/obj/item/weapon/staff"; product_slogans = "Sling spells the proper way with MagiVend!;Be your own Houdini! Use MagiVend!"; vend_delay = 15; vend_reply = "Have an enchanted evening!"},/turf/simulated/shuttle/floor{icon_state = "floor5"},/area/wizard_station)
+"aal" = (/obj/machinery/vending/magivend,/turf/simulated/shuttle/floor{icon_state = "floor5"},/area/wizard_station)
 "aam" = (/obj/crate,/turf/simulated/shuttle/floor{icon_state = "floor5"},/area/wizard_station)
 "aan" = (/obj/grille,/turf/simulated/floor/plating/airless,/area)
 "aao" = (/obj/machinery/shuttle/engine/propulsion{tag = "icon-propulsion (EAST)"; icon_state = "propulsion_r"; dir = 4; pixel_y = -1},/turf/space,/area/wizard_station)