Skip to content

Commit

Permalink
Adds a version of the CO armor without pauldrons (#7143)
Browse files Browse the repository at this point in the history
# About the pull request

This is based on the old sprite, and is a stat-identical version of the
normal CO armor, minus the pauldrons.

Nessie is behind this, please refer criticism that way. (Unless it's the
code, that's on me)

# Explain why it's good for the game

More choices for drip baby!


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


![image](https://github.com/user-attachments/assets/dd9a32fe-c8fa-40f3-98a2-d98438e74b21)

Can only pick 1:

![image](https://github.com/user-attachments/assets/5640c65e-1b14-4809-8f4a-09ce823c25cc)

Worn:

![image](https://github.com/user-attachments/assets/9c4557b8-934a-4a28-bba8-877a4ffe7b07)


</details>


# Changelog
:cl:
add: COs have a new variant of their armor to choose from
/:cl:

---------

Co-authored-by: Blundir <[email protected]>
  • Loading branch information
TheGamerdk and Blundir authored Dec 16, 2024
1 parent d22aa71 commit 4983ac8
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,11 @@ GLOBAL_LIST_INIT(cm_vending_clothing_commanding_officer, list(
list("Commanding Officer Backpack", 0, /obj/item/storage/backpack/mcommander, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
list("Secure Satchel", 0, /obj/item/storage/backpack/satchel/lockable, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),

list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("ARMOR (CHOOSE 1)", 0, null, null, null),
list("Commanding Officer's M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/CO, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
list("Commanding Officer's M3 Armor (No Pauldrons)", 0, /obj/item/clothing/suit/storage/marine/MP/CO/no_pauldrons, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),

list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Commanding Officer's M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/CO, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
list("Commanding Officer's Gloves", 0, /obj/item/clothing/gloves/marine/techofficer/commander, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
Expand Down
5 changes: 5 additions & 0 deletions code/modules/clothing/suits/marine_armor/_marine_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,11 @@
valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_RANK, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_PONCHO)
black_market_value = 35

/obj/item/clothing/suit/storage/marine/MP/CO/no_pauldrons
icon_state = "co_light_officer"
item_state = "co_light_officer"
item_state_slots = list(WEAR_JACKET = "co_light_officer")


/obj/item/clothing/suit/storage/marine/MP/CO/jacket
name = "\improper M3 pattern commanding officer armored coat"
Expand Down
Binary file modified icons/mob/humans/onmob/clothing/suits/suits_by_faction/UA.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/suits/suits_by_faction/UA.dmi
Binary file not shown.

0 comments on commit 4983ac8

Please sign in to comment.