diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 5fbf2746555..adf37837074 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -56,6 +56,30 @@ return +/obj/structure/closet/wardrobe/detective + name = "detective wardrobe" + icon_state = "cabinet_closed" + icon_closed = "cabinet_closed" + icon_opened = "cabinet_open" + +/obj/structure/closet/wardrobe/detective/New() + ..() + new /obj/item/clothing/head/det(src) + new /obj/item/clothing/head/det(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/clothing/under/det(src) + new /obj/item/clothing/under/det(src) + new /obj/item/clothing/head/det/grey(src) + new /obj/item/clothing/head/det/grey(src) + new /obj/item/clothing/under/det/grey(src) + new /obj/item/clothing/under/det/grey(src) + new /obj/item/clothing/under/det/black(src) + new /obj/item/clothing/under/det/black(src) + new /obj/item/clothing/under/det/corporate(src) + new /obj/item/clothing/under/det/corporate(src) + return + /obj/structure/closet/wardrobe/pink name = "pink wardrobe" icon_state = "pink" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 004bcbb29b6..f489137f1f2 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -1,7 +1,7 @@ /obj/item/clothing/head/helmet name = "helmet" desc = "Standard Security gear. Protects the head from impacts. This one has a adjustable visor." - icon_state = "helmet_new" + icon_state = "helmet" item_state_slots = list( slot_l_hand_str = "helmet", slot_r_hand_str = "helmet", @@ -19,7 +19,7 @@ /obj/item/clothing/head/helmet/riot name = "riot helmet" desc = "It's a helmet specifically designed to protect against close range attacks." - icon_state = "riot_new" + icon_state = "riot" armor = list(melee = 82, bullet = 15, laser = 5,energy = 5, bomb = 5, bio = 2, rad = 0) flags_inv = HIDEEARS siemens_coefficient = 0.7 @@ -44,7 +44,7 @@ /obj/item/clothing/head/helmet/swat name = "\improper SWAT helmet" desc = "They're often used by highly trained SWAT Members." - icon_state = "swat_new" + icon_state = "swat" armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0) flags_inv = HIDEEARS|HIDEEYES cold_protection = HEAD diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index e4c94ec0bc2..ca0e832952d 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -103,6 +103,13 @@ item_state = "sl_suit" desc = "An immaculate white dress shirt, paired with a pair of dark grey dress pants, a red tie, and a charcoal vest." +/obj/item/clothing/under/det/corporate + name = "detective's jumpsuit" + icon_state = "det_corporate" + item_state = "bl_suit" + worn_state = "det_corporate" + desc = "A more modern uniform for corporate investigators." + /obj/item/clothing/head/det name = "fedora" desc = "A brown fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it." diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index ee235e6b7c2..40184e4c727 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index df7f7c2e57b..1a4a44c1796 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 72b2eeb696b..5c80c2ca868 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index a7c7e0ae3bf..1455f65a096 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 4709dfbcbd8..2aeaac05d49 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ