diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index 93b4684db4a..babc579a95e 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -47,6 +47,7 @@ new /obj/item/clothing/under/rank/captain(src) new /obj/item/clothing/under/rank/captain/skirt(src) new /obj/item/clothing/under/rank/captain/parade(src) + new /obj/item/clothing/under/rank/captain/royal(src) new /obj/item/clothing/suit/armor/vest/capcarapace(src) new /obj/item/clothing/suit/armor/vest/capcarapace/captains_formal(src) new /obj/item/clothing/suit/hooded/wintercoat/captain(src) @@ -56,6 +57,7 @@ new /obj/item/clothing/head/costume/crown/fancy(src) new /obj/item/clothing/head/hats/caphat(src) new /obj/item/clothing/head/hats/caphat/parade(src) + new /obj/item/clothing/head/hats/caphat/bicorne(src) new /obj/item/clothing/neck/cloak/cap(src) new /obj/item/clothing/shoes/laceup(src) new /obj/item/storage/backpack/captain(src) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 11efd6c5b7a..1687bc22132 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -124,6 +124,12 @@ icon_state = "capcap" dog_fashion = null +/obj/item/clothing/head/hats/caphat/bicorne + name = "captain's bicorne" + desc = "Why be king when you can be Emperor?" + icon_state = "capbicorne" + dog_fashion = null + /obj/item/clothing/head/caphat/beret name = "captain's beret" desc = "For the Captains known for their sense of fashion." diff --git a/code/modules/clothing/under/jobs/command.dm b/code/modules/clothing/under/jobs/command.dm index 3016eb9fa2c..0df4a925fe1 100644 --- a/code/modules/clothing/under/jobs/command.dm +++ b/code/modules/clothing/under/jobs/command.dm @@ -28,3 +28,8 @@ icon_state = "captain_parade" inhand_icon_state = null can_adjust = FALSE + +/obj/item/clothing/under/rank/captain/royal + name = "captain's royal uniform" + desc = "A captain's royal uniform. Fit for commanding your Officers in the midst of a nuclear incursion." + icon_state = "caproyal" diff --git a/icons/mob/clothing/head/hats.dmi b/icons/mob/clothing/head/hats.dmi index 712dbad93e6..e29206ddc65 100644 Binary files a/icons/mob/clothing/head/hats.dmi and b/icons/mob/clothing/head/hats.dmi differ diff --git a/icons/mob/clothing/under/captain.dmi b/icons/mob/clothing/under/captain.dmi index 49de8ab784e..05f6b707c01 100644 Binary files a/icons/mob/clothing/under/captain.dmi and b/icons/mob/clothing/under/captain.dmi differ diff --git a/icons/obj/clothing/head/hats.dmi b/icons/obj/clothing/head/hats.dmi index b30c0c81ace..6ba6906d2aa 100644 Binary files a/icons/obj/clothing/head/hats.dmi and b/icons/obj/clothing/head/hats.dmi differ diff --git a/icons/obj/clothing/under/captain.dmi b/icons/obj/clothing/under/captain.dmi index 335ce733253..8192379d101 100644 Binary files a/icons/obj/clothing/under/captain.dmi and b/icons/obj/clothing/under/captain.dmi differ