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.

Sign up for GitHub

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

Jump to bottom

Adds a version of the CO armor without pauldrons #7143

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+9 −1
Open

Adds a version of the CO armor without pauldrons #7143

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c53b625
e
TheGamerdk Aug 23, 2024
796cdec
le changes
TheGamerdk Sep 10, 2024
c43b121
Update commanding_officer.dm
TheGamerdk Sep 10, 2024
d879cce
Update commanding_officer.dm
TheGamerdk Sep 10, 2024
560e0c8
updated
TheGamerdk Sep 10, 2024
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: 4 additions & 1 deletion code/game/machinery/vending/vendor_types/crew/commanding_officer.dm
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,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/suit_1.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/clothing/cm_suits.dmi
View file
Open in desktop
Binary file not shown.
Loading