Departmental Berets (#10391)

aurorastation.dme

@@ -1382,6 +1382,7 @@
 #include "code\modules\clothing\gloves\stungloves.dm"
 #include "code\modules\clothing\gloves\xeno\tajara.dm"
 #include "code\modules\clothing\head\bandanas.dm"
+#include "code\modules\clothing\head\berets.dm"
 #include "code\modules\clothing\head\collectable.dm"
 #include "code\modules\clothing\head\hardhat.dm"
 #include "code\modules\clothing\head\helmet.dm"

code/controllers/subsystems/traumas.dm

@@ -51,7 +51,7 @@ var/datum/controller/subsystem/traumas/SStraumas
 
 	phobia_objs = list("spiders"   = typecacheof(list(/obj/effect/spider,/obj/item/toy/plushie/spider, /obj/effect/decal/cleanable/spiderling_remains)),
 
-					   "security"  = typecacheof(list(/obj/item/clothing/under/rank/security, /obj/item/clothing/under/rank/warden, /obj/item/clothing/head/beret/sec,
+					   "security"  = typecacheof(list(/obj/item/clothing/under/rank/security, /obj/item/clothing/under/rank/warden, /obj/item/clothing/head/beret/security,
 											 	 /obj/item/clothing/under/rank/head_of_security, /obj/item/clothing/under/det, /obj/item/clothing/glasses/hud/security,
 												 /obj/item/melee/baton, /obj/item/gun/energy/taser, /obj/item/handcuffs, /obj/item/clothing/glasses/sunglasses/sechud,
 												 /obj/machinery/door/airlock/security, /obj/item/clothing/under/rank/cadet, /obj/structure/sign/directions/security,

code/datums/outfits/ert/iac.dm

@@ -3,7 +3,7 @@
 
 	uniform = /obj/item/clothing/under/rank/iacjumpsuit
 	suit = /obj/item/clothing/suit/storage/iacvest
-	head = /obj/item/clothing/head/softcap/iacberet
+	head = /obj/item/clothing/head/softcap/iac
 	mask = /obj/item/clothing/mask/surgical
 	glasses = /obj/item/clothing/glasses/hud/health/aviator
 	shoes = /obj/item/clothing/shoes/iac

code/datums/outfits/ert/med_eridani.dm

@@ -3,7 +3,7 @@
 
 	uniform = /obj/item/clothing/under/rank/eridani_medic
 	suit = /obj/item/clothing/suit/storage/medical_chest_rig
-	head = /obj/item/clothing/head/beret/sec/eri
+	head = /obj/item/clothing/head/beret/security/eri
 	mask = /obj/item/clothing/mask/surgical
 	glasses = /obj/item/clothing/glasses/hud/health/aviator
 	shoes = /obj/item/clothing/shoes/jackboots

code/datums/outfits/ert/tcfl.dm

@@ -1,7 +1,7 @@
 /datum/outfit/admin/ert/legion
 	name = "TCFL Volunteer"
 
-	head = /obj/item/clothing/head/legion
+	head = /obj/item/clothing/head/beret/legion/field
 	uniform = /obj/item/clothing/under/legion
 	l_ear = /obj/item/device/radio/headset/legion
 	shoes = /obj/item/clothing/shoes/swat/ert
@@ -49,7 +49,7 @@
 
 /datum/outfit/admin/ert/legion/sentinel
 	name = "TCFL Sentinel"
-	head = /obj/item/clothing/head/legion/sentinel
+	head = /obj/item/clothing/head/beret/legion/sentinel
 	uniform = /obj/item/clothing/under/legion/sentinel
 	suit = /obj/item/clothing/suit/storage/vest/legion
 	gloves = null

code/datums/outfits/event/outfit_nanotrasen.dm

@@ -44,7 +44,7 @@
 	gloves = /obj/item/clothing/gloves/swat/tactical
 	l_ear = /obj/item/device/radio/headset/ert
 	glasses = /obj/item/clothing/glasses/sunglasses/sechud
-	head = /obj/item/clothing/head/beret/centcom/officer/civilprotection
+	head = /obj/item/clothing/head/beret/centcom/civilprotection
 	suit_store = /obj/item/gun/energy/gun
 	belt = /obj/item/storage/belt/security
 

code/datums/outfits/outfit_antag.dm

@@ -71,7 +71,7 @@
 /datum/outfit/admin/syndicate/officer
 	name = "Syndicate Officer"
 
-	head = /obj/item/clothing/head/beret
+	head = /obj/item/clothing/head/beret/red
 	mask = /obj/item/clothing/mask/smokable/cigarette/cigar/havana
 	belt = /obj/item/gun/projectile/deagle
 	l_ear = /obj/item/device/radio/headset/syndicate
@@ -289,6 +289,7 @@
 		/obj/item/clothing/head/softcap,
 		/obj/item/clothing/head/softcap/himeo,
 		/obj/item/clothing/head/softcap/red,
+		/obj/item/clothing/head/beret/red,
 		/obj/item/clothing/head/that,
 		/obj/item/clothing/head/turban,
 		/obj/item/clothing/head/turban/grey,
@@ -465,7 +466,7 @@
 	name = "Highlander"
 
 	uniform = /obj/item/clothing/under/kilt
-	head = /obj/item/clothing/head/beret
+	head = /obj/item/clothing/head/beret/red
 	shoes = /obj/item/clothing/shoes/combat
 	l_ear = /obj/item/device/radio/headset/heads/captain
 	l_hand = /obj/item/material/sword

code/game/jobs/job/outsider/representative.dm

@@ -22,7 +22,7 @@
 	var/fax_department = "Representative's Office"
 	jobtype = /datum/job/representative
 
-	head = /obj/item/clothing/head/beret/liaison
+	head = /obj/item/clothing/head/beret/centcom/liaison
 	uniform = /obj/item/clothing/under/rank/liaison
 	suit = /obj/item/clothing/suit/storage/toggle/liaison
 	tab_pda = /obj/item/modular_computer/handheld/pda/civilian/lawyer

code/game/jobs/job/security.dm

@@ -280,7 +280,7 @@
 
 	uniform = /obj/item/clothing/under/rank/cadet
 	suit = /obj/item/clothing/suit/storage/hazardvest/cadet
-	head = /obj/item/clothing/head/beret/sec/cadet
+	head = /obj/item/clothing/head/beret/security
 	shoes = /obj/item/clothing/shoes/jackboots
 	l_ear = /obj/item/device/radio/headset/headset_sec
 

code/game/objects/effects/landmarks.dm

@@ -169,7 +169,7 @@
 
 /obj/effect/landmark/costume/highlander/New()
 	new /obj/item/clothing/under/kilt(src.loc)
-	new /obj/item/clothing/head/beret(src.loc)
+	new /obj/item/clothing/head/beret/red(src.loc)
 	delete_me = 1
 
 /obj/effect/landmark/costume/prig/New()

code/game/objects/random/random.dm

@@ -884,6 +884,7 @@
 		/obj/random/hoodie = 0.5,
 		/obj/random/bandana = 0.5,
 		/obj/random/softcap = 0.5,
+		/obj/random/beret = 0.5,
 		/obj/random/junk = 0.4,
 		/obj/random/medical = 0.4,
 		/obj/random/powercell = 0.8,
@@ -1019,6 +1020,24 @@
 		/obj/item/clothing/head/softcap/captain = 1
 	)
 
+/obj/random/beret
+	name = "random beret"
+	desc = "This is a random beret."
+	icon = 'icons/obj/clothing/hats/berets.dmi'
+	icon_state = "beret"
+	problist = list(
+		/obj/item/clothing/head/beret/colorable/random = 5,
+		/obj/item/clothing/head/beret/engineering = 3,
+		/obj/item/clothing/head/beret/atmos = 3,
+		/obj/item/clothing/head/beret/medical = 3,
+		/obj/item/clothing/head/beret/science = 3,
+		/obj/item/clothing/head/beret/hydro = 3,
+		/obj/item/clothing/head/beret/cargo = 3,
+		/obj/item/clothing/head/beret/miner = 3,
+		/obj/item/clothing/head/beret/security = 2,
+		/obj/item/clothing/head/beret/captain = 1
+	)
+
 /obj/random/highvalue
 	name = "random high valuable item"
 	desc = "This is a random high valuable item."

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -71,6 +71,7 @@
 	new /obj/item/clothing/gloves/black(src)
 	new /obj/item/clothing/head/softcap/janitor(src)
 	new /obj/item/clothing/head/bandana/janitor(src)
+	new /obj/item/clothing/head/beret/janitor(src)
 	new /obj/item/gun/energy/mousegun(src)
 	new /obj/item/device/flashlight(src)
 	new /obj/item/clothing/suit/caution(src)

code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

@@ -18,6 +18,7 @@
 	new /obj/item/clothing/gloves/black(src)
 	new /obj/item/clothing/head/softcap/cargo(src)
 	new /obj/item/clothing/head/bandana/cargo(src)
+	new /obj/item/clothing/head/beret/cargo(src)
 	new /obj/item/modular_computer/handheld/custom_loadout/advanced/cargo_delivery(src)
 	new /obj/item/export_scanner(src)
 
@@ -42,6 +43,7 @@
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/clothing/head/softcap/cargo(src)
 	new /obj/item/clothing/head/bandana/cargo(src)
+	new /obj/item/clothing/head/beret/cargo(src)
 	new /obj/item/modular_computer/handheld/custom_loadout/advanced/cargo_delivery(src)
 	new /obj/item/export_scanner(src)
 	new /obj/item/device/orbital_dropper/drill(src)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -134,8 +134,8 @@
 	new /obj/item/clothing/head/hos/cap(src)
 	new /obj/item/clothing/head/hos/cap/alt(src)
 	new /obj/item/clothing/head/helmet/hos(src)
-	new /obj/item/clothing/head/beret/sec/hos(src)
+	new /obj/item/clothing/head/beret/security/hos(src)
-	new /obj/item/clothing/head/beret/sec/hos/alt(src)
+	new /obj/item/clothing/head/beret/security/hos/alt(src)
 	new /obj/item/clothing/accessory/badge/hos(src)
 	new /obj/item/clothing/gloves/black_leather(src)
 	//Tools
@@ -176,8 +176,8 @@
 	new /obj/item/clothing/under/rank/head_of_security(src)
 	new /obj/item/clothing/under/rank/head_of_security/corp(src)
 	new /obj/item/clothing/suit/storage/vest/hos(src)
-	new /obj/item/clothing/head/beret/sec/hos(src)
+	new /obj/item/clothing/head/beret/security/hos(src)
-	new /obj/item/clothing/head/beret/sec/hos/alt(src)
+	new /obj/item/clothing/head/beret/security/hos/alt(src)
 	new /obj/item/clothing/head/hos/cap(src)
 	new /obj/item/clothing/head/hos/cap/alt(src)
 	new /obj/item/clothing/head/helmet/hos(src)
@@ -216,7 +216,7 @@
 	new /obj/item/clothing/under/rank/warden/corp(src)
 	new /obj/item/clothing/suit/armor/vest/warden(src)
 	new /obj/item/clothing/suit/armor/vest/warden/commissar(src)
-	new /obj/item/clothing/head/beret/sec/warden(src)
+	new /obj/item/clothing/head/beret/security/warden(src)
 	new /obj/item/clothing/head/warden/commissar(src)
 	new /obj/item/clothing/head/warden(src)
 	new /obj/item/clothing/head/warden/alt(src)
@@ -256,7 +256,7 @@
 		new /obj/item/storage/backpack/security(src)
 	else
 		new /obj/item/storage/backpack/satchel_sec(src)
-	new /obj/item/clothing/head/beret/sec/cadet(src)
+	new /obj/item/clothing/head/beret/security(src)
 	new /obj/item/clothing/suit/storage/hazardvest/cadet(src)
 	new /obj/item/clothing/under/rank/cadet(src)
 	//Tools
@@ -292,6 +292,7 @@
 	else
 		new /obj/item/storage/backpack/satchel_sec(src)
 	new /obj/item/clothing/head/softcap/security/corp(src)
+	new /obj/item/clothing/head/beret/security/corp(src)
 	new /obj/item/clothing/under/rank/security/corp(src)
 	new /obj/item/clothing/suit/storage/vest/officer(src)
 	new /obj/item/clothing/head/helmet(src)

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -23,12 +23,12 @@
 	new /obj/item/clothing/head/softcap/security(src)
 	new /obj/item/clothing/head/softcap/security(src)
 	new /obj/item/clothing/head/softcap/security(src)
-	new /obj/item/clothing/head/beret/sec(src)
+	new /obj/item/clothing/head/beret/security(src)
-	new /obj/item/clothing/head/beret/sec(src)
+	new /obj/item/clothing/head/beret/security(src)
-	new /obj/item/clothing/head/beret/sec(src)
+	new /obj/item/clothing/head/beret/security(src)
-	new /obj/item/clothing/head/beret/sec/alt(src)
+	new /obj/item/clothing/head/beret/security/officer(src)
-	new /obj/item/clothing/head/beret/sec/alt(src)
+	new /obj/item/clothing/head/beret/security/officer(src)
-	new /obj/item/clothing/head/beret/sec/alt(src)
+	new /obj/item/clothing/head/beret/security/officer(src)
 	new /obj/item/clothing/head/bandana/security(src)
 	new /obj/item/clothing/head/bandana/security(src)
 	new /obj/item/clothing/head/bandana/security(src)

code/modules/admin/verbs/bluespacetech.dm

@@ -58,7 +58,7 @@
 	bst.equip_to_slot_or_del(new /obj/item/storage/backpack/holding/bst(bst), slot_back)
 	bst.equip_to_slot_or_del(new /obj/item/storage/box/survival(bst.back), slot_in_backpack)
 	bst.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/bst(bst), slot_shoes)
-	bst.equip_to_slot_or_del(new /obj/item/clothing/head/beret(bst), slot_head)
+	bst.equip_to_slot_or_del(new /obj/item/clothing/head/beret/centcom/officer/bst(bst), slot_head)
 	bst.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/bst(bst), slot_glasses)
 	bst.equip_to_slot_or_del(new /obj/item/storage/belt/utility/very_full(bst), slot_belt)
 	bst.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat/bst(bst), slot_gloves)
@@ -480,6 +480,22 @@
 
 	return 1 //Because Bluespace
 
+/obj/item/clothing/head/beret/centcom/officer/bst
+	name = "bluespace technician's beret"
+	desc = "A Bluespace Technician's beret. The letters 'BST' are stamped on the side."
+	siemens_coefficient = 0
+	permeability_coefficient = 0
+	canremove = 0
+
+/obj/item/clothing/head/beret/centcom/officer/bst/attack_hand()
+	if(!usr)
+		return
+	if(!istype(usr, /mob/living/carbon/human/bst))
+		to_chat(usr, SPAN_ALERT("Your hand seems to go right through the [src]. It's like it doesn't exist."))
+		return
+	else
+		..()
+
 //ID
 /obj/item/card/id/bst
 	icon_state = "centcom"

code/modules/client/preference_setup/loadout/loadout_factions.dm

@@ -8,7 +8,7 @@
 
 /datum/gear/faction/idris_beret
 	display_name = "idris beret"
-	path = /obj/item/clothing/head/beret/sec/idris
+	path = /obj/item/clothing/head/beret/security/idris
 	faction = "Idris Incorporated"
 
 /datum/gear/faction/idris_uniform_alt
@@ -24,13 +24,13 @@
 	faction = "Idris Incorporated"
 
 /datum/gear/faction/zavodskoi_beret
-	display_name = "brown zavodskoi beret"
+	display_name = "black zavodskoi beret"
-	path = /obj/item/clothing/head/beret/sec/zavodskoi
+	path = /obj/item/clothing/head/beret/security/zavodskoi
 	faction = "Zavodskoi Interstellar"
 
 /datum/gear/faction/zavodskoi_beret/alt
-	display_name = "black zavodskoi beret"
+	display_name = "brown zavodskoi beret"
-	path = /obj/item/clothing/head/beret/sec/zavodskoi/alt
+	path = /obj/item/clothing/head/beret/security/zavodskoi/alt
 	sort_category = "Factions"
 
 /datum/gear/faction/zavodskoi_uniform_alt
@@ -53,7 +53,7 @@
 
 /datum/gear/faction/eridani_beret
 	display_name = "eridani beret"
-	path = /obj/item/clothing/head/beret/sec/eri
+	path = /obj/item/clothing/head/beret/security/eri
 	slot = slot_head
 	faction = "Eridani Private Military Contractors"
 

code/modules/client/preference_setup/loadout/loadout_head.dm

@@ -12,6 +12,7 @@
 	display_name = "bandana selection"
 	description = "A selection of bandanas. Comes in departmental colors."
 	path = /obj/item/clothing/head/bandana
+	flags = GEAR_HAS_DESC_SELECTION
 
 /datum/gear/head/bandana/New()
 	..()
@@ -40,6 +41,7 @@
 	display_name = "softcap selection"
 	description = "A selection of softcaps. Comes in departmental colors."
 	path = /obj/item/clothing/head/softcap
+	flags = GEAR_HAS_DESC_SELECTION
 
 /datum/gear/head/softcap/New()
 	..()
@@ -65,21 +67,35 @@
 	path = /obj/item/clothing/head/softcap/colorable
 	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
 
-/datum/gear/head/beret/eng
+/datum/gear/head/beret
-	display_name = "beret, engie-orange"
+	display_name = "beret selection"
-	path = /obj/item/clothing/head/beret/engineering
+	description = "A selection of berets. Comes in departmental colors."
-	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice")
+	path = /obj/item/clothing/head/beret
+	flags = GEAR_HAS_DESC_SELECTION
+
+/datum/gear/head/beret/New()
+	..()
+	var/berets = list()
+	berets["beret"] = /obj/item/clothing/head/beret
+	berets["beret, red"] = /obj/item/clothing/head/beret/red
+	berets["beret, captain"] = /obj/item/clothing/head/beret/captain
+	berets["beret, security"] = /obj/item/clothing/head/beret/security
+	berets["beret, science"] = /obj/item/clothing/head/beret/science
+	berets["beret, medical"] = /obj/item/clothing/head/beret/medical
+	berets["beret, engineering"] = /obj/item/clothing/head/beret/engineering
+	berets["beret, atmospherics"] = /obj/item/clothing/head/beret/atmos
+	berets["beret, hydroponics"] = /obj/item/clothing/head/beret/hydro
+	berets["beret, cargo"] = /obj/item/clothing/head/beret/cargo
+	berets["beret, mining"] = /obj/item/clothing/head/beret/miner
+	berets["beret, janitor"] = /obj/item/clothing/head/beret/janitor
+
+	gear_tweaks += new/datum/gear_tweak/path(berets)
 
 /datum/gear/head/beret/color
 	display_name = "beret (colorable)"
-	path = /obj/item/clothing/head/beret/misc
+	path = /obj/item/clothing/head/beret/colorable
 	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
 
-/datum/gear/head/beret/sec
-	display_name = "beret, security"
-	path = /obj/item/clothing/head/beret/sec
-	allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician")
-
 /datum/gear/head/warden
 	display_name = "headwear, security (warden)"
 	description = "A selection of warden headwear."
@@ -92,7 +108,7 @@
 	wardenhead["blue warden hat"] = /obj/item/clothing/head/warden
 	wardenhead["black warden hat"] = /obj/item/clothing/head/warden/alt
 	wardenhead["commissar's cap"] = /obj/item/clothing/head/warden/commissar
-	wardenhead["warden beret"] = /obj/item/clothing/head/beret/sec/warden
+	wardenhead["warden beret"] = /obj/item/clothing/head/beret/security/warden
 	gear_tweaks += new/datum/gear_tweak/path(wardenhead)
 
 /datum/gear/head/hos
@@ -104,17 +120,12 @@
 /datum/gear/head/hos/New()
 	..()
 	var/hoshead = list()
-	hoshead["blue commander beret"] = /obj/item/clothing/head/beret/sec/hos
+	hoshead["blue commander beret"] = /obj/item/clothing/head/beret/security/hos
-	hoshead["black commander beret"] = /obj/item/clothing/head/beret/sec/hos/alt
+	hoshead["black commander beret"] = /obj/item/clothing/head/beret/security/hos/alt
 	hoshead["blue commander hat"] = /obj/item/clothing/head/hos/cap
 	hoshead["black commander hat"] = /obj/item/clothing/head/hos/cap/alt
 	gear_tweaks += new/datum/gear_tweak/path(hoshead)
 
-/datum/gear/head/beret/medical
-	display_name = "beret, medical"
-	path = /obj/item/clothing/head/beret/medical
-	allowed_roles = list("Physician", "Surgeon", "Medical Intern", "Pharmacist", "Emergency Medical Technician", "Chief Medial Officer", "Psychiatrist")
-
 /datum/gear/head/corp
 	display_name = "cap, corporate (security)"
 	path = /obj/item/clothing/head/softcap/security/corp
@@ -260,7 +271,7 @@
 
 /datum/gear/head/iacberet
 	display_name = "IAC Beret"
-	path = /obj/item/clothing/head/softcap/iacberet
+	path = /obj/item/clothing/head/softcap/iac
 	allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Intern")
 	flags = GEAR_HAS_DESC_SELECTION
 
@@ -270,14 +281,14 @@
 
 /datum/gear/head/tcfl
 	display_name = "tcfl hat selection"
-	path = /obj/item/clothing/head/legion_beret
+	path = /obj/item/clothing/head/beret/legion
 	flags = GEAR_HAS_DESC_SELECTION
 
 /datum/gear/head/tcfl/New()
 	..()
 	var/tcfl = list()
-	tcfl["tcfl beret, dress"] = /obj/item/clothing/head/legion_beret
+	tcfl["tcfl beret, dress"] = /obj/item/clothing/head/beret/legion
-	tcfl["tcfl beret, field"] = /obj/item/clothing/head/legion
+	tcfl["tcfl beret, field"] = /obj/item/clothing/head/beret/legion/field
 	gear_tweaks += new/datum/gear_tweak/path(tcfl)
 
 /datum/gear/head/padded_cap
@@ -303,12 +314,12 @@
 /datum/gear/head/gadpathur
 	display_name = "gadpathurian headgear selection"
 	description = "A selection of headgear from Gadpathur."
-	path = /obj/item/clothing/head/soft/gadpathur
+	path = /obj/item/clothing/head/gadpathur
 	flags = GEAR_HAS_DESC_SELECTION
 
 /datum/gear/head/gadpathur/New()
 	..()
 	var/gadpathur = list()
-	gadpathur["gadpathurian sidecap"] = /obj/item/clothing/head/soft/gadpathur
+	gadpathur["gadpathurian sidecap"] = /obj/item/clothing/head/gadpathur
-	gadpathur["gadpathurian beret"] = /obj/item/clothing/head/soft/gadpathur/beret
+	gadpathur["gadpathurian beret"] = /obj/item/clothing/head/beret/gadpathur
 	gear_tweaks += new/datum/gear_tweak/path(gadpathur)

code/modules/client/preference_setup/loadout/loadout_religion.dm

@@ -44,8 +44,8 @@
 /datum/gear/religion/dominia/beret/New()
 	..()
 	var/beret = list()
-	beret["tribunal initiate's beret"] = /obj/item/clothing/head/softcap/dominia
+	beret["tribunal initiate's beret"] = /obj/item/clothing/head/beret/dominia
-	beret["tribunalist's beret"] = /obj/item/clothing/head/softcap/dominia/priest
+	beret["tribunalist's beret"] = /obj/item/clothing/head/beret/dominia/priest
 	gear_tweaks += new/datum/gear_tweak/path(beret)
 
 /datum/gear/religion/dominia/cape

code/modules/clothing/factions/dominia.dm

@@ -319,19 +319,18 @@
 	item_state = "dominia_priest"
 	slot_flags = SLOT_OCLOTHING | SLOT_ICLOTHING
 
-/obj/item/clothing/head/softcap/dominia
+/obj/item/clothing/head/beret/dominia
-	name = "tribunal initiate's beret"
+	name = "tribunal initiate’s beret"
 	desc = "A simple red beret with a golden badge marking its wearer as an initiate of the Moroz Holy Tribunal."
 	desc_fluff = " While initiates dress humbly in white and red clothing, this does not mean that House Caladius - the primary source of the Holy Tribunal's \
 	funding - spares any expenses funding them, and these berets are made of luxurious velvet."
 	icon = 'icons/clothing/head/dominia_beret.dmi'
 	icon_state = "dominia_beret"
 	item_state = "dominia_beret"
-	contained_sprite = TRUE
 
-/obj/item/clothing/head/softcap/dominia/priest
+/obj/item/clothing/head/beret/dominia/priest
-	name = "tribunalist's beret"
+	name = "tribunalist’s beret"
-	desc = " black beret bearing the sigil of the Moroz Holy Tribunal on its front. Worn by full members of the Tribunal's clergy."
+	desc = " black beret bearing the sigil of the Moroz Holy Tribunal on its front. Worn by full members of the Tribunal’s clergy."
 	desc_fluff = "With their black and gold clothing designed to resemble that of their noble counterparts, the full clergy of the Moroz Holy Tribunal \
 	are a sight to behold both inside and outside of the Empire of Dominia. This beret features an emblem luxuriously and painstakingly crafted out of real gold."
 	icon = 'icons/clothing/head/dominia_beret_priest.dmi'

code/modules/clothing/factions/gadpathur.dm

@@ -21,7 +21,7 @@
 	item_state = "gadpathur_coat"
 	contained_sprite = TRUE
 
-/obj/item/clothing/head/soft/gadpathur
+/obj/item/clothing/head/gadpathur
 	name = "cadre cap"
 	desc = "A snugly-fitting cap with the traditional Gadpathurian red-and-orange sun on its face. It has no other identifying features."
 	desc_fluff = "Soft headgear is commonly worn by cadre members while indoors on Gadpathur or while traveling abroad from the planet. \
@@ -32,7 +32,7 @@
 	item_state = "gadpathur_cap"
 	contained_sprite = TRUE
 
-/obj/item/clothing/head/soft/gadpathur/beret
+/obj/item/clothing/head/beret/gadpathur
 	name = "cadre beret"
 	desc = "A canvas beret with the traditional Gadpathurian red-and-orange sun on its badge. It has no other identifying marks."
 	desc_fluff = "Berets are commonly worn by cadre members while indoors on Gadpathur or while traveling abroad from the planet. \

code/modules/clothing/head/berets.dm

@@ -0,0 +1,216 @@
+/obj/item/clothing/head/beret
+	name = "beret"
+	desc = "A baguette munching, cheese eating, wine drinking artist's favorite headwear. Hon hon!"
+	icon = 'icons/obj/clothing/hats/berets.dmi'
+	icon_state = "beret"
+	item_state = "beret"
+	contained_sprite = TRUE
+	siemens_coefficient = 0.9
+
+/obj/item/clothing/head/beret/colorable
+	icon_state = "beret_colorable"
+	item_state = "beret_colorable"
+
+/obj/item/clothing/head/beret/colorable/random/Initialize()
+	. = ..()
+	color = get_random_colour(TRUE)
+
+/obj/item/clothing/head/beret/red // Antag red.
+	name = "red beret"
+	desc = "It's a beret in a menacing crimson red."
+	icon_state = "beret_red"
+	item_state = "beret_red"
+
+// Departmental berets. By Wowzewow (Wezzy).
+
+/obj/item/clothing/head/beret/captain
+	name = "captain's beret"
+	desc = "A beret in command blue, with the captain's emblem. Serving in the navy just isn't the same without one."
+	icon_state = "beret_captain"
+	item_state = "beret_captain"
+
+/obj/item/clothing/head/beret/security //also used by cadets
+	name = "security beret"
+	desc = "A beret in security navy blue, general purpose due to the lack an emblem. For security personnel that are more inclined towards style than safety."
+	icon_state = "beret_sec"
+	item_state = "beret_sec"
+
+/obj/item/clothing/head/beret/medical
+	name = "medical beret"
+	desc = "A beret with the medical insignia emblazoned on it. For medical members that want to crush their brains after college left them in massive debt."
+	icon_state = "beret_med"
+	item_state = "beret_med"
+
+/obj/item/clothing/head/beret/science
+	name = "science beret"
+	desc = "A beret with the science insignia emblazoned on it. Warning : Corporate does not reimburse clothing items damaged by polynitric acid. Not after an incident involving a certain cat. You know who you are."
+	icon_state = "beret_sci"
+	item_state = "beret_sci"
+
+/obj/item/clothing/head/beret/engineering
+	name = "engineering beret"
+	desc = "A beret with the engineering insignia emblazoned on it. OSHA? I don't even know her!"
+	icon_state = "beret_engi"
+	item_state = "beret_engi"
+
+/obj/item/clothing/head/beret/atmos
+	name = "atmospherics beret"
+	desc = "A beret with the engineering insignia emblazoned on it. Whoever wears this is pretty damn confident in not suffocating themselves to death."
+	icon_state = "beret_atmos"
+	item_state = "beret_atmos"
+
+/obj/item/clothing/head/beret/hydro
+	name = "hydroponics beret"
+	desc = "A beret with the civillian insignia emblazoned on it. Unfortunately does not contain a pocket to hide your ambrosia vulgaris."
+	icon_state = "beret_hydro"
+	item_state = "beret_hydro"
+
+/obj/item/clothing/head/beret/cargo
+	name = "cargo beret"
+	desc = "A beret with the cargo insignia emblazoned on it. Get attacked by a manhack hiding in a crate - in style!"
+	icon_state = "beret_cargo"
+	item_state = "beret_cargo"
+
+/obj/item/clothing/head/beret/miner
+	name = "mining beret"
+	desc = "A beret with the cargo insignia emblazoned on it. Fall to your death - in style! If you manage to wear this with your EVA suit, though. At least medical's going to enjoy your cadaver."
+	icon_state = "beret_miner"
+	item_state = "beret_miner"
+
+/obj/item/clothing/head/beret/janitor
+	name = "janitor beret"
+	desc = "A beret with the janitorial insignia emblazoned on it. Be proud to serve the great nation of Janitalia."
+	icon_state = "beret_janitor"
+	item_state = "beret_janitor"
+
+// alt. sec stuff, because security needs berets for every link in the chain of command
+
+/obj/item/clothing/head/beret/security/officer
+	name = "officer beret"
+	desc = "A beret in security navy blue, with a officer's rank emblem. For security personnel that are more inclined towards style than safety."
+	icon_state = "beret_officer"
+	item_state = "beret_officer"
+
+/obj/item/clothing/head/beret/security/hos
+	name = "blue commander beret"
+	desc = "A beret in security navy blue beret with a commander's rank emblem. For heads of security that are more inclined towards style than safety."
+	icon_state = "beret_hos"
+	item_state = "beret_hos"
+
+/obj/item/clothing/head/beret/security/hos/alt
+	name = "black commander beret"
+	desc = "A beret in corporate black with a commander's rank emblem. For heads of security that are more inclined towards style than safety."
+	icon_state = "corp"
+	item_state = "corp"
+
+/obj/item/clothing/head/beret/security/warden
+	name = "warden beret"
+	desc = "A beret in security navy blue with a warden's rank emblem. For wardens that are more inclined towards style than safety."
+	icon_state = "beret_warden"
+	item_state = "beret_warden"
+
+// Corporate.
+
+/obj/item/clothing/head/beret/security/corp
+	name = "corporate security beret"
+	desc = "A beret in corporate black. For those who pledge allegiance to no flag nor banner, but their paycheck."
+	icon_state = "corp"
+	item_state = "corp"
+
+/obj/item/clothing/head/beret/security/idris
+	name = "idris security beret"
+	desc = "A beret with the Idris Incorporated insignia emblazoned on it."
+	icon_state = "idris"
+	item_state = "idris"
+
+/obj/item/clothing/head/beret/security/zavodskoi
+	name = "zavodskoi interstellar security beret"
+	desc = "A black beret with the Zavodskoi Interstellar insignia emblazoned on it."
+	icon_state = "necrosec"
+	item_state = "necrosec"
+
+/obj/item/clothing/head/beret/security/zavodskoi/alt
+	name = "zavodskoi interstellar security beret"
+	desc = "A brown beret with the Zavodskoi Interstellar insignia emblazoned on it."
+	icon_state = "necrosecalt"
+	item_state = "necrosecalt"
+
+/obj/item/clothing/head/beret/security/eri
+	name = "eridani security beret"
+	desc = "A beret with the Eridani PMC insignia emblazoned on it."
+	icon_state = "eridani"
+	item_state = "eridani"
+
+/obj/item/clothing/head/beret/iac
+	name = "IAC beret"
+	desc = "A beret with the IAC insignia emblazoned on it."
+	icon_state = "iac"
+	item_state = "iac"
+
+/obj/item/clothing/head/beret/zeng
+	name = "zeng-hu beret"
+	desc = "A purple beret with the Zeng-Hu insignia emblazoned on it."
+	icon_state = "zenghu"
+	item_state = "zenghu"
+
+/obj/item/clothing/head/beret/zeng/alt
+	name = "zeng-hu beret"
+	desc = "A white beret with the Zeng-Hu insignia emblazoned on it."
+	icon_state = "zenghualt"
+	item_state = "zenghualt"
+
+/obj/item/clothing/head/beret/heph
+	name = "hephaestus beret"
+	desc = "A green beret with the Hephaestus insignia emblazoned on it."
+	icon_state = "heph"
+	item_state = "heph"
+
+/obj/item/clothing/head/beret/legion
+	name = "TCFL dress beret"
+	desc = "A pale blue dress beret with a rubber insignia of a torch, surrounded by red stars and the letters \"TCFL\". A common good luck charm among former legionaires."
+	icon_state = "tcfl_dress"
+	item_state = "tcfl_dress"
+
+/obj/item/clothing/head/beret/legion/field
+	name = "TCFL field beret"
+	desc = "A hardy, stark red field beret with a rubber insignia of a torch, surrounded by red stars and the letters \"TCFL\"."
+	icon_state = "tcfl_field"
+	item_state = "tcfl_field"
+
+/obj/item/clothing/head/beret/legion/sentinel
+	name = "TCFL sentinel beret"
+	desc = "A hardy, stark purple sentinel beret with a rubber insignia of a torch, surrounded by red stars and the letters \"TCFL\"."
+	icon_state = "tcfl_sentinel"
+	item_state = "tcfl_sentinel"
+
+//centcom
+
+/obj/item/clothing/head/beret/centcom/liaison
+	name = "corporate liaison beret"
+	desc = "A stylish beret worn by corporate liaisons."
+	icon_state = "centcomofficer"
+	item_state = "centcomofficer"
+
+/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 = "centcomofficer"
+	item_state = "centcomofficer"
+
+/obj/item/clothing/head/beret/centcom/civilprotection
+	name = "civil protection beret"
+	desc = "A black beret adorned with the shield - a gold kite shield with an engraved sword - of the NanoTrasen security forces."
+	icon_state = "civilprotection"
+	item_state = "civilprotection"
+
+/obj/item/clothing/head/beret/centcom/captain
+	name = "captain's beret"
+	desc = "A black beret adorned with the shield - a silver kite shield with an engraved sword - of the NanoTrasen security forces."
+	icon_state = "centcomcaptain"
+	item_state = "centcomcaptain"
+
+/obj/item/clothing/head/beret/centcom/commander
+	name = "commander's beret"
+	desc = "A black beret adorned with the crest of an ERT detachment. Worn by commanders of Nanotrasen response teams."
+	icon_state = "centcomcaptain"
+	item_state = "centcomcaptain"

code/modules/clothing/head/collectable.dm

@@ -50,10 +50,7 @@
 	name = "collectable captain's hat"
 	desc = "A Collectable Hat that'll make you look just like a real comdom!"
 	icon_state = "captain"
-	item_state_slots = list(
+	item_state = "caphat"
-		slot_l_hand_str = "caphat",
-		slot_r_hand_str = "caphat"
-		)
 
 /obj/item/clothing/head/collectable/police
 	name = "collectable police officer's hat"
@@ -62,8 +59,11 @@
 
 /obj/item/clothing/head/collectable/beret
 	name = "collectable beret"
-	desc = "A Collectable red Beret. It smells faintly of Garlic."
+	desc = "A Collectable red Beret. It smells faintly of garlic."
-	icon_state = "beret"
+	icon = 'icons/obj/clothing/hats/berets.dmi'
+	icon_state = "beret_red"
+	item_state = "beret_red"
+	contained_sprite = TRUE
 
 /obj/item/clothing/head/collectable/welding
 	name = "collectable welding helmet"

code/modules/clothing/head/jobs.dm

@@ -45,125 +45,6 @@
 	icon_state = "nun_hood"
 	flags_inv = BLOCKHAIR
 
-//Mime
-/obj/item/clothing/head/beret
-	name = "beret"
-	desc = "A beret, an artists favorite headwear."
-	icon_state = "beret"
-
-//berets
-/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
-	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/idris
-	name = "idris security beret"
-	desc = "A beret with the Idris Incorporated insignia emblazoned on it."
-	icon_state = "idrissecberet"
-
-/obj/item/clothing/head/beret/sec/zavodskoi
-	name = "zavodskoi interstellar security beret"
-	desc = "A brown beret with the Zavodskoi Interstellar insignia emblazoned on it."
-	icon_state = "necrosecberet"
-
-/obj/item/clothing/head/beret/sec/zavodskoi/alt
-	name = "zavodskoi interstellar security beret"
-	desc = "A black beret with the Zavodskoi Interstellar insignia emblazoned on it."
-	icon_state = "necrosecaltberet"
-
-/obj/item/clothing/head/beret/sec/eri
-	name = "eridani security beret"
-	desc = "A beret with the Eridani PMC insignia emblazoned on it."
-	icon_state = "erisecberet"
-
-/obj/item/clothing/head/beret/sec/cadet
-	name = "cadet beret"
-	desc = "A beret with the security insignia emblazoned on it. This one is for in training security personnel."
-	icon_state = "cadetberet"
-
-/obj/item/clothing/head/beret/sec/hos
-	name = "blue commander 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/hos/alt
-	name = "black commander beret"
-	desc = "A black beret with a commander's rank emblem. For officers that are more inclined towards style than safety."
-	icon_state = "hosberet_alt"
-
-/obj/item/clothing/head/beret/sec/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/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"
-
-/obj/item/clothing/head/beret/medical
-	name = "medical beret"
-	desc = "A beret with the medical insignia emblazoned on it. For medical members that want to crush their brains after college left them in massive debt."
-	icon_state = "medberet"
-
-/obj/item/clothing/head/beret/zeng
-	name = "zeng-hu beret"
-	desc = "A purple beret with the Zeng-Hu insignia emblazoned on it."
-	icon_state = "zengberet"
-
-/obj/item/clothing/head/beret/zeng/alt
-	name = "zeng-hu beret"
-	desc = "A white beret with the Zeng-Hu insignia emblazoned on it."
-	icon_state = "zengaltberet"
-
-/obj/item/clothing/head/beret/heph
-	name = "hephaestus beret"
-	desc = "A green beret with the Hephaestus insignia emblazoned on it."
-	icon_state = "hephberet"
-
-/obj/item/clothing/head/beret/purple
-	name = "purple beret"
-	desc = "A stylish, if purple, beret."
-	icon_state = "purpleberet"
-
-/obj/item/clothing/head/beret/liaison
-	name = "corporate liaison beret"
-	desc = "A stylish beret worn by corporate liaisons."
-	icon_state = "centcomofficerberet"
-
-/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"
-
-/obj/item/clothing/head/beret/centcom/officer/civilprotection
-	name = "civil protection beret"
-	desc = "A black beret adorned with the shield - a gold kite shield with an engraved sword - of the NanoTrasen security forces."
-	icon_state = "civilprotection_beret"
-	item_state = "civilprotection_beret"
-
-/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"
-
-/obj/item/clothing/head/beret/centcom/commander
-	name = "commanders beret"
-	desc = "A white beret adorned with the crest of an ERT detachment. Worn by commanders of Nanotrasen response teams."
-	icon_state = "centcomcaptain"
-
-/obj/item/clothing/head/beret/misc
-	name = "beret"
-	desc = "A colorful beret, treasured by artists and the French."
-	icon_state = "miscberet"
-	item_state = "miscberet"
-
 //Medical
 /obj/item/clothing/head/surgery
 	name = "surgical cap"

code/modules/clothing/head/misc.dm

@@ -454,24 +454,6 @@
 
 //Tau Ceti Foreign Legion
 
-/obj/item/clothing/head/legion_beret
-	name = "TCFL dress beret"
-	desc = "A pale blue dress beret with a rubber insignia of a torch, surrounded by red stars and the letters \"TCFL\". A common good luck charm among former legionaires."
-	icon_state = "legion_beret"
-	item_state = "legion_beret"
-
-/obj/item/clothing/head/legion
-	name = "TCFL field beret"
-	desc = "A hardy, stark red field beret with a rubber insignia of a torch, surrounded by red stars and the letters \"TCFL\"."
-	icon_state = "legion_field_beret"
-	item_state = "legion_field_beret"
-
-/obj/item/clothing/head/legion/sentinel
-	name = "TCFL sentinel beret"
-	desc = "A hardy, stark purple sentinel beret with a rubber insignia of a torch, surrounded by red stars and the letters \"TCFL\"."
-	icon_state = "legion_sentinel_beret"
-	item_state = "legion_sentinel_beret"
-
 /obj/item/clothing/head/legion/legate
 	name = "TCFL peaked cap"
 	desc = "A stark red peaked cap. Worn by senior officers of the Tau Ceti Foreign Legion."

code/modules/clothing/head/soft_caps.dm

@@ -127,9 +127,9 @@
 	icon_state = "idris"
 	item_state = "idris"
 
-/obj/item/clothing/head/softcap/iacberet
+/obj/item/clothing/head/softcap/iac
-	name = "IAC soft cap"
+	name = "IAC cap"
-	desc = "An IAC soft cap. Standard issue and utilitarian."
+	desc = "An IAC cap. Standard issue and utilitarian."
 	icon_state = "iac"
 	item_state = "iac"
 

code/modules/clothing/head/xenos/tajara.dm

@@ -53,9 +53,10 @@
 	icon_state = "raskara_mask"
 	item_state = "raskara_mask"
 
-/obj/item/clothing/head/tajaran/pra_beret
+/obj/item/clothing/head/beret/tajaran/pra
 	name = "republican army beret"
 	desc = "A green beret issued to republican soldiers."
+	icon = 'icons/obj/tajara_items.dmi'
 	icon_state = "praberet"
 	item_state = "praberet"
 

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -17,7 +17,10 @@
 /obj/item/clothing/head/helmet/space/deathsquad/beret
 	name = "officer's beret"
 	desc = "An armored beret commonly used by special operations officers."
-	icon_state = "beret_badge"
+	icon = 'icons/obj/clothing/hats/berets.dmi'
+	icon_state = "beret_sec"
+	item_state = "beret_sec"
+	contained_sprite = TRUE
 	armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30)
 	item_flags = STOPPRESSUREDAMAGE
 	flags_inv = BLOCKHAIR

code/modules/clothing/under/miscellaneous.dm

@@ -501,19 +501,19 @@
 	siemens_coefficient = 0.7
 
 /obj/item/clothing/under/legion/sentinel
-	name = "Tau Ceti Foreign Legion sentinel uniform."
+	name = "Tau Ceti Foreign Legion sentinel uniform"
-	desc = "A blue uniform with purple trimming, indicating that the wearer is a sentinel of the TCFL."
+	desc = "A blue field uniform with purple trimming, indicating that the wearer is a sentinel of the TCFL."
 	worn_state = "taucetilegion_sentinel"
 
 /obj/item/clothing/under/legion/legate
-	name = "Legate uniform"
+	name = "Tau Ceti Foreign Legion legate uniform"
-	desc = "A stark red uniform worn by senior officers of the Tau Ceti Foreign Legion."
+	desc = "A stark red field uniform worn by senior officers of the Tau Ceti Foreign Legion."
 	icon_state = "taucetilegion_legate"
 	worn_state = "taucetilegion_legate"
 
 /obj/item/clothing/under/legion/pilot
 	name = "Tau Ceti Foreign Legion flightsuit"
-	desc = "The uniform worn by Tau Ceti Foreign Legion pilots."
+	desc = "A green flightsuit worn by Tau Ceti Foreign Legion pilots."
 	icon_state = "taucetilegion_pilot"
 	worn_state = "taucetilegion_pilot"
 
@@ -549,7 +549,6 @@
 	item_state = "lance_dress_f"
 	worn_state = "lance_dress_f"
 
-
 /obj/item/clothing/under/dress/lance_dress/male
 	name = "lance dress uniform"
 	desc = "A dark black uniform indicative of a Ceres' Lance official with a badge atop the chest."

code/modules/ghostroles/spawner/human/emergencypod.dm

@@ -140,7 +140,7 @@
 	glasses = /obj/item/clothing/glasses/sunglasses/big
 	l_hand =  /obj/item/storage/briefcase
 	backpack_contents = list(
-		/obj/item/clothing/head/beret/liaison = 1,
+		/obj/item/clothing/head/beret/centcom/liaison = 1,
 		/obj/item/device/camera = 1,
 		/obj/item/gun/energy/pistol = 1,
 		/obj/item/device/oxycandle = 1,

code/modules/mining/abandonedcrates.dm

@@ -132,7 +132,7 @@
 			new /obj/item/modular_computer/handheld/pda/civilian/mime(src)
 			new /obj/item/clothing/gloves/white(src)
 			new /obj/item/clothing/mask/gas/mime(src)
-			new /obj/item/clothing/head/beret(src)
+			new /obj/item/clothing/head/beret/red(src)
 			new /obj/item/clothing/accessory/suspenders(src)
 			new /obj/item/pen/crayon/mime(src)
 			new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(src)

html/changelogs/wezzy_departmentalberets.yml

@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Modifies and adds appropriate departmental berets."
+  - tweak: "Corporate berets have been tweaked to match their respective uniforms more closely."

maps/aurora/aurora-1_centcomm.dmm

@@ -11471,7 +11471,7 @@
 /obj/item/clothing/head/softcap/eri,
 /obj/item/clothing/head/softcap/eri,
 /obj/item/clothing/head/softcap/eri,
-/obj/item/clothing/head/beret/sec/eri,
+/obj/item/clothing/head/beret/security/eri,
 /obj/item/clothing/under/rank/zavodskoi,
 /obj/item/clothing/under/rank/zavodskoi,
 /obj/item/clothing/under/rank/zavodskoi,
@@ -11486,14 +11486,14 @@
 /obj/item/clothing/accessory/sleevepatch/zavodskoisec,
 /obj/item/clothing/accessory/sleevepatch/zavodskoisec,
 /obj/item/clothing/accessory/sleevepatch/zavodskoisec,
-/obj/item/clothing/head/beret/sec/zavodskoi/alt,
+/obj/item/clothing/head/beret/security/zavodskoi/alt,
-/obj/item/clothing/head/beret/sec/zavodskoi/alt,
+/obj/item/clothing/head/beret/security/zavodskoi/alt,
-/obj/item/clothing/head/beret/sec/zavodskoi/alt,
+/obj/item/clothing/head/beret/security/zavodskoi/alt,
-/obj/item/clothing/head/beret/sec/zavodskoi/alt,
+/obj/item/clothing/head/beret/security/zavodskoi/alt,
-/obj/item/clothing/head/beret/sec/zavodskoi,
+/obj/item/clothing/head/beret/security/zavodskoi,
-/obj/item/clothing/head/beret/sec/zavodskoi,
+/obj/item/clothing/head/beret/security/zavodskoi,
-/obj/item/clothing/head/beret/sec/zavodskoi,
+/obj/item/clothing/head/beret/security/zavodskoi,
-/obj/item/clothing/head/beret/sec/zavodskoi,
+/obj/item/clothing/head/beret/security/zavodskoi,
 /obj/item/clothing/under/rank/hephaestus/tech,
 /obj/item/clothing/under/rank/hephaestus/tech,
 /obj/item/clothing/under/rank/hephaestus,
@@ -11523,10 +11523,10 @@
 /obj/item/clothing/under/rank/security/idris,
 /obj/item/clothing/under/rank/security/idris,
 /obj/item/clothing/under/rank/security/idris,
-/obj/item/clothing/head/beret/sec/idris,
+/obj/item/clothing/head/beret/security/idris,
-/obj/item/clothing/head/beret/sec/idris,
+/obj/item/clothing/head/beret/security/idris,
-/obj/item/clothing/head/beret/sec/idris,
+/obj/item/clothing/head/beret/security/idris,
-/obj/item/clothing/head/beret/sec/idris,
+/obj/item/clothing/head/beret/security/idris,
 /turf/unsimulated/floor{
 	icon_state = "new_reinforced"
 	},

maps/aurora/aurora-4_mainlevel.dmm

@@ -60807,7 +60807,7 @@
 /area/engineering/engine_waste)
 "fXR" = (
 /obj/structure/table/standard,
-/obj/item/clothing/head/beret/sec{
+/obj/item/clothing/head/beret/security{
 	desc = "A beret with the security insignia emblazoned on it. It is horribly dirty and stained.";
 	name = "Smudged security beret"
 	},

maps/exodus/exodus-2_centcomm.dmm

@@ -17487,7 +17487,7 @@
 	icon_state = "cabinet_closed"
 	},
 /obj/item/clothing/accessory/legion,
-/obj/item/clothing/head/legion_beret,
+/obj/item/clothing/head/beret/legion,
 /obj/item/clothing/under/legion,
 /obj/item/device/radio/headset/legion,
 /obj/item/shield/energy/legion,