diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 7113c1b45a..f67eda7dd9 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -68,7 +68,7 @@ new /obj/item/weapon/cartridge/janitor(src) new /obj/item/clothing/gloves/black(src) new /obj/item/clothing/head/soft/purple(src) - new /obj/item/clothing/head/beret/jan(src) + new /obj/item/clothing/head/beret/purple(src) new /obj/item/device/flashlight(src) new /obj/item/weapon/caution(src) new /obj/item/weapon/caution(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 61d20f9de5..061798be0b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -122,7 +122,7 @@ new /obj/item/weapon/gun/energy/gun(src) new /obj/item/clothing/accessory/holster/waist(src) new /obj/item/weapon/melee/telebaton(src) - new /obj/item/clothing/head/beret/sec/hos(src) + new /obj/item/clothing/head/beret/sec/corporate/hos(src) return @@ -159,7 +159,7 @@ new /obj/item/weapon/melee/baton/loaded(src) new /obj/item/weapon/gun/energy/gun(src) new /obj/item/weapon/storage/box/holobadge(src) - new /obj/item/clothing/head/beret/sec/warden(src) + new /obj/item/clothing/head/beret/sec/corporate/warden(src) return diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index d2d26ec0b5..a1910f1a2d 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -26,9 +26,9 @@ new /obj/item/clothing/head/beret/sec(src) new /obj/item/clothing/head/beret/sec(src) new /obj/item/clothing/head/beret/sec(src) - new /obj/item/clothing/head/beret/sec/alt(src) - new /obj/item/clothing/head/beret/sec/alt(src) - new /obj/item/clothing/head/beret/sec/alt(src) + new /obj/item/clothing/head/beret/sec/corporate/officer(src) + new /obj/item/clothing/head/beret/sec/corporate/officer(src) + new /obj/item/clothing/head/beret/sec/corporate/officer(src) return @@ -167,9 +167,9 @@ new /obj/item/clothing/head/hardhat/red(src) new /obj/item/clothing/head/hardhat/red(src) new /obj/item/clothing/head/hardhat/red(src) - new /obj/item/clothing/head/beret/eng(src) - new /obj/item/clothing/head/beret/eng(src) - new /obj/item/clothing/head/beret/eng(src) + new /obj/item/clothing/head/beret/engineering(src) + new /obj/item/clothing/head/beret/engineering(src) + new /obj/item/clothing/head/beret/engineering(src) return @@ -190,9 +190,9 @@ new /obj/item/clothing/head/hardhat(src) new /obj/item/clothing/head/hardhat(src) new /obj/item/clothing/head/hardhat(src) - new /obj/item/clothing/head/beret/eng(src) - new /obj/item/clothing/head/beret/eng(src) - new /obj/item/clothing/head/beret/eng(src) + new /obj/item/clothing/head/beret/engineering(src) + new /obj/item/clothing/head/beret/engineering(src) + new /obj/item/clothing/head/beret/engineering(src) return diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index a3d9d3078b..d55125ccef 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -64,22 +64,36 @@ var/global/list/gear_datums = list() slot = slot_head /datum/gear/bsec_beret - display_name = "beret, blue (security)" - path = /obj/item/clothing/head/beret/sec/alt + display_name = "beret, navy (officer)" + path = /obj/item/clothing/head/beret/sec/navy/officer cost = 1 slot = slot_head allowed_roles = list("Security Officer","Head of Security","Warden") +/datum/gear/bsec_beret_warden + display_name = "beret, navy (warden)" + path = /obj/item/clothing/head/beret/sec/navy/warden + cost = 1 + slot = slot_head + allowed_roles = list("Head of Security","Warden") + +/datum/gear/bsec_beret_hos + display_name = "beret, navy (hos)" + path = /obj/item/clothing/head/beret/sec/navy/hos + cost = 1 + slot = slot_head + allowed_roles = list("Head of Security") + /datum/gear/eng_beret display_name = "beret, engie-orange" - path = /obj/item/clothing/head/beret/eng + path = /obj/item/clothing/head/beret/engineering cost = 1 slot = slot_head // allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer") /datum/gear/purp_beret display_name = "beret, purple" - path = /obj/item/clothing/head/beret/jan + path = /obj/item/clothing/head/beret/purple cost = 1 slot = slot_head diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 7543df6bb1..9b6effab7a 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -60,35 +60,47 @@ /obj/item/clothing/head/beret/sec name = "security beret" desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety." - icon_state = "beret_badge" -/obj/item/clothing/head/beret/sec/alt + icon_state = "beret_officer" +/obj/item/clothing/head/beret/sec/navy/officer name = "officer beret" desc = "A navy blue beret with an officer's rank emblem. For officers that are more inclined towards style than safety." - icon_state = "officerberet" -/obj/item/clothing/head/beret/sec/hos + icon_state = "beret_navy_officer" +/obj/item/clothing/head/beret/sec/navy/hos name = "officer beret" desc = "A navy blue beret with a commander's rank emblem. For officers that are more inclined towards style than safety." - icon_state = "hosberet" -/obj/item/clothing/head/beret/sec/warden + icon_state = "beret_navy_hos" +/obj/item/clothing/head/beret/sec/navy/warden name = "warden beret" desc = "A navy blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety." - icon_state = "wardenberet" -/obj/item/clothing/head/beret/eng + icon_state = "beret_navy_warden" +/obj/item/clothing/head/beret/sec/corporate/officer + name = "officer beret" + desc = "A corporate black beret with an officer's rank emblem. For officers that are more inclined towards style than safety." + icon_state = "beret_corporate_officer" +/obj/item/clothing/head/beret/sec/corporate/hos + name = "officer beret" + desc = "A corporate black beret with a commander's rank emblem. For officers that are more inclined towards style than safety." + icon_state = "beret_corporate_hos" +/obj/item/clothing/head/beret/sec/corporate/warden + name = "warden beret" + desc = "A corporate black beret with a warden's rank emblem. For officers that are more inclined towards style than safety." + icon_state = "beret_corporate_warden" +/obj/item/clothing/head/beret/engineering name = "engineering beret" desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety." - icon_state = "e_beret_badge" -/obj/item/clothing/head/beret/jan + icon_state = "beret_engineering" +/obj/item/clothing/head/beret/purple name = "purple beret" desc = "A stylish, if purple, beret." - icon_state = "purpleberet" + icon_state = "beret_purple" /obj/item/clothing/head/beret/centcom/officer name = "officers beret" desc = "A black beret adorned with the shield—a silver kite shield with an engraved sword—of the NanoTrasen security forces." - icon_state = "centcomofficerberet" + icon_state = "beret_centcom_officer" /obj/item/clothing/head/beret/centcom/captain name = "captains beret" desc = "A white beret adorned with the shield—a silver kite shield with an engraved sword—of the NanoTrasen security forces." - icon_state = "centcomcaptain" + icon_state = "beret_centcom_captain" //Medical /obj/item/clothing/head/surgery diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index cf14b1f9c9..1ac40803aa 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index fff38f82d6..f6d5033710 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ