From 9b4cdb357ed8396acbb28f891502832b66c1be0d Mon Sep 17 00:00:00 2001
From: FireFishie <firefishie@gmail.com>
Date: Mon, 6 Aug 2012 06:50:31 -0400
Subject: [PATCH] Captain's cap is now a hat

-Traded the Captain's cap back for the hat, as the cap is actually not all that sensible
---
 code/WorkInProgress/SkyMarshal/wardrobes.dm  | 2 +-
 code/game/jobs/job/captain.dm                | 2 +-
 code/game/objects/closets/secure/security.dm | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/WorkInProgress/SkyMarshal/wardrobes.dm b/code/WorkInProgress/SkyMarshal/wardrobes.dm
index afa700c9ec..214edfae54 100755
--- a/code/WorkInProgress/SkyMarshal/wardrobes.dm
+++ b/code/WorkInProgress/SkyMarshal/wardrobes.dm
@@ -208,7 +208,7 @@
 		new /obj/item/clothing/glasses/sunglasses(src)
 		new /obj/item/clothing/suit/storage/captunic(src)
 		new /obj/item/clothing/suit/armor/vest(src)
-		new /obj/item/clothing/head/helmet/cap(src)
+		new /obj/item/clothing/head/caphat(src)
 		new /obj/item/clothing/gloves/captain(src)
 		new /obj/item/clothing/head/helmet/swat(src)
 		new /obj/item/device/radio/headset/heads/captain(src)
diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm
index 8dfb062e8c..a18b0b2e65 100644
--- a/code/game/jobs/job/captain.dm
+++ b/code/game/jobs/job/captain.dm
@@ -19,7 +19,7 @@
 		H.equip_if_possible(new /obj/item/clothing/under/rank/captain(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/device/pda/captain(H), H.slot_belt)
 		H.equip_if_possible(new /obj/item/clothing/shoes/jackboots(H), H.slot_shoes)
-		H.equip_if_possible(new /obj/item/clothing/head/helmet/cap(H), H.slot_head)
+		H.equip_if_possible(new /obj/item/clothing/head/caphat(H), H.slot_head)
 		H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(H), H.slot_glasses)
 		H.equip_if_possible(new /obj/item/clothing/gloves/captain(H), H.slot_gloves)
 		if(H.backbag == 1)
diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm
index d518816555..bc67a30042 100644
--- a/code/game/objects/closets/secure/security.dm
+++ b/code/game/objects/closets/secure/security.dm
@@ -16,7 +16,7 @@
 		new /obj/item/device/pda/captain(src)
 		new /obj/item/weapon/storage/id_kit(src)
 		new /obj/item/clothing/suit/armor/captain(src)
-		new /obj/item/clothing/head/caphat(src)
+		new /obj/item/clothing/head/helmet/cap(src)
 		new /obj/item/clothing/glasses/sunglasses(src)
 		new /obj/item/clothing/suit/armor/vest(src)
 		new /obj/item/weapon/cartridge/captain(src)