Skip to content

Commit

Permalink
Bracers, Webbing Fixes, Etc
Browse files Browse the repository at this point in the history
  • Loading branch information
Max-023 committed Sep 16, 2024
1 parent 678b370 commit f1b49ae
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 16 deletions.
2 changes: 2 additions & 0 deletions code/__DEFINES/equipment.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,8 @@ GLOBAL_LIST_INIT(slot_to_contained_sprite_shorthand, list(
#define ACCESSORY_SLOT_RANK "Rank"
#define ACCESSORY_SLOT_DECOR "Decor"
#define ACCESSORY_SLOT_DECORARMOR "Decor Armor"
#define ACCESSORY_SLOT_DECORBRACER "Decor Bracer"
#define ACCESSORY_SLOT_DECORNECK "Decor Neck"
#define ACCESSORY_SLOT_MEDAL "Medal"
#define ACCESSORY_SLOT_PONCHO "Ponchos"
#define ACCESSORY_SLOT_HOLSTER "Holster"
Expand Down
8 changes: 5 additions & 3 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,12 @@ GLOBAL_LIST_INIT(cm_vending_clothing_medic, list(
list("Vial Pouch (Full)", 0, /obj/item/storage/pouch/vials/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),

list("ACCESSORIES (CHOOSE 1)", 0, null, null, null),
list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("M3 Pattern Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m3, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("M3 Pattern Magazine Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m3/mag, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("M3 Pattern Shotgun Shell Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m3/shotgun, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("M3 Pattern M40 Webbing", 0, /obj/item/clothing/accessory/storage/black_vest/m3/m40, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("M3 Pattern Small Pouch Webbing", 0, /obj/item/clothing/accessory/storage/black_vest/m3, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
))

Expand Down
24 changes: 13 additions & 11 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,12 @@
list("M10 Pattern Marine Helmet", floor(scale * 15), /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR),

list("WEBBINGS", -1, null, null),
list("M3 Pattern Webbing", 0.75, /obj/item/clothing/accessory/storage/webbing/m3, VENDOR_ITEM_REGULAR),
list("M3 Pattern Magazine Webbing", 0.75, /obj/item/clothing/accessory/storage/webbing/m3, VENDOR_ITEM_REGULAR),
list("M3 Pattern Shotgun Shell Webbing", 0.75, /obj/item/clothing/accessory/storage/webbing/m3/shotgun, VENDOR_ITEM_REGULAR),
list("M3 Pattern Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3, VENDOR_ITEM_REGULAR),
list("M3 Pattern Magazine Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3/mag, VENDOR_ITEM_REGULAR),
list("M3 Pattern Shotgun Shell Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3/shotgun, VENDOR_ITEM_REGULAR),
list("M3 Pattern M40 Webbing", 0.75, /obj/item/clothing/accessory/storage/black_vest/m3/m40, VENDOR_ITEM_REGULAR),
list("M3 Pattern Small Pouch Webbing", 0.75, /obj/item/clothing/accessory/storage/black_vest/m3, VENDOR_ITEM_REGULAR),
list("Drop Pouch", round(max(1,(scale * 0.5))), /obj/item/clothing/accessory/storage/droppouch, VENDOR_ITEM_REGULAR),
list("M3 Pattern Small Pouch Webbing", 2, /obj/item/clothing/accessory/storage/black_vest/m3, VENDOR_ITEM_REGULAR),
list("Drop Pouch", 3, /obj/item/clothing/accessory/storage/droppouch, VENDOR_ITEM_REGULAR),
list("Shoulder Holster", round(max(1,(scale * 0.5))), /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR),

list("ARMOR", -1, null, null),
Expand All @@ -123,6 +123,8 @@
list("M3 Pattern Smooth Marine Armor", round(scale * 15), /obj/item/clothing/suit/marine/smooth, VENDOR_ITEM_REGULAR),
list("M3-EOD Pattern Heavy Armor", round(scale * 10), /obj/item/clothing/suit/marine/heavy, VENDOR_ITEM_REGULAR),
list("M3-L Pattern Light Armor", round(scale * 10), /obj/item/clothing/suit/marine/light, VENDOR_ITEM_REGULAR),
list("M3 Pattern Neck Brace", round(scale * 10), /obj/item/clothing/accessory/pads/bracers, VENDOR_ITEM_REGULAR),
list("M3 Pattern Arm Bracers", round(scale * 15), /obj/item/clothing/accessory/pads/neckguard, VENDOR_ITEM_REGULAR),

list("BACKPACK", -1, null, null, null),
list("Lightweight IMP Backpack", floor(scale * 15), /obj/item/storage/backpack/marine, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -273,12 +275,12 @@
list("Marine Radio Headset", round(scale * 15), /obj/item/device/radio/headset/almayer/sof/survivor_forecon, VENDOR_ITEM_REGULAR),

list("WEBBINGS", -1, null, null),
list("M3 Pattern Webbing", 0.75, /obj/item/clothing/accessory/storage/webbing/m3, VENDOR_ITEM_REGULAR),
list("M3 Pattern Magazine Webbing", 0.75, /obj/item/clothing/accessory/storage/webbing/m3, VENDOR_ITEM_REGULAR),
list("M3 Pattern Shotgun Shell Webbing", 0.75, /obj/item/clothing/accessory/storage/webbing/m3/shotgun, VENDOR_ITEM_REGULAR),
list("M3 Pattern M40 Webbing", 0.75, /obj/item/clothing/accessory/storage/black_vest/m3/m40, VENDOR_ITEM_REGULAR),
list("M3 Pattern Small Pouch Webbing", 0.75, /obj/item/clothing/accessory/storage/black_vest/m3, VENDOR_ITEM_REGULAR),
list("Drop Pouch", round(max(1,(scale * 0.5))), /obj/item/clothing/accessory/storage/droppouch, VENDOR_ITEM_REGULAR),
list("M3 Pattern Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3, VENDOR_ITEM_REGULAR),
list("M3 Pattern Magazine Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3/mag, VENDOR_ITEM_REGULAR),
list("M3 Pattern Shotgun Shell Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3/shotgun, VENDOR_ITEM_REGULAR),
list("M3 Pattern M40 Webbing", 2, /obj/item/clothing/accessory/storage/black_vest/m3/m40, VENDOR_ITEM_REGULAR),
list("M3 Pattern Small Pouch Webbing", 2, /obj/item/clothing/accessory/storage/black_vest/m3, VENDOR_ITEM_REGULAR),
list("Drop Pouch", 2, /obj/item/clothing/accessory/storage/droppouch, VENDOR_ITEM_REGULAR),
list("Shoulder Holster", round(max(1,(scale * 0.5))), /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR),

list("ARMOR", -1, null, null),
Expand Down
6 changes: 4 additions & 2 deletions code/modules/clothing/suits/marine_armor/_marine_armor.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -583,8 +583,8 @@
/obj/item/device/walkman,
/obj/item/storage/belt/gun/m39,
)
valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_DECORARMOR, ACCESSORY_SLOT_PAINT, ACCESSORY_SLOT_M3UTILITY, ACCESSORY_SLOT_PONCHO)
restricted_accessory_slots = list(ACCESSORY_SLOT_DECORARMOR, ACCESSORY_SLOT_M3UTILITY, ACCESSORY_SLOT_PAINT)
valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_DECORARMOR, ACCESSORY_SLOT_DECORBRACER, ACCESSORY_SLOT_DECORNECK, ACCESSORY_SLOT_PAINT, ACCESSORY_SLOT_M3UTILITY, ACCESSORY_SLOT_PONCHO)
restricted_accessory_slots = list(ACCESSORY_SLOT_DECORARMOR, ACCESSORY_SLOT_DECORBRACER, ACCESSORY_SLOT_DECORNECK, ACCESSORY_SLOT_M3UTILITY, ACCESSORY_SLOT_PAINT)

light_power = 3
light_range = 4
Expand Down Expand Up @@ -759,6 +759,8 @@
armor_bio = CLOTHING_ARMOR_MEDIUMLOW
armor_rad = CLOTHING_ARMOR_MEDIUMHIGH
armor_internaldamage = CLOTHING_ARMOR_LOW
valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_DECORARMOR, ACCESSORY_SLOT_DECORBRACER, ACCESSORY_SLOT_PAINT, ACCESSORY_SLOT_M3UTILITY, ACCESSORY_SLOT_PONCHO)
restricted_accessory_slots = list(ACCESSORY_SLOT_DECORARMOR, ACCESSORY_SLOT_DECORBRACER, ACCESSORY_SLOT_M3UTILITY, ACCESSORY_SLOT_PAINT)

/obj/item/clothing/suit/marine/light/padless_lines
icon_state = "L2"
Expand Down
13 changes: 13 additions & 0 deletions code/modules/clothing/under/ties.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1097,6 +1097,19 @@
select_gamemode_skin(type)
update_icon()

/obj/item/clothing/accessory/pads/bracers
name = "\improper M3 Arm Bracers"
desc = "A set arm bracers worn in conjunction to the M3 armor set of the USCM."
icon_state = "bracers"
item_state = "bracers"
slot = ACCESSORY_SLOT_DECORBRACER

/obj/item/clothing/accessory/pads/neckguard
name = "\improper M3 Neck Guard"
desc = "An attachable neck guard option for the M3 armor set worn by the USCM."
icon_state = "neckguard"
item_state = "neckguard"
slot = ACCESSORY_SLOT_DECORNECK

/obj/item/clothing/accessory/paint/skull
name = "skull armor paint"
Expand Down
Binary file modified icons/mob/humans/onmob/suit_1.dmi
View file
Binary file not shown.
Binary file modified icons/mob/humans/onmob/ties.dmi
View file
Binary file not shown.
Binary file modified icons/obj/items/clothing/cm_suits.dmi
View file
Binary file not shown.
Binary file modified icons/obj/items/clothing/ties.dmi
View file
Binary file not shown.
Binary file modified icons/obj/items/clothing/ties_overlay.dmi
View file
Binary file not shown.

0 comments on commit f1b49ae

Please sign in to comment.