Skip to content

Commit

Permalink
Merge branch 'customizablearmor' of https://github.com/Max-023/PvE-CM…
Browse files Browse the repository at this point in the history 
…SS13 into customizablearmor
  • Loading branch information
Max-023 committed Sep 4, 2024
2 parents f784dab + 2c675e8 commit 819b354
Show file tree
Hide file tree
Showing 17 changed files with 528 additions and 106 deletions.
5 changes: 5 additions & 0 deletions code/__DEFINES/equipment.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,13 @@ GLOBAL_LIST_INIT(slot_to_contained_sprite_shorthand, list(
#define ACCESSORY_SLOT_ARMBAND "Armband"
#define ACCESSORY_SLOT_RANK "Rank"
#define ACCESSORY_SLOT_DECOR "Decor"
#define ACCESSORY_SLOT_DECORARMOR "Decor Armor"
#define ACCESSORY_SLOT_MEDAL "Medal"
#define ACCESSORY_SLOT_PONCHO "Ponchos"
#define ACCESSORY_SLOT_HOLSTER "Holster"
#define ACCESSORY_SLOT_SGPAINT "SG Paint"
#define ACCESSORY_SLOT_PAINT "Paint"
#define ACCESSORY_SLOT_M3UTILITY "M3 Utility"

/// Used for uniform armor inserts.
#define ACCESSORY_SLOT_ARMOR_C "Chest armor"
Expand Down
2 changes: 1 addition & 1 deletion code/_globalvars/global_lists.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ GLOBAL_REFERENCE_LIST_INDEXED(yautja_hair_styles_list, /datum/sprite_accessory/y
//Backpacks
var/global/list/backbaglist = list("Backpack", "Satchel")
//Armor styles
GLOBAL_LIST_INIT(armor_style_list, list("Padded" = 1, "Padless" = 2, "Ridged" = 3, "Carrier" = 4, "Skull" = 5, "Smooth" = 6, "Random"))
GLOBAL_LIST_INIT(armor_style_list, list("Standard" = 1, "Ridged" = 2, "Smooth" = 3, "Random"))

// var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg)
var/global/round_should_check_for_win = TRUE
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/crew/sea.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_sea, list(
list("COMBAT ARMOR (CHOOSE 1)", 0, null, null, null),
list("M3-VL Pattern Ballistics Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
list("M3-L Pattern Light Armor", 0, /obj/item/clothing/suit/storage/marine/light, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),
list("M3 Pattern Padded Armor", 0, /obj/item/clothing/suit/storage/marine/padded, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
list("M3 Pattern Marine Armor", 0, /obj/item/clothing/suit/storage/marine, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
list("Bulletproof Vest", 0, /obj/item/clothing/suit/armor/bulletproof, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
list("USCM Service Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),

Expand Down
5 changes: 1 addition & 4 deletions code/game/machinery/vending/vendor_types/requisitions.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,11 +399,8 @@
list("M10 Pattern Marine Helmet", 20, /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR),
list("M10 Pattern Technician Helmet", 20, /obj/item/clothing/head/helmet/marine/tech, VENDOR_ITEM_REGULAR),
list("M10 Pattern Corpman Helmet", 20, /obj/item/clothing/head/helmet/marine/medic, VENDOR_ITEM_REGULAR),
list("M3 Pattern Carrier Marine Armor", 20, /obj/item/clothing/suit/storage/marine/carrier, VENDOR_ITEM_REGULAR),
list("M3 Pattern Padded Marine Armor", 20, /obj/item/clothing/suit/storage/marine/padded, VENDOR_ITEM_REGULAR),
list("M3 Pattern Padless Marine Armor", 20, /obj/item/clothing/suit/storage/marine/padless, VENDOR_ITEM_REGULAR),
list("M3 Pattern Marine Armor", 20, /obj/item/clothing/suit/storage/marine, VENDOR_ITEM_REGULAR),
list("M3 Pattern Ridged Marine Armor", 20, /obj/item/clothing/suit/storage/marine/padless_lines, VENDOR_ITEM_REGULAR),
list("M3 Pattern Skull Marine Armor", 20, /obj/item/clothing/suit/storage/marine/skull, VENDOR_ITEM_REGULAR),
list("M3-EOD Pattern Heavy Armor", 10, /obj/item/clothing/suit/storage/marine/heavy, VENDOR_ITEM_REGULAR),
list("M3-L Pattern Light Armor", 10, /obj/item/clothing/suit/storage/marine/light, VENDOR_ITEM_REGULAR),

Expand Down
43 changes: 19 additions & 24 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 @@ -77,21 +77,21 @@
list("Marine Radio Headset", round(scale * 15), /obj/item/device/radio/headset/almayer/marine, VENDOR_ITEM_REGULAR),

list("WEBBINGS", -1, null, null),
list("Brown Webbing Vest", round(scale * 1.25), /obj/item/clothing/accessory/storage/black_vest/brown_vest, VENDOR_ITEM_REGULAR),
list("Black Webbing Vest", round(max(1,(scale * 0.5))), /obj/item/clothing/accessory/storage/black_vest, VENDOR_ITEM_REGULAR),
list("Webbing", round(scale * 2), /obj/item/clothing/accessory/storage/webbing, VENDOR_ITEM_REGULAR),
list("M3 Pattern Webbing", round(scale * 2), /obj/item/clothing/accessory/storage/webbing/m3, VENDOR_ITEM_REGULAR),
list("M3 Pattern Magazine Webbing", round(scale * 2), /obj/item/clothing/accessory/storage/webbing/m3, VENDOR_ITEM_REGULAR),
list("M3 Pattern Shotgun Shell Webbing", round(scale * 0.5), /obj/item/clothing/accessory/storage/webbing/m3/shotgun, VENDOR_ITEM_REGULAR),
list("M3 Pattern M40 Webbing", round(scale * 1.25), /obj/item/clothing/accessory/storage/black_vest/m3/m40, VENDOR_ITEM_REGULAR),
list("M3 Pattern Small Pouch Webbing", round(scale * 0.5), /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("Shoulder Holster", round(max(1,(scale * 0.5))), /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR),

list("ARMOR", -1, null, null),
list("M3 Pattern Carrier Marine Armor", round(scale * 15), /obj/item/clothing/suit/storage/marine/carrier, VENDOR_ITEM_REGULAR),
list("M3 Pattern Padded Marine Armor", round(scale * 15), /obj/item/clothing/suit/storage/marine/padded, VENDOR_ITEM_REGULAR),
list("M3 Pattern Padless Marine Armor", round(scale * 15), /obj/item/clothing/suit/storage/marine/padless, VENDOR_ITEM_REGULAR),
list("M3 Pattern Ridged Marine Armor", round(scale * 15), /obj/item/clothing/suit/storage/marine/padless_lines, VENDOR_ITEM_REGULAR),
list("M3 Pattern Skull Marine Armor", round(scale * 15), /obj/item/clothing/suit/storage/marine/skull, VENDOR_ITEM_REGULAR),
list("M3 Pattern Smooth Marine Armor", round(scale * 15), /obj/item/clothing/suit/storage/marine/smooth, VENDOR_ITEM_REGULAR),
list("M3-EOD Pattern Heavy Armor", round(scale * 10), /obj/item/clothing/suit/storage/marine/heavy, VENDOR_ITEM_REGULAR),
list("M3-L Pattern Light Armor", round(scale * 10), /obj/item/clothing/suit/storage/marine/light, VENDOR_ITEM_REGULAR),
list("M3 Pattern Marine Armor", round(scale * 15), /obj/item/clothing/suit/marine, VENDOR_ITEM_REGULAR),
list("M3 Pattern Ridged Marine Armor", round(scale * 15), /obj/item/clothing/suit/marine/padless_lines, VENDOR_ITEM_REGULAR),
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 Shoulder Pads", round(scale * 15), /obj/item/clothing/accessory/pads, VENDOR_ITEM_REGULAR),

list("BACKPACK", -1, null, null, null),
list("Lightweight IMP Backpack", round(scale * 15), /obj/item/storage/backpack/marine, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -242,15 +242,18 @@
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("Brown Webbing Vest", round(scale * 1.25), /obj/item/clothing/accessory/storage/black_vest/brown_vest, VENDOR_ITEM_REGULAR),
list("Black Webbing Vest", round(max(1,(scale * 0.5))), /obj/item/clothing/accessory/storage/black_vest, VENDOR_ITEM_REGULAR),
list("Webbing", round(scale * 2), /obj/item/clothing/accessory/storage/webbing, VENDOR_ITEM_REGULAR),
list("M3 Pattern Webbing", round(scale * 2), /obj/item/clothing/accessory/storage/webbing/m3, VENDOR_ITEM_REGULAR),
list("M3 Pattern Magazine Webbing", round(scale * 2), /obj/item/clothing/accessory/storage/webbing/m3, VENDOR_ITEM_REGULAR),
list("M3 Pattern Shotgun Shell Webbing", round(scale * 0.5), /obj/item/clothing/accessory/storage/webbing/m3/shotgun, VENDOR_ITEM_REGULAR),
list("M3 Pattern M40 Webbing", round(scale * 1.25), /obj/item/clothing/accessory/storage/black_vest/m3/m40, VENDOR_ITEM_REGULAR),
list("M3 Pattern Small Pouch Webbing", round(scale * 0.5), /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("Shoulder Holster", round(max(1,(scale * 0.5))), /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR),

list("ARMOR", -1, null, null),
list("M3-R Pattern Recon Armor", round(scale * 10), /obj/item/clothing/suit/storage/marine/rto/forecon, VENDOR_ITEM_REGULAR),
list("M3-L Pattern Light Armor", round(scale * 10), /obj/item/clothing/suit/storage/marine/light/standard, VENDOR_ITEM_REGULAR),
list("M3-R Pattern Recon Armor", round(scale * 10), /obj/item/clothing/suit/marine/rto/forecon, VENDOR_ITEM_REGULAR),
list("M3-L Pattern Light Armor", round(scale * 10), /obj/item/clothing/suit/marine/light/standard, VENDOR_ITEM_REGULAR),
list("M3 Shoulder Pads", round(scale * 10), /obj/item/clothing/accessory/pads, VENDOR_ITEM_REGULAR),

list("BACKPACK", -1, null, null, null),
list("Lightweight IMP Backpack", round(scale * 15), /obj/item/storage/backpack/marine/standard, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -634,20 +637,12 @@
//------------ESSENTIAL SETS---------------
/obj/effect/essentials_set/random/uscm_light_armor
spawned_gear_list = list(
/obj/item/clothing/suit/storage/marine/light/padded,
/obj/item/clothing/suit/storage/marine/light/padless,
/obj/item/clothing/suit/storage/marine/light/padless_lines,
/obj/item/clothing/suit/storage/marine/light/carrier,
/obj/item/clothing/suit/storage/marine/light/skull,
/obj/item/clothing/suit/storage/marine/light/smooth,
)

/obj/effect/essentials_set/random/uscm_heavy_armor
spawned_gear_list = list(
/obj/item/clothing/suit/storage/marine/heavy/padded,
/obj/item/clothing/suit/storage/marine/heavy/padless,
/obj/item/clothing/suit/storage/marine/heavy/padless_lines,
/obj/item/clothing/suit/storage/marine/heavy/carrier,
/obj/item/clothing/suit/storage/marine/heavy/skull,
/obj/item/clothing/suit/storage/marine/heavy/smooth,
)
5 changes: 1 addition & 4 deletions code/game/machinery/vending/vendor_types/wo_vendors.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,8 @@

list("ARMOR", -1, null, null),
list("M10 Pattern Marine Helmet", 20, /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR),
list("M3 Pattern Carrier Marine Armor", 20, /obj/item/clothing/suit/storage/marine/carrier, VENDOR_ITEM_REGULAR),
list("M3 Pattern Padded Marine Armor", 20, /obj/item/clothing/suit/storage/marine/padded, VENDOR_ITEM_REGULAR),
list("M3 Pattern Padless Marine Armor", 20, /obj/item/clothing/suit/storage/marine/padless, VENDOR_ITEM_REGULAR),
list("M3 Pattern Marine Armor", 20, /obj/item/clothing/suit/storage/marine, VENDOR_ITEM_REGULAR),
list("M3 Pattern Ridged Marine Armor", 20, /obj/item/clothing/suit/storage/marine/padless_lines, VENDOR_ITEM_REGULAR),
list("M3 Pattern Skull Marine Armor", 20, /obj/item/clothing/suit/storage/marine/skull, VENDOR_ITEM_REGULAR),
list("M3 Pattern Smooth Marine Armor", 20, /obj/item/clothing/suit/storage/marine/smooth, VENDOR_ITEM_REGULAR),
list("M3-EOD Pattern Heavy Armor", 10, /obj/item/clothing/suit/storage/marine/heavy, VENDOR_ITEM_REGULAR),
list("M3-L Pattern Light Armor", 10, /obj/item/clothing/suit/storage/marine/light, VENDOR_ITEM_REGULAR),
Expand Down
10 changes: 10 additions & 0 deletions code/modules/client/preferences_gear.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1151,3 +1151,13 @@ var/global/list/gear_datums_by_name = list()
display_name = "Marine Service Jacket"
path = /obj/item/clothing/suit/storage/jacket/marine/service
cost = 3

/datum/gear/misc/paint_sg
display_name = "Black Smartgun Harness Paint"
path = /obj/item/clothing/accessory/paint
cost = 0

/datum/gear/misc/paint_skull
display_name = "M3 Pattern Skull Paint"
path = /obj/item/clothing/accessory/paint/skull
cost = 0
Loading

0 comments on commit 819b354

Please sign in to comment.