diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm index 2d57286a531..66d4d14d561 100644 --- a/code/game/objects/items/weapons/storage/garment.dm +++ b/code/game/objects/items/weapons/storage/garment.dm @@ -30,6 +30,7 @@ /obj/item/storage/bag/garment/captain/populate_contents() new /obj/item/clothing/head/caphat(src) new /obj/item/clothing/head/caphat/parade(src) + new /obj/item/clothing/head/caphat/parade/white(src) new /obj/item/clothing/head/beret/captain(src) new /obj/item/clothing/head/beret/captain/white(src) new /obj/item/clothing/head/crown/fancy(src) @@ -41,6 +42,9 @@ new /obj/item/clothing/suit/armor/vest/capcarapace/coat/white(src) new /obj/item/clothing/neck/cloak/captain_mantle(src) new /obj/item/clothing/under/rank/captain(src) + new /obj/item/clothing/under/rank/captain/skirt(src) + new /obj/item/clothing/under/rank/captain/white(src) + new /obj/item/clothing/under/rank/captain/skirt/white(src) new /obj/item/clothing/under/rank/captain/parade(src) new /obj/item/clothing/under/rank/captain/dress(src) new /obj/item/clothing/gloves/color/captain(src) diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm index 3821188bf44..280139a0fce 100644 --- a/code/modules/client/preference/loadout/loadout_uniform.dm +++ b/code/modules/client/preference/loadout/loadout_uniform.dm @@ -320,6 +320,11 @@ path = /obj/item/clothing/under/rank/civilian/hop/skirt allowed_roles = list("Head of Personnel") +/datum/gear/uniform/skirt/captain + display_name = "Skirt, captain" + path = /obj/item/clothing/under/rank/captain/skirt + allowed_roles = list("Captain") + /datum/gear/uniform/skirt/job/magistrate display_name = "Skirt, magistrate" path = /obj/item/clothing/under/rank/procedure/magistrate/skirt diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm index 2a1b5b6ea74..8785c95b4a8 100644 --- a/code/modules/clothing/head/job_hats.dm +++ b/code/modules/clothing/head/job_hats.dm @@ -27,12 +27,16 @@ "Vox" = 'icons/mob/clothing/species/vox/head.dmi', "Drask" = 'icons/mob/clothing/species/drask/head.dmi', "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi' ) /obj/item/clothing/head/caphat/parade name = "captain's parade cap" desc = "Worn only by Captains with an abundance of class." - icon_state = "captain_cap" + icon_state = "captain_capblue" + +/obj/item/clothing/head/caphat/parade/white + icon_state = "captain_capwhite" //Head of Personnel /obj/item/clothing/head/hop diff --git a/code/modules/clothing/under/jobs/captain.dm b/code/modules/clothing/under/jobs/captain.dm index 6845c1c738b..3956a7e44d3 100644 --- a/code/modules/clothing/under/jobs/captain.dm +++ b/code/modules/clothing/under/jobs/captain.dm @@ -1,6 +1,6 @@ /obj/item/clothing/under/rank/captain name = "captain's jumpsuit" - desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"." + desc = "It's a blue dress shirt and black slacks with some gold markings denoting the rank of \"Captain\"." icon = 'icons/obj/clothing/under/captain.dmi' icon_state = "captain" item_state = "caparmor" @@ -14,6 +14,22 @@ "Kidan" = 'icons/mob/clothing/species/kidan/under/captain.dmi', ) +/obj/item/clothing/under/rank/captain/skirt + name = "captain's jumpskirt" + desc = "It's a blue dress shirt and black skirt with some gold markings denoting the rank of \"Captain\"." + icon_state = "captain_skirt" + item_color = "captain_skirt" + +/obj/item/clothing/under/rank/captain/white + desc = "It's a white dress shirt and black slacks with some gold markings denoting the rank of \"Captain\"." + icon_state = "captain_white" + item_color = "captain_white" + +/obj/item/clothing/under/rank/captain/skirt/white + desc = "It's a white dress shirt and black skirt with some gold markings denoting the rank of \"Captain\"." + icon_state = "captain_skirt_white" + item_color = "captain_skirt_white" + /obj/item/clothing/under/rank/captain/dress name = "captain's dress" desc = "Feminine fashion for the style conscious captain." diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 5fbb0f01023..7fdeaa4353f 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi index 30d4bbb0def..1e98fe37748 100644 Binary files a/icons/mob/clothing/species/drask/head.dmi and b/icons/mob/clothing/species/drask/head.dmi differ diff --git a/icons/mob/clothing/species/drask/under/captain.dmi b/icons/mob/clothing/species/drask/under/captain.dmi index e10bc91dc56..300d24972c2 100644 Binary files a/icons/mob/clothing/species/drask/under/captain.dmi and b/icons/mob/clothing/species/drask/under/captain.dmi differ diff --git a/icons/mob/clothing/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi index 5b86db8ba29..e5f0ffae1bc 100644 Binary files a/icons/mob/clothing/species/grey/head.dmi and b/icons/mob/clothing/species/grey/head.dmi differ diff --git a/icons/mob/clothing/species/grey/under/captain.dmi b/icons/mob/clothing/species/grey/under/captain.dmi index 210db246482..67bf32f5f30 100644 Binary files a/icons/mob/clothing/species/grey/under/captain.dmi and b/icons/mob/clothing/species/grey/under/captain.dmi differ diff --git a/icons/mob/clothing/species/kidan/head.dmi b/icons/mob/clothing/species/kidan/head.dmi index eb4f8aa065d..c3c01db3a73 100644 Binary files a/icons/mob/clothing/species/kidan/head.dmi and b/icons/mob/clothing/species/kidan/head.dmi differ diff --git a/icons/mob/clothing/species/kidan/under/captain.dmi b/icons/mob/clothing/species/kidan/under/captain.dmi index 297ba8b7106..95dfa115766 100644 Binary files a/icons/mob/clothing/species/kidan/under/captain.dmi and b/icons/mob/clothing/species/kidan/under/captain.dmi differ diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index d375080b891..66e76dda8f5 100644 Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ diff --git a/icons/mob/clothing/species/vox/under/captain.dmi b/icons/mob/clothing/species/vox/under/captain.dmi index 64220cf9094..3b413293847 100644 Binary files a/icons/mob/clothing/species/vox/under/captain.dmi and b/icons/mob/clothing/species/vox/under/captain.dmi differ diff --git a/icons/mob/clothing/under/captain.dmi b/icons/mob/clothing/under/captain.dmi index 7ff461c973b..558a2e6f37a 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/hats.dmi b/icons/obj/clothing/hats.dmi index 020c2e84716..27250d27fc7 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/under/captain.dmi b/icons/obj/clothing/under/captain.dmi index 1f173d8b44b..bc0a61c8b7d 100644 Binary files a/icons/obj/clothing/under/captain.dmi and b/icons/obj/clothing/under/captain.dmi differ