diff --git a/code/defines/obj/clothing/head.dm b/code/defines/obj/clothing/head.dm
index b4ef87d3dc..a90b606c3d 100644
--- a/code/defines/obj/clothing/head.dm
+++ b/code/defines/obj/clothing/head.dm
@@ -146,6 +146,15 @@
 	item_state = "space"
 	permeability_coefficient = 0.01
 
+/obj/item/clothing/head/helmet/space/capspace
+	name = "space helmet"
+	icon_state = "capspace"
+	desc = "A special helmet designed for work in a hazardous, low-pressure environment. Only for the most fashionable of military figureheads."
+	flags = FPRINT | TABLEPASS | HEADSPACE | HEADCOVERSEYES
+	see_face = 0.0
+	item_state = "capspace"
+	permeability_coefficient = 0.01
+
 /obj/item/clothing/head/helmet/space/rig
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
 	name = "rig helmet"
diff --git a/code/defines/obj/clothing/suit.dm b/code/defines/obj/clothing/suit.dm
index a0683fc6dd..c62970b18a 100644
--- a/code/defines/obj/clothing/suit.dm
+++ b/code/defines/obj/clothing/suit.dm
@@ -202,9 +202,15 @@
 	desc = "Wearing this armor exemplifies who is in charge. You are in charge."
 	icon_state = "caparmor"
 	item_state = "caparmor"
-	w_class = 4//bulky item
+	gas_transfer_coefficient = 0.01
+	flags = FPRINT | TABLEPASS | SUITSPACE
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
+	permeability_coefficient = 0.02
+	protective_temperature = 1000
+	heat_transfer_coefficient = 0.02
+	radiation_protection = 0.25
+	w_class = 4//bulky item
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
 
 /obj/item/clothing/suit/armor/centcomm
 	name = "Cent. Com. armor"
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 99b0fe4166..88b0f2eded 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 005eb33109..d8a20b2c47 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 459bd2265b..d00ef08250 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/maps/tgstation.2.0.7.dmm b/maps/tgstation.2.0.7.dmm
index daafc5e360..5c3dfb275a 100644
--- a/maps/tgstation.2.0.7.dmm
+++ b/maps/tgstation.2.0.7.dmm
@@ -2706,7 +2706,7 @@
 "bab" = (/obj/disposalpipe/sortjunction{dir = 1; icon_state = "pipe-j2s"; sortType = 21},/turf/simulated/wall,/area/maintenance/port)
 "bac" = (/obj/machinery/door/firedoor/border_only,/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/hallway/primary/central)
 "bad" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{icon_state = "bluecorner"},/area/hallway/primary/central)
-"bae" = (/obj/rack,/obj/item/clothing/mask/gas/emergency,/obj/item/weapon/tank/jetpack,/turf/simulated/floor,/area/crew_quarters/captain)
+"bae" = (/obj/rack,/obj/item/weapon/tank/jetpack,/obj/item/clothing/mask/gas,/obj/item/clothing/head/helmet/space/capspace,/turf/simulated/floor,/area/crew_quarters/captain)
 "baf" = (/obj/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/light_switch{pixel_y = -25},/turf/simulated/floor,/area/crew_quarters/captain)
 "bag" = (/obj/secure_closet/captains,/turf/simulated/floor,/area/crew_quarters/captain)
 "bah" = (/obj/table{icon_state = "tabledir"; dir = 4},/obj/machinery/light/lamp{pixel_x = 4; pixel_y = 1},/obj/machinery/light,/turf/simulated/floor,/area/crew_quarters/captain)