Merge pull request #5448 from paprka/hossystuff

Adds HoS drill hat, and violently guts jensen cosplay from HoS

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

@@ -70,8 +70,10 @@
 	..()
 	sleep(2)
 	new /obj/item/clothing/suit/armor/vest(src)
-	new /obj/item/clothing/suit/armor/hos/jensen(src)
-	new /obj/item/clothing/head/HoS/dermal(src)
+	new /obj/item/clothing/under/hosformalfem(src)
+	new /obj/item/clothing/under/hosformalmale(src)
+	new /obj/item/clothing/suit/armor/hos/trenchcoat(src)
+	new /obj/item/clothing/head/HoS/drill(src)
 	new /obj/item/weapon/cartridge/hos(src)
 	new /obj/item/device/radio/headset/heads/hos/alt(src)
 	new /obj/item/clothing/glasses/hud/security/eyepatch(src)

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

@@ -38,17 +38,6 @@
 	new /obj/item/clothing/head/beret/sec(src)
 	return
 
-/obj/structure/closet/wardrobe/hos
-	name = "\proper head of security's wardrobe"
-	icon_state = "red"
-	icon_closed = "red"
-
-/obj/structure/closet/wardrobe/hos/New()
-	new /obj/item/clothing/under/hosformalfem(src)
-	new /obj/item/clothing/under/hosformalmale(src)
-	new /obj/item/clothing/under/rank/head_of_security/jensen(src)
-	return
-
 /obj/structure/closet/wardrobe/pink
 	name = "pink wardrobe"
 	icon_state = "pink"

code/modules/clothing/head/jobs.dm

@@ -63,23 +63,21 @@
 //Security
 
 /obj/item/clothing/head/HoS
-	name = "head of security hat"
-	desc = "The robust hat of the Head of Security. For showing the officers who's in charge."
+	name = "head of security cap"
+	desc = "The robust standard-issue cap of the Head of Security. For showing the officers who's in charge."
 	icon_state = "hoscap"
 	armor = list(melee = 80, bullet = 60, laser = 50, energy = 10, bomb = 25, bio = 10, rad = 0)
 	flags = 0
 	flags_inv = HIDEEARS
 	strip_delay = 80
 
-/obj/item/clothing/head/HoS/dermal
-	name = "Dermal Armor Patch"
-	desc = "An armored implant that automatically integrates just below the scalp for robust protection without sacrificing style."
-	icon_state = "dermal"
-	item_state = "dermal"
-	flags_inv = 0
+/obj/item/clothing/head/HoS/drill
+	name = "head of security drill hat"
+	desc = "A robust drill hat for the Head of Security. For keeping the officers in line."
+	icon_state = "hosdrill"
 
 /obj/item/clothing/head/warden
-	name = "warden's hat"
+	name = "warden's police hat"
 	desc = "It's a special armored hat issued to the Warden of a security force. Protects the head from impacts."
 	icon_state = "policehelm"
 	armor = list(melee = 60, bullet = 5, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)

code/modules/clothing/suits/armor.dm

@@ -17,8 +17,8 @@
 	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/armor/hos
-	name = "armored coat"
-	desc = "A greatcoat enchanced with a special alloy for some protection and style."
+	name = "armored greatcoat"
+	desc = "A greatcoat enchanced with a special alloy for some protection and style for those with a commanding presence."
 	icon_state = "hos"
 	item_state = "hos"
 	body_parts_covered = CHEST|GROIN|ARMS|LEGS
@@ -29,6 +29,15 @@
 	strip_delay = 80
 	put_on_delay = 40
 
+/obj/item/clothing/suit/armor/hos/trenchcoat
+	name = "armored trenchoat"
+	desc = "A trenchcoat enchanced with a special lightweight kevlar. The epitome of tactical plainclothes."
+	icon_state = "jensencoat"
+	item_state = "jensencoat"
+	flags_inv = 0
+	strip_delay = 80
+	put_on_delay = 40
+
 /obj/item/clothing/suit/armor/vest/warden
 	name = "warden's jacket"
 	desc = "An armored jacket with silver rank pips and livery."

code/modules/clothing/under/jobs/security.dm

@@ -59,26 +59,6 @@
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	strip_delay = 60
 
-/*
- * Jensen cosplay gear
- */
-/obj/item/clothing/under/rank/head_of_security/jensen
-	desc = "You never asked for anything that stylish."
-	name = "head of security's jumpsuit"
-	icon_state = "jensen"
-	item_state = "jensen"
-	item_color = "jensen"
-	can_adjust = 0
-
-/obj/item/clothing/suit/armor/hos/jensen
-	name = "armored trenchoat"
-	desc = "A trenchoat augmented with a special alloy for some protection and style"
-	icon_state = "jensencoat"
-	item_state = "jensencoat"
-	flags_inv = 0
-	strip_delay = 80
-	put_on_delay = 40
-
 
 /*
  * Navy uniforms