diff --git a/code/modules/clothing/suits/marine_coat.dm b/code/modules/clothing/suits/marine_coat.dm index d3127658a66e..1233ff9351d0 100644 --- a/code/modules/clothing/suits/marine_coat.dm +++ b/code/modules/clothing/suits/marine_coat.dm @@ -239,6 +239,11 @@ desc = "A Navy regulation dress blues coat for high-ranking officers. For those who wish for style and authority." icon_state = "co_suit" +/obj/item/clothing/suit/storage/jacket/marine/dress/officer/patchless + name = "commanding officer's jacket" + desc = "A patchless version of the officer jacket, its presence is still domineering" + icon_state = "co_plain" + /obj/item/clothing/suit/storage/jacket/marine/dress/officer/falcon name = "commanding officer falcon jacket" desc = "A refurbished jacket liner tailor made for a senior officer. This liner has become more of a proper piece of attire, with a new layer of fabric, wrist cuffs, front pockets, and a custom embroidered falcon on the back. This jacket will keep its wearer warm no matter the circumstance, from a cool Sunday drive to chilly autumn's eve." diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 5a8c53a4e8a3..4a16295155bf 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -261,8 +261,12 @@ desc = "The well-ironed utility uniform of a USCM officer. Even looking at it the wrong way could result in being court-martialed. It has shards of light Kevlar to help protect against stabbing weapons and bullets." icon_state = "CO_jumpsuit" worn_state = "CO_jumpsuit" + icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi' + item_icons = list( + WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi' + ) specialty = "USCM officer" - flags_atom = FPRINT + flags_atom = FPRINT && NO_GAMEMODE_SKIN /obj/item/clothing/under/marine/officer/general name = "general uniform" @@ -352,22 +356,22 @@ worn_state = "CO_service" flags_atom = NO_GAMEMODE_SKIN -/obj/item/clothing/under/marine/officer/formal/white - name = "Commanding Officer's white formal uniform" - desc = "A well-ironed USCM officer uniform in brilliant white with gold accents, intended for parades or hot weather. Wear this with pride." - icon_state = "CO_formal_white" - worn_state = "CO_formal_white" - specialty = "captain's white formal" - flags_atom = NO_GAMEMODE_SKIN - -/obj/item/clothing/under/marine/officer/formal/black +/obj/item/clothing/under/marine/officer/formal/gray name = "Commanding Officer's gray formal uniform" - desc = "A well-ironed USCM officer uniform in subdued gray with gold accents, intended for more formal or somber events. Wear this with pride." - icon_state = "CO_formal_black" - worn_state = "CO_formal_black" + desc = "A well-ironed USCM officer uniform intended for parades or hot weather. Wear this with pride." + icon_state = "co_gray" + worn_state = "co_gray" specialty = "captain's gray formal" flags_atom = NO_GAMEMODE_SKIN +/obj/item/clothing/under/marine/officer/formal/turtleneck + name = "Commanding Officer's turtleneck uniform" + desc = "A well-ironed USCM officer uniform intended for more formal or somber events. Wear this with pride." + icon_state = "co_turtleneck" + worn_state = "co_turtleneck" + specialty = "captain's turtleneck" + flags_atom = NO_GAMEMODE_SKIN + /obj/item/clothing/under/marine/dress name = "marine formal service uniform" desc = "A formal service uniform typically worn by marines of the USCM. Still practicable while still being more formal than the standard service uniform." diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm index 87aa7ea9967f..95bccd29aa93 100644 --- a/code/modules/gear_presets/uscm_event.dm +++ b/code/modules/gear_presets/uscm_event.dm @@ -26,7 +26,7 @@ utility_hat = list(/obj/item/clothing/head/cmcap,/obj/item/clothing/head/beret/cm/tan) utility_extra = list(/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/glasses/sunglasses/big,/obj/item/clothing/glasses/sunglasses/aviator,/obj/item/clothing/glasses/mbcg) - service_under = list(/obj/item/clothing/under/marine/officer/formal/white, /obj/item/clothing/under/marine/officer/formal/black) + service_under = list(/obj/item/clothing/under/marine/officer/formal/gray, /obj/item/clothing/under/marine/officer/formal/turtleneck) service_shoes = list(/obj/item/clothing/shoes/dress/commander) service_extra = list(/obj/item/clothing/suit/storage/jacket/marine/dress/officer/bomber) service_hat = list(/obj/item/clothing/head/beret/cm, /obj/item/clothing/head/beret/marine/commander/dress, /obj/item/clothing/head/beret/marine/commander/black) diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index c4bbef01c11a..f3d563363754 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -375,9 +375,9 @@ utility_hat = list(/obj/item/clothing/head/cmcap, /obj/item/clothing/head/beret/cm/tan) utility_extra = list(/obj/item/clothing/glasses/sunglasses, /obj/item/clothing/glasses/sunglasses/big, /obj/item/clothing/glasses/sunglasses/aviator, /obj/item/clothing/glasses/mbcg) - service_under = list(/obj/item/clothing/under/marine/officer/formal/white, /obj/item/clothing/under/marine/officer/formal/black) + service_under = list(/obj/item/clothing/under/marine/officer/formal/gray, /obj/item/clothing/under/marine/officer/formal/turtleneck) service_shoes = list(/obj/item/clothing/shoes/dress/commander) - service_extra = list(/obj/item/clothing/suit/storage/jacket/marine/dress/officer/bomber) + service_extra = list(/obj/item/clothing/suit/storage/jacket/marine/dress/officer/bomber, /obj/item/clothing/suit/storage/jacket/marine/dress/officer/patchless) service_hat = list(/obj/item/clothing/head/beret/cm, /obj/item/clothing/head/beret/marine/commander/dress, /obj/item/clothing/head/beret/marine/commander/black, /obj/item/clothing/head/marine/peaked/service) dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) diff --git a/code/modules/gear_presets/wo.dm b/code/modules/gear_presets/wo.dm index f3bb5d81ebf2..332230a83e34 100644 --- a/code/modules/gear_presets/wo.dm +++ b/code/modules/gear_presets/wo.dm @@ -29,7 +29,7 @@ utility_hat = list(/obj/item/clothing/head/cmcap,/obj/item/clothing/head/beret/cm/tan) utility_extra = list(/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/glasses/sunglasses/big,/obj/item/clothing/glasses/sunglasses/aviator,/obj/item/clothing/glasses/mbcg) - service_under = list(/obj/item/clothing/under/marine/officer/formal/white, /obj/item/clothing/under/marine/officer/formal/black) + service_under = list(/obj/item/clothing/under/marine/officer/formal/gray, /obj/item/clothing/under/marine/officer/formal/turtleneck) service_shoes = list(/obj/item/clothing/shoes/dress/commander) service_extra = list(/obj/item/clothing/suit/storage/jacket/marine/dress/officer/bomber) service_hat = list(/obj/item/clothing/head/beret/cm, /obj/item/clothing/head/beret/marine/commander/dress, /obj/item/clothing/head/beret/marine/commander/black) diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi index ade620f9a37f..5d5f6bfd52ff 100644 Binary files a/icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi and b/icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi differ diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi index 2ee636a81000..282312ebffb5 100644 Binary files a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi differ diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/classic.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/classic.dmi index a41a278d7bf7..d95342512b29 100644 Binary files a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/classic.dmi and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/classic.dmi differ diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/desert.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/desert.dmi index fdbc29b6cf80..669fd5293187 100644 Binary files a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/desert.dmi and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/desert.dmi differ diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/jungle.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/jungle.dmi index e7f2947af283..3b2566e082f6 100644 Binary files a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/jungle.dmi and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/jungle.dmi differ diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/snow.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/snow.dmi index f2e56b448a39..6dcfa909ea70 100644 Binary files a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/snow.dmi and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/snow.dmi differ diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/urban.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/urban.dmi index 7b4cd5c0a197..b741839f963b 100644 Binary files a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/urban.dmi and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/urban.dmi differ diff --git a/icons/obj/items/clothing/suits/suits_by_faction/UA.dmi b/icons/obj/items/clothing/suits/suits_by_faction/UA.dmi index c2b7e53746d4..551c1826575e 100644 Binary files a/icons/obj/items/clothing/suits/suits_by_faction/UA.dmi and b/icons/obj/items/clothing/suits/suits_by_faction/UA.dmi differ diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi index 02388ae8df62..b1977893ef06 100644 Binary files a/icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi and b/icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi differ diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_map/classic.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_map/classic.dmi index 5135a648011e..a62bee9a4a76 100644 Binary files a/icons/obj/items/clothing/uniforms/uniforms_by_map/classic.dmi and b/icons/obj/items/clothing/uniforms/uniforms_by_map/classic.dmi differ diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_map/desert.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_map/desert.dmi index 09faea53e50d..071a6d58f04f 100644 Binary files a/icons/obj/items/clothing/uniforms/uniforms_by_map/desert.dmi and b/icons/obj/items/clothing/uniforms/uniforms_by_map/desert.dmi differ diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_map/jungle.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_map/jungle.dmi index 063d69a6d938..a60f99fc7c17 100644 Binary files a/icons/obj/items/clothing/uniforms/uniforms_by_map/jungle.dmi and b/icons/obj/items/clothing/uniforms/uniforms_by_map/jungle.dmi differ diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_map/snow.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_map/snow.dmi index 079a282a87cd..29672fe25431 100644 Binary files a/icons/obj/items/clothing/uniforms/uniforms_by_map/snow.dmi and b/icons/obj/items/clothing/uniforms/uniforms_by_map/snow.dmi differ diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_map/urban.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_map/urban.dmi index 3a6dae1d14b9..ba18263c9e5f 100644 Binary files a/icons/obj/items/clothing/uniforms/uniforms_by_map/urban.dmi and b/icons/obj/items/clothing/uniforms/uniforms_by_map/urban.dmi differ