diff --git a/code/defines/obj/clothing/suit.dm b/code/defines/obj/clothing/suit.dm index a78151a1954..e61455b506a 100644 --- a/code/defines/obj/clothing/suit.dm +++ b/code/defines/obj/clothing/suit.dm @@ -95,7 +95,7 @@ /obj/item/clothing/suit/labcoat name = "labcoat" desc = "A suit that protects against minor chemical spills." - icon_state = "labcoat" + icon_state = "labcoat_open" item_state = "labcoat" permeability_coefficient = 0.25 heat_transfer_coefficient = 0.75 @@ -104,17 +104,29 @@ allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen) armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 50, rad = 5) -/obj/item/clothing/suit/labcoat/cmo +/obj/item/clothing/suit/labcoat_cmo name = "chief medical officer's labcoat" desc = "Bluer than the standard model." - icon_state = "labcoat_cmo" + icon_state = "labcoat_cmo_open" item_state = "labcoat_cmo" + permeability_coefficient = 0.25 + heat_transfer_coefficient = 0.75 + flags = FPRINT | TABLEPASS | ONESIZEFITSALL + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen) + armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 55, rad = 5) -/obj/item/clothing/suit/labcoat/mad +/obj/item/clothing/suit/labcoat_mad name = "The Mad's labcoat" desc = "It makes you look capable of konking someone on the noggin and shooting them into space." icon_state = "labgreen" item_state = "labgreen" + permeability_coefficient = 0.25 + heat_transfer_coefficient = 0.75 + flags = FPRINT | TABLEPASS | ONESIZEFITSALL + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen) + armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 50, rad = 5) /obj/item/clothing/suit/straight_jacket name = "straight jacket" diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index 1d05ec1208b..0be1763a9f9 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -567,7 +567,7 @@ src.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (src), slot_back) src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes) src.equip_if_possible(new /obj/item/clothing/under/rank/chief_medical_officer(src), slot_w_uniform) - src.equip_if_possible(new /obj/item/clothing/suit/labcoat/cmo(src), slot_wear_suit) + src.equip_if_possible(new /obj/item/clothing/suit/labcoat_cmo(src), slot_wear_suit) src.equip_if_possible(new /obj/item/weapon/storage/firstaid/regular(src), slot_l_hand) src.equip_if_possible(new /obj/item/device/flashlight/pen(src), slot_s_store) diff --git a/code/game/objects/closets/secure/medical.dm b/code/game/objects/closets/secure/medical.dm index 4170a2f3a6f..9b7ce09377a 100644 --- a/code/game/objects/closets/secure/medical.dm +++ b/code/game/objects/closets/secure/medical.dm @@ -45,7 +45,7 @@ /obj/secure_closet/CMO/New() ..() sleep(2) - new /obj/item/clothing/suit/labcoat/cmo( src ) + new /obj/item/clothing/suit/labcoat_cmo( src ) new /obj/item/clothing/under/rank/chief_medical_officer( src ) new /obj/item/clothing/suit/bio_suit/general( src ) new /obj/item/clothing/shoes/brown ( src ) diff --git a/code/game/objects/items/clothing.dm b/code/game/objects/items/clothing.dm index 6ef7b6a429b..2452c6c3b28 100644 --- a/code/game/objects/items/clothing.dm +++ b/code/game/objects/items/clothing.dm @@ -296,6 +296,26 @@ THERMAL GLASSES src.item_state = "suitjacket_blue_open" usr << "You unbutton the suit jacket." +/obj/item/clothing/suit/labcoat/verb/toggle() + set name = "Toggle Labcoat Buttons" + set category = "Object" + if(src.icon_state == "labcoat_open") + src.icon_state = "labcoat" + usr << "You button up the labcoat." + else + src.icon_state = "labcoat_open" + usr << "You unbutton the labcoat." + +/obj/item/clothing/suit/labcoat_cmo/verb/toggle() + set name = "Toggle Labcoat Buttons" + set category = "Object" + if(src.icon_state == "labcoat_cmo_open") + src.icon_state = "labcoat_cmo" + usr << "You button up the labcoat." + else + src.icon_state = "labcoat_cmo_open" + usr << "You unbutton the labcoat." + /obj/item/clothing/head/ushanka/attack_self(mob/user as mob) if(src.icon_state == "ushankadown") src.icon_state = "ushankaup" diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 94f421be432..aaf654c9314 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 4d172f17ba7..e5dc4ae2759 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/maps/tgstation.2.0.7.dmm b/maps/tgstation.2.0.7.dmm index 723fb8aac60..f630991ac9c 100644 --- a/maps/tgstation.2.0.7.dmm +++ b/maps/tgstation.2.0.7.dmm @@ -1890,7 +1890,7 @@ "aKr" = (/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/theatre) "aKs" = (/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/theatre) "aKt" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/floor,/area/crew_quarters/theatre) -"aKu" = (/obj/rack,/obj/item/clothing/head/flatcap,/obj/item/clothing/under/gimmick/rank/captain/suit,/obj/item/clothing/suit/labcoat/mad,/obj/item/clothing/glasses/gglasses,/turf/simulated/floor,/area/crew_quarters/theatre) +"aKu" = (/obj/rack,/obj/item/clothing/head/flatcap,/obj/item/clothing/under/gimmick/rank/captain/suit,/obj/item/clothing/suit/labcoat_mad,/obj/item/clothing/glasses/gglasses,/turf/simulated/floor,/area/crew_quarters/theatre) "aKv" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 8; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/crew_quarters/theatre) "aKw" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main) "aKx" = (/obj/machinery/door{icon = 'icons/obj/doors/doormorgue.dmi'; name = "Confession Booth (Chaplain)"; req_access_txt = "22"},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main) @@ -6277,7 +6277,7 @@ "cqK" = (/obj/table/reinforced{dir = 8; icon_state = "reinf_tabledir"},/turf/unsimulated/floor{icon_state = "floor"},/area/tdome) "cqL" = (/obj/stool/chair{dir = 8},/turf/unsimulated/floor{icon_state = "floor"},/area/tdome) "cqM" = (/obj/item/weapon/storage/firstaid/regular{pixel_x = 6; pixel_y = -5},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) -"cqN" = (/obj/rack,/obj/item/clothing/head/flatcap,/obj/item/clothing/under/gimmick/rank/captain/suit,/obj/item/clothing/suit/labcoat/mad,/obj/item/clothing/glasses/gglasses,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding) +"cqN" = (/obj/rack,/obj/item/clothing/head/flatcap,/obj/item/clothing/under/gimmick/rank/captain/suit,/obj/item/clothing/suit/labcoat_mad,/obj/item/clothing/glasses/gglasses,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding) "cqO" = (/obj/stool{pixel_y = 8},/obj/machinery/computer/security/telescreen{name = "Entertainment monitor"; desc = "Damn, they better have /tg/thechannel on these things."; icon = 'status_display.dmi'; icon_state = "entertainment"; pixel_y = -30},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding) "cqP" = (/obj/machinery/vending/snack,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding) "cqQ" = (/obj/window/reinforced{dir = 8},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "water"; name = "water"},/area/centcom/holding)