diff --git a/code/modules/clothing/spacesuits/captain.dm b/code/modules/clothing/spacesuits/captain.dm index 24d6985aa70..ee56bdec4d9 100644 --- a/code/modules/clothing/spacesuits/captain.dm +++ b/code/modules/clothing/spacesuits/captain.dm @@ -2,8 +2,8 @@ name = "captain's helmet" icon_state = "capspace" item_state = "capspacehelmet" - desc = "A special helmet for the most fashionable of military figureheads." - flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR + desc = "A special helmet designed for work in a hazardous, low-pressure environment." + flags = FPRINT | TABLEPASS | HEADSPACE | HEADCOVERSEYES | BLOCKHAIR see_face = 0.0 permeability_coefficient = 0.01 armor = list(melee = 65, bullet = 50, laser = 50,energy = 25, bomb = 50, bio = 100, rad = 50) @@ -11,7 +11,7 @@ /obj/item/clothing/suit/armor/captain name = "captain's armor" - desc = "A bulky, heavy-duty piece of exclusive NanoTrasen armor. YOU are in charge!" + desc = "A bulky, heavy-duty piece of exclusive NanoTrasen armor." icon_state = "caparmor" item_state = "capspacesuit" w_class = 4 @@ -19,7 +19,7 @@ permeability_coefficient = 0.02 heat_transfer_coefficient = 0.02 protective_temperature = 1000 - flags = FPRINT | TABLEPASS + flags = FPRINT | TABLEPASS | SUITSPACE body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs) slowdown = 1.5 diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index abb723d428d..197a9d2a2dd 100755 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -2816,7 +2816,7 @@ "bch" = (/obj/machinery/camera{c_tag = "Captain's Quarters"; dir = 4; network = "Command"},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) "bci" = (/obj/machinery/computer/card,/obj/item/weapon/card/id/captains_spare,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) "bcj" = (/obj/machinery/computer/communications,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) -"bck" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/stamp/captain,/obj/structure/table/woodentable,/obj/structure/disposalpipe/segment{dir = 1},/obj/item/weapon/paper{info = "Our scientists stole your suit and shoved it in their destructive analyzer. We replaced it with one that isn't space capable.

--Central Command"; name = "Important Memo"},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) +"bck" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/stamp/captain,/obj/structure/table/woodentable,/obj/structure/disposalpipe/segment{dir = 1},/obj/item/weapon/paper{info = "


Knowledge. Power. Safety.

NSS EXODUS



CENTRAL ADVISORY

Central Command certifies issued protective wear as space capable, but reiterates this capability is intended only for emergencies and urges extreme caution when such considerations must be made.

Thank you,
Central Command"; name = "Central Advisory"},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) "bcl" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) "bcm" = (/obj/structure/displaycase,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain) "bcn" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/bluegrid,/area/turret_protected/ai)