Added buttoning and unbuttoning for the labcoat, and the CMO's labcoat. Green labcoat from the theatre doesn't support this yet.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1715 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
Superxpdude@gmail.com
2011-06-23 20:04:09 +00:00
parent ec53fdddc9
commit 774a07bdb2
7 changed files with 40 additions and 8 deletions
+16 -4
View File
@@ -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"
+1 -1
View File
@@ -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)
+1 -1
View File
@@ -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 )
+20
View File
@@ -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"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 146 KiB

After

Width:  |  Height:  |  Size: 148 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

+2 -2
View File
@@ -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)