Skip to content

Commit

Permalink
new co sprites for formal uniform(s), the falcon jacket and a non-cou…
Browse files Browse the repository at this point in the history
…ncil one. and the uscm formal uniform (#8138)

# About the pull request
new co sprites for formal uniform(s), the falcon jacket and a
non-council one. and the uscm formal uniform
sprited by wei 
# Explain why it's good for the game

new sprites, requested by senator


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![image](https://github.com/user-attachments/assets/2a8f0256-8cb6-4c0d-8076-f72f9098538d)

</details>


# Changelog
:cl: sleepynecrons/esselnek
add: New turtleneck and formal uniforms, including a council jacket and
a plain jacket for the CO vendor.
imageadd: New sprites for the old formal black and white uniforms,
falcon jacket and a new plain jacket.
add: New uscm officer formal uniform sprite
imagedel: Removes old unused suprised that this pr replaces
/:cl:

---------

Co-authored-by: InsaneRed <[email protected]>
  • Loading branch information
Red-byte3D and InsaneRed authored Jan 20, 2025
1 parent 206afaf commit a70e62e
Show file tree
Hide file tree
Showing 19 changed files with 26 additions and 17 deletions.
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
30 changes: 17 additions & 13 deletions code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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."
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 not shown.
Binary file not shown.
Binary file not shown.
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.

0 comments on commit a70e62e

Please sign in to comment.