Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new co sprites for formal uniform(s), the falcon jacket and a non-council one. and the uscm formal uniform #8138

Merged
merged 7 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions code/modules/clothing/suits/marine_coat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
24 changes: 12 additions & 12 deletions code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -352,22 +352,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."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/uscm_event.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/gear_presets/uscm_ship.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/wo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Binary file modified icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UA.dmi
Binary file not shown.
Binary file not shown.
Binary file modified icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/desert.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/jungle.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/snow.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/clothing/uniforms/uniforms_by_map/urban.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/suits/suits_by_faction/UA.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/uniforms/uniforms_by_faction/UA.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/uniforms/uniforms_by_map/classic.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/uniforms/uniforms_by_map/desert.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/uniforms/uniforms_by_map/jungle.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/uniforms/uniforms_by_map/snow.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/uniforms/uniforms_by_map/urban.dmi
Binary file not shown.
Loading