diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm
index f1ebad3b0c1..355d838df6a 100644
--- a/code/modules/clothing/spacesuits/rig.dm
+++ b/code/modules/clothing/spacesuits/rig.dm
@@ -103,21 +103,27 @@
 	armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
 	allowed = list(/obj/item/weapon/gun/energy/laser, /obj/item/weapon/gun/energy/pulse_rifle, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/gun/energy/taser, /obj/item/weapon/melee/baton)
 
-//Wizard Rig
-/obj/item/clothing/head/helmet/space/rig/wizard
-	name = "gem-encrusted hardsuit helmet"
-	icon_state = "rig0-wiz"
-	item_state = "wiz_helm"
-	color = "wiz"
-	unacidable = 1 //No longer shall our kind be foiled by lone chemists with spray bottles!
-	armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
+//Atmos Rig
+/obj/item/clothing/head/helmet/space/rig/atmos
+	name = "atmospherics pressure suit helmet"
+	icon_state = "rig0-atmos"
+	item_state = "atmos_helm"
+	color = "atmos"
+	flags = STOPSPRESSUREDMAGE
+	armor = list(melee = 40, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 0)
+	gas_transfer_coefficient = 0
+	permeability_coefficient = 0
+	heat_protection = HEAD
+	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECITON_TEMPERATURE
 
-/obj/item/clothing/suit/space/rig/wizard
-	icon_state = "rig-wiz"
-	name = "gem-encrusted hardsuit"
-	item_state = "wiz_hardsuit"
-	slowdown = 1
-	w_class = 3
-	unacidable = 1
-	armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
-	allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank/emergency_oxygen)
\ No newline at end of file
+/obj/item/clothing/suit/space/rig/atmos
+	icon_state = "rig-atmos"
+	name = "atmospherics pressure suit"
+	item_state = "atmos_hardsuit"
+	flags = STOPSPRESSUREDMAGE
+	armor = list(melee = 40, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 0)
+	gas_transfer_coefficient = 0
+	permeability_coefficient = 0
+	slowdown = 1.0
+	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECITON_TEMPERATURE
\ No newline at end of file
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 153cedbe6ae..6ca3c2b923d 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index 18da4b7bf42..ffac5f672c1 100644
Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ
diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi
index 74b5eed3a29..f73d9ee81da 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 3f4b469b4bf..93759acf412 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 90e750a0e0d..34a06d7da3b 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
old mode 100755
new mode 100644
index 057dc69a262..638d1d48da5
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ