diff --git a/code/defines/obj/closet.dm b/code/defines/obj/closet.dm index da7e7cfa7f7..0e5df00cd0f 100644 --- a/code/defines/obj/closet.dm +++ b/code/defines/obj/closet.dm @@ -71,6 +71,8 @@ /obj/structure/closet/gmcloset name = "formal closet" desc = "It's a storage unit for formal clothing." + icon_state = "black" + icon_closed = "black" /obj/structure/closet/emcloset name = "emergency closet" @@ -125,14 +127,20 @@ /obj/structure/closet/jcloset name = "custodial closet" desc = "It's a storage unit for janitorial clothes and gear." + icon_state = "mixed" + icon_closed = "mixed" /obj/structure/closet/jcloset2 name = "cleaner's closet" desc = "It's a storage unit for various cleaning items." + icon_state = "mixed" + icon_closed = "mixed" /obj/structure/closet/lawcloset name = "legal closet" desc = "It's a storage unit for courtroom apparel and items." + icon_state = "blue" + icon_closed = "blue" /obj/structure/closet/coffin name = "coffin" @@ -317,10 +325,10 @@ icon_state = "white" icon_closed = "white" -/obj/structure/closet/wardrobe/genetics_white - name = "genetics wardrobe" - icon_state = "white" - icon_closed = "white" +/obj/structure/closet/wardrobe/robotics_black + name = "robotics wardrobe" + icon_state = "black" + icon_closed = "black" /obj/structure/closet/wardrobe/medic_white name = "doctor's wardrobe" @@ -332,6 +340,11 @@ icon_state = "white" icon_closed = "white" +/obj/structure/closet/wardrobe/genetics_white + name = "genetics wardrobe" + icon_state = "white" + icon_closed = "white" + /obj/structure/closet/wardrobe/nurse name = "nurse's wardrobe" icon_state = "white" diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 1436addff08..f9b57d15b4c 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -100,7 +100,7 @@ if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/heads/qm(H), H.slot_ears) H.equip_if_possible(new /obj/item/clothing/under/rank/cargo(H), H.slot_w_uniform) - H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes) + H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/quartermaster(H), H.slot_belt) H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(H), H.slot_glasses) H.equip_if_possible(new /obj/item/weapon/clipboard(H), H.slot_r_store) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 9e2704062b7..61879b81bcf 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -80,7 +80,7 @@ H.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci(H), H.slot_ears) H.equip_if_possible(new /obj/item/clothing/under/rank/chemist(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes) - H.equip_if_possible(new /obj/item/device/pda/toxins(H), H.slot_belt) + H.equip_if_possible(new /obj/item/device/pda/medical(H), H.slot_belt) H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat/chemist(H), H.slot_wear_suit) return 1 diff --git a/code/game/objects/closets/secure/cargo.dm b/code/game/objects/closets/secure/cargo.dm index 97b77c918ef..a366ebf9ee2 100644 --- a/code/game/objects/closets/secure/cargo.dm +++ b/code/game/objects/closets/secure/cargo.dm @@ -12,7 +12,7 @@ ..() sleep(2) new /obj/item/clothing/under/rank/cargotech(src) - new /obj/item/clothing/shoes/brown(src) + new /obj/item/clothing/shoes/black(src) new /obj/item/device/radio/headset/headset_cargo(src) new /obj/item/clothing/gloves/black(src) new /obj/item/weapon/cartridge/quartermaster(src) @@ -21,6 +21,12 @@ /obj/structure/closet/secure_closet/qm_personal name = "Quartermaster's Locker" req_access = list(access_qm) + icon_state = "secureqm1" + icon_closed = "secureqm" + icon_locked = "secureqm1" + icon_opened = "secureqmopen" + icon_broken = "secureqmbroken" + icon_off = "secureqmoff" New() ..() diff --git a/code/game/objects/closets/secure/engineering.dm b/code/game/objects/closets/secure/engineering.dm index 9c9700b4b0a..aed317be772 100644 --- a/code/game/objects/closets/secure/engineering.dm +++ b/code/game/objects/closets/secure/engineering.dm @@ -1,12 +1,12 @@ /obj/structure/closet/secure_closet/engineering_chief name = "Chief Engineer's Locker" req_access = list(access_ce) - icon_state = "secureeng1" - icon_closed = "secureeng" - icon_locked = "secureeng1" - icon_opened = "toolclosetopen" - icon_broken = "secureengbroken" - icon_off = "secureengoff" + icon_state = "securece1" + icon_closed = "securece" + icon_locked = "securece1" + icon_opened = "secureceopen" + icon_broken = "securecebroken" + icon_off = "secureceoff" New() @@ -99,7 +99,7 @@ icon_state = "secureeng1" icon_closed = "secureeng" icon_locked = "secureeng1" - icon_opened = "toolclosetopen" + icon_opened = "secureengopen" icon_broken = "secureengbroken" icon_off = "secureengoff" diff --git a/code/game/objects/closets/secure/medical.dm b/code/game/objects/closets/secure/medical.dm index 1a5d526d5c3..49cb6f466e5 100644 --- a/code/game/objects/closets/secure/medical.dm +++ b/code/game/objects/closets/secure/medical.dm @@ -185,12 +185,12 @@ /obj/structure/closet/secure_closet/chemical name = "Chemical Closet" desc = "Store dangerous chemicals in here." - icon_state = "securemed1" - icon_closed = "securemed" - icon_locked = "securemed1" - icon_opened = "securemedopen" - icon_broken = "securemedbroken" - icon_off = "securemedoff" + icon_state = "medical1" + icon_closed = "medical" + icon_locked = "medical1" + icon_opened = "medicalopen" + icon_broken = "medicalbroken" + icon_off = "medicaloff" req_access = list(access_medical) diff --git a/code/game/objects/closets/wardrobe.dm b/code/game/objects/closets/wardrobe.dm index 6a95bb88293..ddc6ef664bd 100644 --- a/code/game/objects/closets/wardrobe.dm +++ b/code/game/objects/closets/wardrobe.dm @@ -146,6 +146,27 @@ obj/structure/closet/wardrobe/hop/New() new /obj/item/clothing/shoes/white(src) new /obj/item/clothing/shoes/white(src) new /obj/item/clothing/shoes/white(src) + return + +/obj/structure/closet/wardrobe/robotics_black/New() + new /obj/item/clothing/under/rank/roboticist(src) + new /obj/item/clothing/under/rank/roboticist(src) + new /obj/item/clothing/suit/labcoat(src) + new /obj/item/clothing/suit/labcoat(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/shoes/black(src) + return + +/obj/structure/closet/wardrobe/chemistry_white/New() + new /obj/item/clothing/under/rank/chemist(src) + new /obj/item/clothing/under/rank/chemist(src) + new /obj/item/clothing/under/rank/chemist(src) + new /obj/item/clothing/suit/storage/labcoat/chemist(src) + new /obj/item/clothing/suit/storage/labcoat/chemist(src) + new /obj/item/clothing/suit/storage/labcoat/chemist(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/shoes/white(src) /obj/structure/closet/wardrobe/genetics_white/New() new /obj/item/clothing/under/rank/geneticist(src) @@ -158,6 +179,20 @@ obj/structure/closet/wardrobe/hop/New() new /obj/item/clothing/shoes/white(src) new /obj/item/clothing/shoes/white(src) + + + +/obj/structure/closet/wardrobe/virology_white/New() + new /obj/item/clothing/suit/storage/labcoat/virologist(src) + new /obj/item/clothing/suit/storage/labcoat/virologist(src) + new /obj/item/clothing/suit/storage/labcoat/virologist(src) + new /obj/item/clothing/under/rank/virologist(src) + new /obj/item/clothing/under/rank/virologist(src) + new /obj/item/clothing/under/rank/virologist(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/shoes/white(src) + /obj/structure/closet/wardrobe/grey/New() new /obj/item/clothing/under/color/grey(src) new /obj/item/clothing/under/color/grey(src) @@ -194,16 +229,6 @@ obj/structure/closet/wardrobe/hop/New() new /obj/item/clothing/shoes/brown(src) new /obj/item/clothing/shoes/brown(src) -/obj/structure/closet/wardrobe/chemistry_white/New() - new /obj/item/clothing/under/rank/chemist(src) - new /obj/item/clothing/under/rank/chemist(src) - new /obj/item/clothing/under/rank/chemist(src) - new /obj/item/clothing/suit/storage/labcoat/chemist(src) - new /obj/item/clothing/suit/storage/labcoat/chemist(src) - new /obj/item/clothing/suit/storage/labcoat/chemist(src) - new /obj/item/clothing/shoes/white(src) - new /obj/item/clothing/shoes/white(src) - new /obj/item/clothing/shoes/white(src) /obj/structure/closet/wardrobe/medic_white/New() new /obj/item/clothing/under/rank/medical(src) @@ -331,15 +356,3 @@ obj/structure/closet/wardrobe/hop/New() new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/shoes/black(src) - - -/obj/structure/closet/wardrobe/virology_white/New() - new /obj/item/clothing/suit/storage/labcoat/virologist(src) - new /obj/item/clothing/suit/storage/labcoat/virologist(src) - new /obj/item/clothing/suit/storage/labcoat/virologist(src) - new /obj/item/clothing/under/rank/virologist(src) - new /obj/item/clothing/under/rank/virologist(src) - new /obj/item/clothing/under/rank/virologist(src) - new /obj/item/clothing/shoes/white(src) - new /obj/item/clothing/shoes/white(src) - new /obj/item/clothing/shoes/white(src) \ No newline at end of file diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 600a3831650..9b4425c396a 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -14,6 +14,7 @@ icon_state = "miningsec1" icon_closed = "miningsec" icon_locked = "miningsec1" + icon_opened = "miningsecopen" icon_broken = "miningsecbroken" icon_off = "miningsecoff" req_access = list(access_mining) diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi index 64b1c35e22d..eb857dd67ee 100644 Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ