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 9abd81b787..8da50d488f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -35,6 +35,7 @@ new /obj/item/storage/lockbox/medal/engineering(src) new /obj/item/construction/rcd/loaded/upgraded(src) new /obj/item/clothing/suit/hooded/wintercoat/ce(src) + new /obj/item/clothing/head/beret/ce/white(src) /obj/structure/closet/secure_closet/engineering_electrical name = "electrical supplies locker" 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 9c4b58cd20..ead133e22b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -82,6 +82,7 @@ new /obj/item/storage/photo_album/CMO(src) new /obj/item/storage/lockbox/medal/medical(src) new /obj/item/clothing/suit/hooded/wintercoat/cmo(src) + new /obj/item/clothing/head/beret/cmo/blue(src) /obj/structure/closet/secure_closet/animal name = "animal control" 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 97c0c8f3e2..4e1ca9a77d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -31,3 +31,4 @@ new /obj/item/circuitboard/machine/techfab/department/science(src) new /obj/item/storage/photo_album/RD(src) new /obj/item/clothing/suit/hooded/wintercoat/rd(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 e87cb22f31..a50ee6988c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -34,6 +34,8 @@ new /obj/item/gun/energy/e_gun(src) new /obj/item/door_remote/captain(src) new /obj/item/storage/photo_album/Captain(src) + new /obj/item/clothing/head/caphat/beret/white(src) + /obj/structure/closet/secure_closet/hop name = "\proper head of personnel's locker" req_access = list(ACCESS_HOP) @@ -62,6 +64,8 @@ new /obj/item/circuitboard/machine/techfab/department/service(src) new /obj/item/storage/photo_album/HoP(src) new /obj/item/clothing/suit/hooded/wintercoat/hop(src) + new /obj/item/clothing/head/hopcap/beret/white(src) + /obj/structure/closet/secure_closet/hos name = "\proper head of security's locker" req_access = list(ACCESS_HOS) @@ -120,6 +124,7 @@ new /obj/item/clothing/gloves/krav_maga/sec(src) new /obj/item/door_remote/head_of_security(src) new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src) + new /obj/item/clothing/head/beret/sec/corporatewarden(src) /obj/structure/closet/secure_closet/security name = "security officer's locker" req_access = list(ACCESS_SECURITY) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 880303bb13..8ff6fe8bd1 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -51,6 +51,11 @@ dog_fashion = null +/obj/item/clothing/head/caphat/beret/white + name = "captain's white beret" + desc = "A white beret fit for a leader." + icon_state = "beret_captain_white" + //Head of Personnel /obj/item/clothing/head/hopcap name = "head of personnel's cap" @@ -67,6 +72,11 @@ dog_fashion = null +/obj/item/clothing/head/hopcap/beret/white + name = "head of personnel's white beret" + desc = "The symbol of true bureaucratic micromanagement, although in a fancy form." + icon_state = "beret_white_hop" + //Chaplain /obj/item/clothing/head/nun_hood name = "nun hood" @@ -119,6 +129,16 @@ desc = "A black beret, perfect for war veterans and dark, brooding, anti-hero mimes." icon_state = "beretblack" +/obj/item/clothing/head/beret/purple + name = "purple beret" + desc = "A purple beret." + icon_state = "beret_purple" + +/obj/item/clothing/head/beret/blue + name = "blue beret" + desc = "A blue beret" + icon_state = "beret_blue" + /obj/item/clothing/head/beret/highlander desc = "That was white fabric. Was." dog_fashion = null //THIS IS FOR SLAUGHTER, NOT PUPPIES @@ -146,6 +166,11 @@ desc = "A robust beret for the Head of Security, for looking stylish while not sacrificing protection." icon_state = "hosberetblack" +/obj/item/clothing/head/HoS/beret/officer + name = "head of security officer beret" + desc = "A robust beret for the Head of Security, for looking stylish while not sacrificing protection." + icon_state = "beret_centcom_officer" + /obj/item/clothing/head/HoS/beret/syndicate name = "syndicate beret" desc = "A black beret with thick armor padding inside. Stylish and robust." @@ -242,8 +267,11 @@ name = "warden's beret" desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class." icon_state = "wardenberet" - armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - strip_delay = 60 + +/obj/item/clothing/head/beret/sec/corporatewarden + name = "warden's corporate beret" + desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class." + icon_state = "beret_corporate_warden" /obj/item/clothing/head/beret/sec/navyofficer desc = "A special beret with the security insignia emblazoned on it. For officers with class." @@ -261,18 +289,71 @@ desc = "A fancy beret with a green cross, signifying your status in the station's medbay." icon_state = "cmoberet" +/obj/item/clothing/head/beret/cmo/blue + name = "chief medical officer's blue beret" + desc = "A fancy beret with a blue and white cross, try not to be chief malpractice officer in it." + icon_state = "beret_blue_cmo" + +//Medical +/obj/item/clothing/head/beret/med + name = "medical officer's beret" + desc = "A fancy beret with a blue cross, smells sterile" + icon_state = "beret_med" + +/obj/item/clothing/head/beret/chem + name = "chemist's beret" + desc = "A fancy beret with a orange beaker, you're not sure if you should smell it" + icon_state = "beret_chem" + +/obj/item/clothing/head/beret/viro + name = "virologist's beret" + desc = "A fancy beret with a green gross, hopefully it's virus free!" + icon_state = "beret_viro" + //Research Director /obj/item/clothing/head/beret/rd name = "research director's beret" desc = "A beret worn only by highly intelligent people." icon_state = "rdberet" + + +//Scientist +/obj/item/clothing/head/beret/sci + name = "scientist's beret" + desc = "A Scientist's beret, looks like it's covered in slime." + icon_state = "beret_sci" + +//Roboticist +/obj/item/clothing/head/beret/robo + name = "roboticist's beret" + desc = "A Roboticist's beret, almost more oil than hat." + icon_state = "beret_robot" + + //Chief Engineer /obj/item/clothing/head/beret/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 = "ceberet" +/obj/item/clothing/head/beret/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 = "beret_ce_white" + +//Atmos +/obj/item/clothing/head/beret/atmos + name = "atmospheric technician's beret" + desc = "An Atmospheric Technician's beret. Smells like plasma fire." + icon_state = "beret_atmos" + +//Engineer +/obj/item/clothing/head/beret/eng + name = "engineer's beret" + desc = "An Engineer's beret, try not to lose it to space wind." + icon_state = "beret_engineering" + //Quartermaster /obj/item/clothing/head/beret/qm name = "quartermaster's beret" diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index c66e350af6..0d1fe7f047 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -8,6 +8,10 @@ vend_reply = "Thank you for using the ClothesMate!" products = list(/obj/item/clothing/head/that = 4, /obj/item/clothing/head/fedora = 3, + /obj/item/clothing/head/beret = 3, + /obj/item/clothing/head/beret/black = 3, + /obj/item/clothing/head/beret/purple = 3, + /obj/item/clothing/head/beret/blue = 3, /obj/item/clothing/glasses/monocle = 3, /obj/item/clothing/suit/jacket = 4, /obj/item/clothing/suit/jacket/puffer/vest = 4, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index adaa56fc6d..dd0129346f 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -34,6 +34,7 @@ product_ads = "Make those blood stains look fashionable!!" vend_reply = "Thank you for using the MediDrobe!" products = list(/obj/item/clothing/accessory/pocketprotector = 3, + /obj/item/clothing/head/beret/med = 3, /obj/item/storage/backpack/duffelbag/med = 3, /obj/item/storage/backpack/medic = 3, /obj/item/storage/backpack/satchel/med = 3, @@ -63,6 +64,7 @@ product_ads = "Guaranteed to protect your feet from industrial accidents!;Afraid of radiation? Then wear yellow!" vend_reply = "Thank you for using the EngiDrobe!" products = list(/obj/item/clothing/accessory/pocketprotector = 5, + /obj/item/clothing/head/beret/eng = 3, /obj/item/storage/backpack/duffelbag/engineering = 3, /obj/item/storage/backpack/industrial = 3, /obj/item/storage/backpack/satchel/eng = 3, @@ -85,6 +87,7 @@ product_ads = "Get your inflammable clothing right here!!!" vend_reply = "Thank you for using the AtmosDrobe!" products = list(/obj/item/clothing/accessory/pocketprotector = 3, + /obj/item/clothing/head/beret/atmos = 3, /obj/item/storage/backpack/duffelbag/engineering = 3, /obj/item/storage/backpack/satchel/eng = 3, /obj/item/storage/backpack/industrial = 3, @@ -123,6 +126,7 @@ product_ads = "You turn me TRUE, use defines!;0110001101101100011011110111010001101000011001010111001101101000011001010111001001100101" vend_reply = "Thank you for using the RoboDrobe!" products = list(/obj/item/clothing/glasses/hud/diagnostic = 3, + /obj/item/clothing/head/beret/robo = 3, /obj/item/clothing/under/rank/roboticist = 3, /obj/item/clothing/under/rank/roboticist/skirt = 3, /obj/item/clothing/suit/hooded/wintercoat/robotics = 3, @@ -145,6 +149,7 @@ product_ads = "Longing for the smell of flesh plasma? Buy your science clothing now!;Made with 10% Auxetics, so you don't have to worry losing your arm!" vend_reply = "Thank you for using the SciDrobe!" products = list(/obj/item/clothing/accessory/pocketprotector = 5, + /obj/item/clothing/head/beret/sci = 3, /obj/item/storage/backpack/science = 3, /obj/item/storage/backpack/satchel/tox = 3, /obj/item/clothing/suit/hooded/wintercoat/science = 3, @@ -341,6 +346,7 @@ product_ads = "Our clothes are 0.5% more resistant to acid spills! Get yours now!" vend_reply = "Thank you for using the ChemDrobe!" products = list(/obj/item/clothing/under/rank/chemist = 3, + /obj/item/clothing/head/beret/chem = 3, /obj/item/clothing/under/rank/chemist/skirt = 3, /obj/item/clothing/suit/hooded/wintercoat/chemistry = 3, /obj/item/clothing/shoes/sneakers/white = 3, @@ -378,7 +384,8 @@ icon_state = "virodrobe" product_ads = " Viruses getting you down? Then upgrade to sterilized clothing today!" vend_reply = "Thank you for using the ViroDrobe" - products = list(/obj/item/clothing/under/rank/virologist = 3, + products = list(/obj/item/clothing/head/beret/viro = 3, + /obj/item/clothing/under/rank/virologist = 3, /obj/item/clothing/under/rank/virologist/skirt = 3, /obj/item/clothing/suit/hooded/wintercoat/viro = 3, /obj/item/clothing/shoes/sneakers/white = 3, diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index e9f32c428a..1ae6abed66 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 695e623c66..dbfa71226b 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ