diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm index ab0dfb7ddd3..68896bbd921 100644 --- a/code/game/objects/items/weapons/storage/garment.dm +++ b/code/game/objects/items/weapons/storage/garment.dm @@ -28,13 +28,19 @@ desc = "A bag for storing extra clothes and shoes. This one belongs to the captain." /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/suit/captunic(src) - new /obj/item/clothing/suit/captunic/capjacket(src) + new /obj/item/clothing/head/caphat/beret(src) + new /obj/item/clothing/head/caphat/beret/white(src) + new /obj/item/clothing/head/crown/fancy(src) + new /obj/item/clothing/suit/armor/vest/capcarapace(src) + new /obj/item/clothing/suit/armor/vest/capcarapace/jacket(src) + new /obj/item/clothing/suit/armor/vest/capcarapace/jacket/tunic(src) + new /obj/item/clothing/suit/armor/vest/capcarapace/coat(src) + new /obj/item/clothing/suit/armor/vest/capcarapace/coat/white(src) new /obj/item/clothing/suit/mantle/armor/captain(src) - new /obj/item/clothing/suit/armor/vest/capcarapace/alt(src) - new /obj/item/clothing/under/captainparade(src) new /obj/item/clothing/under/rank/captain(src) + new /obj/item/clothing/under/rank/captain/parade(src) new /obj/item/clothing/under/dress/dress_cap(src) new /obj/item/clothing/gloves/color/captain(src) new /obj/item/clothing/shoes/brown(src) diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index ea9836775e7..d13b6a0552b 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -153,6 +153,16 @@ main_typepath = /datum/gear/hat/beret_job subtype_selection_cost = FALSE +/datum/gear/hat/beret_job/captain + display_name = "Beret, captain's" + path = /obj/item/clothing/head/caphat/beret + allowed_roles = list("Captain") + +/datum/gear/hat/beret_job/captain_white + display_name = "Beret, captain's white" + path = /obj/item/clothing/head/caphat/beret/white + allowed_roles = list("Captain") + /datum/gear/hat/beret_job/sec display_name = "Beret, security" path = /obj/item/clothing/head/beret/sec diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 33e2a9249f1..32ecbc6c853 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -239,7 +239,7 @@ name = "captain's gloves" desc = "Regal blue gloves, with a nice gold trim. Swanky." icon_state = "captain" - item_state = "egloves" + item_state = "captain" item_color = "captain" siemens_coefficient = 0 permeability_coefficient = 0.05 @@ -249,6 +249,12 @@ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT strip_delay = 60 armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 115, ACID = 50) + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/gloves.dmi', + "Drask" = 'icons/mob/clothing/species/drask/gloves.dmi', + "Grey" = 'icons/mob/clothing/species/grey/gloves.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi', + ) /obj/item/clothing/gloves/furgloves desc = "These gloves are warm and furry." diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index d195f31179e..3657f4f8ef1 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -48,8 +48,8 @@ /obj/item/clothing/head/collectable/captain name = "collectable captain's hat" desc = "A Collectable Hat that'll make you look just like a real comdom!" - icon_state = "captain" - item_state = "caphat" + icon_state = "captain_hat" + item_state = "captain_hat" dog_fashion = /datum/dog_fashion/head/captain sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index de171d2723b..c2da994dba0 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -17,20 +17,37 @@ //Captain /obj/item/clothing/head/caphat name = "captain's hat" - icon_state = "captain" desc = "It's good being the king." - item_state = "caphat" + icon_state = "captain_hat" + item_state = "captain_hat" armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) strip_delay = 60 dog_fashion = /datum/dog_fashion/head/captain - sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') -//Captain: no longer space-worthy + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/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 = "capcap" - dog_fashion = /datum/dog_fashion/head/captain + icon_state = "captain_cap" + +/obj/item/clothing/head/caphat/beret + name = "captain's beret" + desc = "For Captains that are more inclined towards style." + icon_state = "captain_beret" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi', + ) + +/obj/item/clothing/head/caphat/beret/white + name = "captain's white beret" + desc = "For Captains that are more inclined towards style, and for the color white." + icon_state = "captain_beret_white" //Head of Personnel /obj/item/clothing/head/hopcap diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index ee91ff98d6e..117c956af0e 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -155,21 +155,55 @@ desc = "A navy-blue armored jacket with blue shoulder designations and '/Warden/' stitched into one of the chest pockets." icon_state = "warden_jacket_alt" +//Captain /obj/item/clothing/suit/armor/vest/capcarapace name = "captain's carapace" desc = "An armored vest reinforced with ceramic plates and pauldrons to provide additional protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest, although it does chafe your nipples." - icon_state = "capcarapace" + icon_state = "captain_carapace" item_state = "armor" body_parts_covered = UPPER_TORSO|LOWER_TORSO armor = list(MELEE = 50, BULLET = 35, LASER = 50, ENERGY = 5, BOMB = 15, BIO = 0, RAD = 0, FIRE = INFINITY, ACID = 450) dog_fashion = null resistance_flags = FIRE_PROOF + allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/flash, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen) -/obj/item/clothing/suit/armor/vest/capcarapace/alt - name = "captain's parade jacket" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi', + ) + +/obj/item/clothing/suit/armor/vest/capcarapace/jacket + name = "captain's jacket" + desc = "A less formal jacket for everyday captain use." + icon_state = "captain_jacket" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + armor = list(MELEE = 40, BULLET = 20, LASER = 25, ENERGY = 5, BOMB = 15, BIO = 0, RAD = 0, FIRE = INFINITY, ACID = 450) + flags_inv = HIDEJUMPSUIT + +/obj/item/clothing/suit/armor/vest/capcarapace/jacket/tunic + name = "captain's tunic" + desc = "Worn by a Captain to show their class." + icon_state = "captain_tunic" + +/obj/item/clothing/suit/armor/vest/capcarapace/coat + name = "captain's formal coat" desc = "For when an armored vest isn't fashionable enough." - icon_state = "capformal" - item_state = "capspacesuit" + icon_state = "captain_formal" + armor = list(MELEE = 35, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 10, BIO = 0, RAD = 0, FIRE = INFINITY, ACID = 450) + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + +/obj/item/clothing/suit/armor/vest/capcarapace/coat/white + name = "captain's long white tunic" + desc = "An old style captain tunic. Makes you look and feel like you're wearing a cardboard box with arm holes cut in it but looks like it would be great for a wedding... or a funeral." + icon_state = "captain_white" + + sprite_sheets = list( //Drask look fine in the regular human version + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi', + ) /obj/item/clothing/suit/armor/riot name = "riot suit" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index c37eac2e5b2..c8b572ce522 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -29,32 +29,6 @@ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) -//Captain -/obj/item/clothing/suit/captunic - name = "captain's parade tunic" - desc = "Worn by a Captain to show their class." - icon_state = "captunic" - item_state = "bio_suit" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - flags_inv = HIDEJUMPSUIT - allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/flash, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen) - - sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' - ) - -/obj/item/clothing/suit/captunic/capjacket - name = "captain's uniform jacket" - desc = "A less formal jacket for everyday captain use." - icon_state = "capjacket" - item_state = "bio_suit" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - flags_inv = HIDEJUMPSUIT - - sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' - ) - /obj/item/clothing/suit/mantle/armor/captain name = "captain's cloak" desc = "An armor-plated piece of fashion for the ruling elite. Protect your upper half in style." diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index a08d535aeb0..0e05b0eeeda 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -14,6 +14,20 @@ item_state = "caparmor" item_color = "captain" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi', + "Drask" = 'icons/mob/clothing/species/drask/uniform.dmi', + "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/uniform.dmi', + ) + +/obj/item/clothing/under/rank/captain/parade + name = "captain's parade uniform" + desc = "A captain's luxury-wear, for special occasions." + icon_state = "captain_parade" + item_state = "by_suit" + item_color = "captain_parade" + /obj/item/clothing/under/rank/cargo name = "quartermaster's jumpsuit" desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper." diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index bafd3921d7d..fad65026baf 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -451,10 +451,16 @@ item_color = "dress_rd" /obj/item/clothing/under/dress/dress_cap - name = "captain's dress uniform" + name = "captain's dress" desc = "Feminine fashion for the style concious captain." - icon_state = "dress_cap" - item_color = "dress_cap" + icon_state = "captain_dress" + item_color = "captain_dress" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi', + "Drask" = 'icons/mob/clothing/species/drask/uniform.dmi', + "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/uniform.dmi', + ) /obj/item/clothing/under/dress/dress_hop name = "head of personal's dress uniform" @@ -531,13 +537,6 @@ item_color = "sundress" body_parts_covered = UPPER_TORSO|LOWER_TORSO -/obj/item/clothing/under/captainparade - name = "captain's parade uniform" - desc = "A captain's luxury-wear, for special occasions." - icon_state = "captain_parade" - item_state = "by_suit" - item_color = "captain_parade" - /obj/item/clothing/under/roman name = "roman armor" desc = "An ancient Roman armor. Made of metallic strips and leather straps." diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index 6744596fc77..462b4941067 100644 Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 48d9248efae..a931bb65af1 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/gloves.dmi b/icons/mob/clothing/species/drask/gloves.dmi index 7affe7fa5b7..89368b580e4 100644 Binary files a/icons/mob/clothing/species/drask/gloves.dmi and b/icons/mob/clothing/species/drask/gloves.dmi differ diff --git a/icons/mob/clothing/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi index ca15dea1cb4..6d83a331e82 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/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi index 2ed6682e946..5d1f4292220 100644 Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ diff --git a/icons/mob/clothing/species/drask/uniform.dmi b/icons/mob/clothing/species/drask/uniform.dmi index 625ec6b54dc..bbbba4a5085 100644 Binary files a/icons/mob/clothing/species/drask/uniform.dmi and b/icons/mob/clothing/species/drask/uniform.dmi differ diff --git a/icons/mob/clothing/species/grey/gloves.dmi b/icons/mob/clothing/species/grey/gloves.dmi index 3cd64e4a7ee..69be7165bc9 100644 Binary files a/icons/mob/clothing/species/grey/gloves.dmi and b/icons/mob/clothing/species/grey/gloves.dmi differ diff --git a/icons/mob/clothing/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi index 4f794a9f5d0..3ab756e62e8 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/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi index ad2089725e6..e7a87adabc1 100644 Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ diff --git a/icons/mob/clothing/species/grey/uniform.dmi b/icons/mob/clothing/species/grey/uniform.dmi index 38506f39a1d..ecf8bc15b29 100644 Binary files a/icons/mob/clothing/species/grey/uniform.dmi and b/icons/mob/clothing/species/grey/uniform.dmi differ diff --git a/icons/mob/clothing/species/kidan/gloves.dmi b/icons/mob/clothing/species/kidan/gloves.dmi index fa948608103..1f78e34d667 100644 Binary files a/icons/mob/clothing/species/kidan/gloves.dmi and b/icons/mob/clothing/species/kidan/gloves.dmi differ diff --git a/icons/mob/clothing/species/kidan/suit.dmi b/icons/mob/clothing/species/kidan/suit.dmi new file mode 100644 index 00000000000..c9c69a9c06f Binary files /dev/null and b/icons/mob/clothing/species/kidan/suit.dmi differ diff --git a/icons/mob/clothing/species/kidan/uniform.dmi b/icons/mob/clothing/species/kidan/uniform.dmi new file mode 100644 index 00000000000..f38a46a6bfe Binary files /dev/null and b/icons/mob/clothing/species/kidan/uniform.dmi differ diff --git a/icons/mob/clothing/species/vox/gloves.dmi b/icons/mob/clothing/species/vox/gloves.dmi index f3e54867985..6da188e1283 100644 Binary files a/icons/mob/clothing/species/vox/gloves.dmi and b/icons/mob/clothing/species/vox/gloves.dmi differ diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index 4f1417a3e52..13db7b1b5fe 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/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index aaf28dafd5d..45e36377dcf 100644 Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ diff --git a/icons/mob/clothing/species/vox/uniform.dmi b/icons/mob/clothing/species/vox/uniform.dmi index d37489e2dd8..37026f5b884 100644 Binary files a/icons/mob/clothing/species/vox/uniform.dmi and b/icons/mob/clothing/species/vox/uniform.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 91aa75a33e9..9c1d6042039 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi index 2967ad98ad9..5cb69049ceb 100644 Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi index 9c84a030aaf..c7b01cb0f0f 100644 Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 3c51ae974c2..360842911e0 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 3ea4e27933f..767c338e72b 100644 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 0f32e3bb400..958e2f780d3 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ