diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 3f9bda85378..2f6aaf5ce22 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -47,6 +47,7 @@ /obj/item/clothing/head/soft, /obj/item/clothing/suit/storage/hooded/wintercoat/cargo, /obj/item/clothing/suit/storage/hooded/wintercoat/cargo/qm, + /obj/item/clothing/head/beret/qm, /obj/item/clothing/shoes/boots/winter/supply) /obj/structure/closet/secure_closet/quartermaster/Initialize() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 4608595ff48..ffbbbac4ab3 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -28,6 +28,8 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/engineering, /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/ce, /obj/item/clothing/shoes/boots/winter/engineering, + /obj/item/clothing/head/beret/engineering/ce, + /obj/item/clothing/head/beret/engineering/ce/white, /obj/item/weapon/tank/emergency/oxygen/engi, /obj/item/weapon/reagent_containers/spray/windowsealant) //VOREStation Add diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index d8013054c8a..19fb96b2f5b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -142,6 +142,8 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/medical, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/cmo, /obj/item/clothing/shoes/boots/winter/medical, + /obj/item/clothing/head/beret/medical/cmo, + /obj/item/clothing/head/beret/medical/cmo/blue, /obj/item/weapon/storage/box/freezer, /obj/item/clothing/mask/gas, /obj/item/taperoll/medical, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index c9cea196b35..a23147b0c52 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -47,6 +47,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/science, /obj/item/clothing/suit/storage/hooded/wintercoat/science/rd, /obj/item/clothing/shoes/boots/winter/science, + /obj/item/clothing/head/beret/science/rd, /obj/item/weapon/bluespace_harpoon) //VOREStation Add /obj/structure/closet/secure_closet/xenoarchaeologist 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 2a210ecb95c..65ea14bb4da 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -61,7 +61,9 @@ /obj/item/clothing/under/suit_jacket/teal, /obj/item/clothing/under/suit_jacket/teal/skirt, /obj/item/clothing/glasses/sunglasses, - /obj/item/clothing/suit/storage/hooded/wintercoat/hop) + /obj/item/clothing/suit/storage/hooded/wintercoat/hop, + /obj/item/clothing/head/caphat/hop/beret/, + /obj/item/clothing/head/caphat/hop/beret/white) /obj/structure/closet/secure_closet/hos diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 5076e8b034d..f65bebc9a65 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -451,6 +451,7 @@ /obj/item/clothing/suit/captunic, /obj/item/clothing/suit/captunic/capjacket, /obj/item/clothing/head/caphat/cap, + /obj/item/clothing/head/caphat/beret, /obj/item/clothing/under/rank/captain, /obj/item/clothing/shoes/brown, /obj/item/clothing/gloves/captain, diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 2e492aca034..b98d08131da 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -22,12 +22,27 @@ desc = "No one in a commanding position should be without a perfect, white hat of ultimate authority." icon_state = "officercap" +/obj/item/clothing/head/caphat/beret + name = "captain's beret" + desc = "A beret fit for a leader." + icon_state = "beretcap" + //HOP /obj/item/clothing/head/caphat/hop name = "crew resource's hat" desc = "A stylish hat that both protects you from enraged former-crewmembers and gives you a false sense of authority." icon_state = "hopcap" +/obj/item/clothing/head/caphat/hop/beret + name = "head of personnel's beret" + desc = "The symbol of true bureaucratic micromanagement, although in a fancy form." + icon_state = "berethop" + +/obj/item/clothing/head/caphat/hop/beret/white + name = "head of personnel's white beret" + desc = "The symbol of true bureaucratic micromanagement, although in a fancy form." + icon_state = "berethopwhite" + //Chaplain /obj/item/clothing/head/chaplain_hood name = "chaplain's hood" @@ -207,3 +222,62 @@ desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is navy blue." icon_state = "surgcap_navyblue" item_state_slots = list(slot_r_hand_str = "beret_navy", slot_l_hand_str = "beret_navy") + +/obj/item/clothing/head/beret/medical + name = "medical officer's beret" + desc = "A fancy beret with a blue cross, smells sterile." + icon_state = "beretmed" + +/obj/item/clothing/head/beret/medical/chem + name = "chemist's beret" + desc = "A fancy beret with an orange beaker. You're not sure if you should smell it." + icon_state = "beretchem" + +/obj/item/clothing/head/beret/medical/viro + name = "virologist's beret" + desc = "A fancy beret with a green cross. Hopefully it's virus free!" + icon_state = "beretviro" + +/obj/item/clothing/head/beret/medical/cmo + name = "chief medical officer's beret" + desc = "A fancy beret with a green cross, signifying your status in the station's medbay." + icon_state = "beretcmo" + +/obj/item/clothing/head/beret/medical/cmo/blue + name = "chief medical officer's beret" + desc = "A fancy beret with a blue and white cross. Try not to be the chief malpractice officer in it!" + icon_state = "beretcmoblue" + +//Science + +/obj/item/clothing/head/beret/science + name = "scientist's beret" + desc = "A scientist's beret. Looks like it's covered in slime." + icon_state = "beretsci" + +/obj/item/clothing/head/beret/science/robotics + name = "roboticist's beret" + desc = "A roboticist's beret. It strongly smells of oil." + icon_state = "beretrobo" + +/obj/item/clothing/head/beret/science/rd + name = "research director's beret" + desc = "A beret worn only by highly intelligent people. Or so its wearers say." + icon_state = "beretrd" + +//Chief Engineer +/obj/item/clothing/head/beret/engineering/ce + name = "chief engineer's beret" + desc = "A beret that will surely make you look way cooler than a hard hat, although lack of protection is the price." + icon_state = "beretce" + +/obj/item/clothing/head/beret/engineering/ce/white + name = "chief engineer's white beret" + desc = "A beret that will surely make you look way cooler than a hard hat, although lack of protection is the price." + icon_state = "beretcewhite" + +//Quartermaster +/obj/item/clothing/head/beret/qm + name = "quartermaster's white beret" + desc = "This headwear shows off your Cargonian leadership." + icon_state = "beretqm" \ No newline at end of file diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index 56ccb9da6d6..817f9398ba2 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -1227,7 +1227,8 @@ /obj/item/clothing/mask/surgical = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/medical = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt = 5, - /obj/item/clothing/shoes/boots/winter/medical = 5 + /obj/item/clothing/shoes/boots/winter/medical = 5, + /obj/item/clothing/head/beret/medical = 5 ) req_log_access = access_hop has_logs = 1 @@ -1244,6 +1245,7 @@ /obj/item/clothing/shoes/white = 5, /obj/item/clothing/suit/storage/toggle/labcoat/chemist = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/chemist = 5, + /obj/item/clothing/head/beret/medical/chem = 5, /obj/item/weapon/storage/backpack/chemistry = 5, /obj/item/weapon/storage/backpack/satchel/chem = 5, /obj/item/weapon/storage/bag/chemistry = 5 @@ -1280,6 +1282,7 @@ /obj/item/clothing/shoes/white = 5, /obj/item/clothing/suit/storage/toggle/labcoat/virologist = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro = 5, + /obj/item/clothing/head/beret/medical/viro = 5, /obj/item/clothing/mask/surgical = 5, /obj/item/weapon/storage/backpack/virology = 5, /obj/item/weapon/storage/backpack/satchel/vir = 5 @@ -1303,6 +1306,7 @@ /obj/item/clothing/shoes/slippers = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/science = 5, /obj/item/clothing/shoes/boots/winter/science = 5, + /obj/item/clothing/head/beret/science = 5, /obj/item/weapon/storage/backpack/toxins = 5, /obj/item/weapon/storage/backpack/satchel/tox = 5 ) @@ -1319,6 +1323,7 @@ /obj/item/clothing/under/rank/roboticist = 5, /obj/item/clothing/suit/storage/toggle/labcoat/roboticist = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/science/robotics = 5, + /obj/item/clothing/head/beret/science/robotics = 5, /obj/item/clothing/shoes/black = 5, /obj/item/clothing/gloves/black = 5, /obj/item/weapon/storage/backpack/toxins = 5, diff --git a/icons/inventory/head/item.dmi b/icons/inventory/head/item.dmi index d91aa7369f8..ad89caf2c0d 100644 Binary files a/icons/inventory/head/item.dmi and b/icons/inventory/head/item.dmi differ diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi index 01b97296d59..356aab58f57 100644 Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ