diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index 2538a3f91d..56db0c2273 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -310,8 +310,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_forecon_medic, 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("Light Armor", 0, /obj/item/clothing/suit/marine/light/standard, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), - list("M3-R Armor", 0, /obj/item/clothing/suit/storage/marine/rto/forecon, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED), + list("M3-R Armor", 0, /obj/item/clothing/suit/marine/rto/forecon, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED), list("BACKPACK (CHOOSE 1)", 0, null, null, null), list("Medical Backpack", 0, /obj/item/storage/backpack/marine/medic/standard, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), @@ -346,11 +345,12 @@ GLOBAL_LIST_INIT(cm_vending_clothing_forecon_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("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), + list("M3-R Pattern Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3/mag/recon, VENDOR_ITEM_REGULAR), + list("M3-R Pattern Shotgun Shell Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3/shotgun/recon, VENDOR_ITEM_REGULAR), + list("M3-R Pattern M40 Webbing", 2, /obj/item/clothing/accessory/storage/black_vest/m3/m40/recon, VENDOR_ITEM_REGULAR), + list("M3-R Pattern Corpsman Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3/recon/medic, 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), )) /obj/structure/machinery/cm_vending/clothing/medic/forecon diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index 314b431387..67a649133d 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -275,17 +275,14 @@ list("Marine Radio Headset", round(scale * 15), /obj/item/device/radio/headset/almayer/marine/solardevils/forecon, VENDOR_ITEM_REGULAR), list("WEBBINGS", -1, null, null), - 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("M3-R Pattern Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3/mag/recon, VENDOR_ITEM_REGULAR), + list("M3-R Pattern Shotgun Shell Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3/shotgun/recon, VENDOR_ITEM_REGULAR), + list("M3-R Pattern M40 Webbing", 2, /obj/item/clothing/accessory/storage/black_vest/m3/m40/recon, 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), - 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/marine/light/standard, VENDOR_ITEM_REGULAR), + list("M3-R Pattern Recon Armor", round(scale * 10), /obj/item/clothing/suit/storage/rto/forecon, 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), @@ -328,7 +325,6 @@ list("Prescription ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/prescription, VENDOR_ITEM_REGULAR), list("Marine RPG glasses", round(scale * 10), /obj/item/clothing/glasses/regular, VENDOR_ITEM_REGULAR), list("Firearm Lubricant", round(scale * 15), /obj/item/prop/helmetgarb/gunoil, VENDOR_ITEM_REGULAR), - list("USCM Flair", round(scale * 15), /obj/item/prop/helmetgarb/flair_uscm, VENDOR_ITEM_REGULAR), list("FORECON Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch/forecon, VENDOR_ITEM_REGULAR), list("USCM Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch, VENDOR_ITEM_REGULAR), list("Bedroll", round(scale * 20), /obj/item/roller/bedroll, VENDOR_ITEM_REGULAR), diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm index 6e8cb4c893..de7a247539 100644 --- a/code/modules/clothing/suits/marine_armor/_marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm @@ -813,7 +813,7 @@ /obj/item/clothing/suit/marine/rto/forecon name = "\improper M3-R pattern recon armor" desc = "A modified Colonial Marines M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. Issued exclusively to FORECON units." - icon_state = "forecon" + icon_state = "L1" flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE /obj/item/clothing/suit/marine/leader diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index 0eb239d0d8..2c99586766 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -569,11 +569,20 @@ /obj/item/ammo_magazine/rifle, ) +/obj/item/storage/internal/accessory/webbing/m3/mag/recon + storage_slots = 4 + /obj/item/storage/internal/accessory/black_vest/m3shotgun can_hold = list( /obj/item/ammo_magazine/handful, ) +/obj/item/storage/internal/accessory/black_vest/m3shotgun/recon + storage_slots = 7 + +/obj/item/storage/internal/accessory/black_vest/m3grenade/recon + storage_slots = 10 + /obj/item/clothing/accessory/storage/webbing name = "webbing" desc = "A sturdy mess of synthcotton belts and buckles, ready to share your burden." @@ -594,6 +603,16 @@ /obj/item/ammo_magazine/handful/shotgun, ) +/obj/item/storage/internal/accessory/black_vest/m3generic/recon + storage_slots = 6 + can_hold = list( + /obj/item/storage/surgical_case/regular, + /obj/item/reagent_container/blood, + /obj/item/tool/surgery/surgical_line, + /obj/item/tool/surgery/synthgraft, + /obj/item/device/healthanalyzer, + ) + /obj/item/storage/internal/accessory/black_vest/m3grenade storage_slots = 6 can_hold = list( @@ -1137,6 +1156,19 @@ item_state = "uaflag" slot = ACCESSORY_SLOT_PAINT +/obj/item/clothing/accessory/storage/webbing/m3 + name = "\improper M3 Pattern Webbing" + desc = "A sturdy mess of synthcotton belts and buckles, ready to share your burden." + icon_state = "m3webbing" + hold = /obj/item/storage/internal/accessory/webbing/m3/generic + slot = ACCESSORY_SLOT_M3UTILITY + +/obj/item/clothing/accessory/storage/webbing/m3/Initialize(mapload) + . = ..() + if(!(flags_atom & NO_SNOW_TYPE)) + select_gamemode_skin(type) + update_icon() + /obj/item/clothing/accessory/storage/webbing/m3/mag name = "\improper M3 Pattern Magazine Webbing" desc = "A sturdy mess of synthcotton belts and buckles, ready to share your burden." @@ -1149,14 +1181,14 @@ icon_state = "m3webbingshotgun" hold = /obj/item/storage/internal/accessory/black_vest/m3shotgun -/obj/item/clothing/accessory/storage/webbing/m3 - name = "\improper M3 Pattern Webbing" +/obj/item/clothing/accessory/storage/black_vest/m3 + name = "\improper M3 Pattern Small Pouch Webbing" desc = "A sturdy mess of synthcotton belts and buckles, ready to share your burden." - icon_state = "m3webbing" - hold = /obj/item/storage/internal/accessory/webbing/m3/generic + icon_state = "m3webbingsmall" + hold = /obj/item/storage/internal/accessory/black_vest/m3generic slot = ACCESSORY_SLOT_M3UTILITY -/obj/item/clothing/accessory/storage/webbing/m3/Initialize(mapload) +/obj/item/clothing/accessory/storage/black_vest/m3/Initialize(mapload) . = ..() if(!(flags_atom & NO_SNOW_TYPE)) select_gamemode_skin(type) @@ -1168,16 +1200,26 @@ icon_state = "m3webbingm40" hold = /obj/item/storage/internal/accessory/black_vest/m3grenade -/obj/item/clothing/accessory/storage/black_vest/m3 - name = "\improper M3 Pattern Small Pouch Webbing" +/obj/item/clothing/accessory/storage/webbing/m3/recon + name = "\improper M3 Pattern Magazine Webbing" desc = "A sturdy mess of synthcotton belts and buckles, ready to share your burden." - icon_state = "m3webbingsmall" - hold = /obj/item/storage/internal/accessory/black_vest/m3generic - slot = ACCESSORY_SLOT_M3UTILITY + icon_state = "m3rwebbingmag" + hold = /obj/item/storage/internal/accessory/webbing/m3/mag/recon -/obj/item/clothing/accessory/storage/black_vest/m3/Initialize(mapload) - . = ..() - if(!(flags_atom & NO_SNOW_TYPE)) - select_gamemode_skin(type) - update_icon() +/obj/item/clothing/accessory/storage/webbing/m3/recon/m40 + name = "\improper M3 Pattern Magazine Webbing" + desc = "A sturdy mess of synthcotton belts and buckles, ready to share your burden." + icon_state = "m3rwebbingmag" + hold = /obj/item/storage/internal/accessory/black_vest/m3grenade/recon + +/obj/item/clothing/accessory/storage/webbing/m3/recon/shotgun + name = "\improper M3 Pattern Magazine Webbing" + desc = "A sturdy mess of synthcotton belts and buckles, ready to share your burden." + icon_state = "m3rwebbingmag" + hold = /obj/item/storage/internal/accessory/black_vest/m3shotgun/recon +/obj/item/clothing/accessory/storage/webbing/m3/recon/medic + name = "\improper M3 Pattern Corpsman Webbing" + desc = "A sturdy mess of synthcotton belts and buckles, ready to share your burden." + icon_state = "m3rwebbingmedic" + hold = /obj/item/storage/internal/accessory/black_vest/m3generic/recon diff --git a/icons/mob/humans/onmob/ties.dmi b/icons/mob/humans/onmob/ties.dmi index 9ef7c4c6c6..f85a3cf98a 100644 Binary files a/icons/mob/humans/onmob/ties.dmi and b/icons/mob/humans/onmob/ties.dmi differ diff --git a/icons/obj/items/clothing/ties_overlay.dmi b/icons/obj/items/clothing/ties_overlay.dmi index ed1bfe023a..8f60f114b0 100644 Binary files a/icons/obj/items/clothing/ties_overlay.dmi and b/icons/obj/items/clothing/ties_overlay.dmi differ