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

balance: change IO armor to be based off light armor with extra storage and slight buff on light. #4216

Closed
wants to merge 2 commits into from
Closed

balance: change IO armor to be based off light armor with extra storage and slight buff on light. #4216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de66f75
modify the IO armor to be a subset of light armor
Aug 20, 2023
b4bde57
gthrt
Aug 20, 2023
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
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/intelligence_officer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_intelligence_officer, list(
list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),

list("ARMOR (CHOOSE 1)", 0, null, null, null),
list("XM4 Pattern Intel Armor", 0, /obj/item/clothing/suit/storage/marine/rto/intel, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
list("XM4 Pattern Intel Armor", 0, /obj/item/clothing/suit/storage/marine/light/intel, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
list("Service Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),

list("BACKPACK (CHOOSE 1)", 0, null, null, null),
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ GLOBAL_LIST_EMPTY(co_secure_boxes)
new /obj/item/clothing/shoes/marine(src)
new /obj/item/storage/belt/gun/m4a3(src)
new /obj/item/storage/backpack/marine/satchel/intel(src)
new /obj/item/clothing/suit/storage/marine/rto/intel(src)
new /obj/item/clothing/suit/storage/marine/light/intel(src)
new /obj/item/storage/pouch/document(src)
new /obj/item/storage/pouch/document(src)
new /obj/item/device/motiondetector/intel(src)
Expand Down
5 changes: 4 additions & 1 deletion code/modules/clothing/suits/marine_armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,12 @@
brightness_on = 7 //slightly higher
specialty = "M4 pattern marine"

/obj/item/clothing/suit/storage/marine/rto/intel
/obj/item/clothing/suit/storage/marine/light/intel
name = "\improper XM4 pattern intelligence officer armor"
desc = "A well tinkered and crafted hybrid of an M3-L pattern light armor modified to have more storage"
uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/qm_suit, /obj/item/clothing/under/marine/officer/intel)
storage_slots = 4
brightness_on = 7 //slightly higher
specialty = "XM4 pattern intel"

/obj/item/clothing/suit/storage/marine/MP
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/uscm.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/rto/intel(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/rto/intel(src), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/intel(src), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(src), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/intel(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE)
Expand Down