diff --git a/code/defines/obj/clothing/costume.dm b/code/defines/obj/clothing/costume.dm index 21bb6172af..76c50714ed 100644 --- a/code/defines/obj/clothing/costume.dm +++ b/code/defines/obj/clothing/costume.dm @@ -60,7 +60,7 @@ /obj/effect/landmark/costume/prig/New() new /obj/item/clothing/suit/storage/wcoat(src.loc) new /obj/item/clothing/glasses/monocle(src.loc) - var/CHOICE= pick( /obj/item/clothing/head/bowler, /obj/item/clothing/head/that) + var/CHOICE= pick( /obj/item/clothing/head/bowlerhat, /obj/item/clothing/head/that) new CHOICE(src.loc) new /obj/item/clothing/shoes/black(src.loc) new /obj/item/weapon/cane(src.loc) diff --git a/code/defines/obj/clothing/gimmick.dm b/code/defines/obj/clothing/gimmick.dm index 29ce1871b7..4b1d817476 100644 --- a/code/defines/obj/clothing/gimmick.dm +++ b/code/defines/obj/clothing/gimmick.dm @@ -510,10 +510,3 @@ item_state = "sexymime" color = "sexymime" body_parts_covered = UPPER_TORSO|LOWER_TORSO - -/obj/item/clothing/head/bowler - name = "bowler-hat" - desc = "Gentleman, elite aboard!" - icon_state = "bowler" - item_state = "bowler" - flags = FPRINT | TABLEPASS \ No newline at end of file diff --git a/code/defines/obj/clothing/head.dm b/code/defines/obj/clothing/head.dm index cfb9224d95..b915e86632 100644 --- a/code/defines/obj/clothing/head.dm +++ b/code/defines/obj/clothing/head.dm @@ -187,4 +187,25 @@ name = "Nurse Hat" desc = "For quick identification of trained medical personnel." icon_state = "nursehat" - flags = FPRINT|TABLEPASS \ No newline at end of file + flags = FPRINT|TABLEPASS + +/obj/item/clothing/head/bowlerhat + name = "Bowler hat" + icon_state = "bowler_hat" + item_state = "bowler_hat" + desc = "For the gentleman of distinction." + flags = FPRINT|TABLEPASS + +/obj/item/clothing/head/beaverhat + name = "Beaver hat" + icon_state = "beaver_hat" + item_state = "beaver_hat" + desc = "Solf felt make this hat both comfortable and elegant." + flags = FPRINT|TABLEPASS + +/obj/item/clothing/head/boaterhat + name = "Boater hat" + icon_state = "boater_hat" + item_state = "boater_hat" + desc = "The ultimate in summer fashion." + flags = FPRINT|TABLEPASS diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index b2905c9135..fb6a73631a 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 1b17141922..86b078b48f 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index b6526a11d0..97bbce9208 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 9583224a6b..f5609f7c11 100755 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 3954c21503..dcaf5999cc 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ