diff --git a/code/datums/supply_packs/clothing.dm b/code/datums/supply_packs/clothing.dm index 4f0d414a2655..6cea7cb47cc2 100644 --- a/code/datums/supply_packs/clothing.dm +++ b/code/datums/supply_packs/clothing.dm @@ -57,6 +57,19 @@ containername = "Webbing Crate" group = "Clothing" +/datum/supply_packs/webbing_large_black + name = "Black Webbing Crate (x4)" + contains = list( + /obj/item/clothing/accessory/storage/webbing/black, + /obj/item/clothing/accessory/storage/webbing/black, + /obj/item/clothing/accessory/storage/webbing/black, + /obj/item/clothing/accessory/storage/webbing/black, + ) + cost = 20 + containertype = /obj/structure/closet/crate/green + containername = "Black Webbing Crate" + group = "Clothing" + /datum/supply_packs/drop_pouches name = "Drop Pouch Crate (x4)" contains = list( diff --git a/code/datums/tutorial/marine/reqs_line.dm b/code/datums/tutorial/marine/reqs_line.dm index dc63706bf0ce..c5ec7dc5d04e 100644 --- a/code/datums/tutorial/marine/reqs_line.dm +++ b/code/datums/tutorial/marine/reqs_line.dm @@ -87,6 +87,7 @@ /obj/item/clothing/accessory/storage/black_vest = list("Black webbing", "Black webbing vest"), /obj/item/clothing/accessory/storage/black_vest/brown_vest = list("Brown webbing", "Brown webbing vest"), /obj/item/clothing/accessory/storage/webbing = list("Webbing", "Normal webbing", "Web"), + /obj/item/clothing/accessory/storage/webbing/black = list("Black Webbing", "Normal black webbing", "Blk Web"), /obj/item/clothing/accessory/storage/droppouch = list("Drop Pouch"), /obj/item/clothing/suit/storage/webbing = list("External webbing"), /obj/item/storage/backpack/marine/engineerpack/flamethrower/kit = list("Pyro pack", "Pyro backpack", "G4-1 pack", "Flamer backpack"), diff --git a/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm b/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm index 9c45b2280df2..c366021a3e0a 100644 --- a/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm @@ -94,6 +94,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_commanding_officer, list( list("Tactical Waistcoat", 0, /obj/item/clothing/accessory/storage/black_vest/waistcoat, 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("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, 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("HUDS (CHOOSE 1)", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/crew/engineering.dm b/code/game/machinery/vending/vendor_types/crew/engineering.dm index 8545679ca0e1..d087e051792a 100644 --- a/code/game/machinery/vending/vendor_types/crew/engineering.dm +++ b/code/game/machinery/vending/vendor_types/crew/engineering.dm @@ -53,6 +53,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_maintenance_technician, list( 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("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("SPARE GEAR", 0, null, null, null), list("Synthetic Reset Key", 20, /obj/item/device/defibrillator/synthetic, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/crew/medical.dm b/code/game/machinery/vending/vendor_types/crew/medical.dm index b2477b4eb493..231c673b72ca 100644 --- a/code/game/machinery/vending/vendor_types/crew/medical.dm +++ b/code/game/machinery/vending/vendor_types/crew/medical.dm @@ -92,6 +92,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_doctor, list( list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), )) diff --git a/code/game/machinery/vending/vendor_types/crew/mp.dm b/code/game/machinery/vending/vendor_types/crew/mp.dm index 5f85060dc96f..c9732251532f 100644 --- a/code/game/machinery/vending/vendor_types/crew/mp.dm +++ b/code/game/machinery/vending/vendor_types/crew/mp.dm @@ -45,6 +45,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police, list( 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("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), )) /obj/structure/machinery/cm_vending/clothing/military_police diff --git a/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm b/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm index 45ad67d41c74..51b260096f90 100644 --- a/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm @@ -105,6 +105,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_pilot_officer, list( list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, 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("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("GLASSES (CHOOSE 1)", 0, null, null, null), list("Aviator Shades", 0, /obj/item/clothing/glasses/sunglasses/aviator, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/crew/sea.dm b/code/game/machinery/vending/vendor_types/crew/sea.dm index 99daa1325b0e..240073dc337d 100644 --- a/code/game/machinery/vending/vendor_types/crew/sea.dm +++ b/code/game/machinery/vending/vendor_types/crew/sea.dm @@ -74,6 +74,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_sea, list( 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("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), )) diff --git a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm index 9dc3fac330bc..9352e4701180 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -76,6 +76,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police_chief, list( 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("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), )) diff --git a/code/game/machinery/vending/vendor_types/crew/staff_officer.dm b/code/game/machinery/vending/vendor_types/crew/staff_officer.dm index 65fbf2917699..068d66d02ed8 100644 --- a/code/game/machinery/vending/vendor_types/crew/staff_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/staff_officer.dm @@ -47,6 +47,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer, list( list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, 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("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, 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("BACKPACK (CHOOSE 1)", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm index 5338fb40bc26..88b5e84f2ac9 100644 --- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm +++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm @@ -102,6 +102,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list( list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Surgical Webbing Vest", 0, /obj/item/clothing/accessory/storage/surg_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Surgical Webbing Vest (Blue)", 0, /obj/item/clothing/accessory/storage/surg_vest/blue, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Surgical Drop Pouch", 0, /obj/item/clothing/accessory/storage/surg_vest/drop_green, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm index a05d7286ea16..925caff1125b 100644 --- a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm +++ b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm @@ -297,6 +297,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list( 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("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, 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("MASK (CHOOSE 1)", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/intelligence_officer.dm b/code/game/machinery/vending/vendor_types/intelligence_officer.dm index 63d3e93873d2..8b81d65d189a 100644 --- a/code/game/machinery/vending/vendor_types/intelligence_officer.dm +++ b/code/game/machinery/vending/vendor_types/intelligence_officer.dm @@ -120,6 +120,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_intelligence_officer, list( list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, 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("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, 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("MASK (CHOOSE 1)", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index 569a042da81d..f4c16f998352 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -66,6 +66,7 @@ list("Brown Webbing Vest", floor(scale * 2), /obj/item/clothing/accessory/storage/black_vest/brown_vest, VENDOR_ITEM_REGULAR), list("Shoulder Holster", floor(scale * 1.5), /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR), list("Webbing", floor(scale * 5), /obj/item/clothing/accessory/storage/webbing, VENDOR_ITEM_REGULAR), + list("Black Webbing", floor(scale * 5), /obj/item/clothing/accessory/storage/webbing/black, VENDOR_ITEM_REGULAR), list("Knife Webbing", floor(scale * 1), /obj/item/clothing/accessory/storage/knifeharness, VENDOR_ITEM_REGULAR), list("Drop Pouch", floor(scale * 2), /obj/item/clothing/accessory/storage/droppouch, VENDOR_ITEM_REGULAR), list("External Webbing", floor(scale * 5), /obj/item/clothing/suit/storage/webbing, VENDOR_ITEM_REGULAR), @@ -453,6 +454,8 @@ list("Marine Combat Boots", 20, /obj/item/clothing/shoes/marine, VENDOR_ITEM_REGULAR), list("Marine Brown Combat Boots", 5, /obj/item/clothing/shoes/marine/brown, VENDOR_ITEM_REGULAR), list("Marine Jungle Combat Boots", 5, /obj/item/clothing/shoes/marine/jungle, VENDOR_ITEM_REGULAR), + list("Marine Grey Combat Boots", 5, /obj/item/clothing/shoes/marine/grey, VENDOR_ITEM_REGULAR), + list("Marine Urban Combat Boots", 5, /obj/item/clothing/shoes/marine/urban, VENDOR_ITEM_REGULAR), list("BACKPACKS", -1, null, null), list("Lightweight IMP Backpack", 20, /obj/item/storage/backpack/marine, VENDOR_ITEM_REGULAR), @@ -480,6 +483,7 @@ list("Marine Combat Gloves", 40, /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR), list("Marine Black Combat Gloves", 40, /obj/item/clothing/gloves/marine/black, VENDOR_ITEM_REGULAR), list("Marine Brown Combat Gloves", 20, /obj/item/clothing/gloves/marine/brown, VENDOR_ITEM_REGULAR), + list("Marine Grey Combat Gloves", 20, /obj/item/clothing/gloves/marine/grey, VENDOR_ITEM_REGULAR), list("RADIO", -1, null, null), list("Alpha Squad Radio Encryption Key", 5, /obj/item/device/encryptionkey/alpha, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm index 73bf19e27da8..8f0f921d49e6 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm @@ -165,6 +165,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list( list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, 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("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, 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("Small Tool Webbing (Full)", 0, /obj/item/clothing/accessory/storage/tool_webbing/small/equipped, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm index d9cd2c54681b..ea6b9125face 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm @@ -169,6 +169,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_leader, list( list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, 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("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, 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("MASK (CHOOSE 1)", 0, null, null, null), 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 241d021d7c76..1343c16aa7aa 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 @@ -172,6 +172,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_medic, list( list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, 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("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, 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("MASK (CHOOSE 1)", 0, null, null, null), 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 509e2b03c5b0..20bafd268456 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 @@ -101,10 +101,12 @@ list("STANDARD EQUIPMENT", -1, null, null, null), list("Marine Combat Boots", floor(scale * 15), /obj/item/clothing/shoes/marine, VENDOR_ITEM_REGULAR), list("Marine Brown Combat Boots", floor(scale * 15), /obj/item/clothing/shoes/marine/brown, VENDOR_ITEM_REGULAR), + list("Marine Grey Combat Boots", floor(scale * 15), /obj/item/clothing/shoes/marine/grey, VENDOR_ITEM_REGULAR), list("USCM Uniform", floor(scale * 15), /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR), list("Marine Combat Gloves", floor(scale * 15), /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR), list("Marine Brown Combat Gloves", floor(scale * 15), /obj/item/clothing/gloves/marine/brown, VENDOR_ITEM_REGULAR), list("Marine Black Combat Gloves", floor(scale * 15), /obj/item/clothing/gloves/marine/black, VENDOR_ITEM_REGULAR), + list("Marine Grey Combat Gloves", floor(scale * 15), /obj/item/clothing/gloves/marine/grey, VENDOR_ITEM_REGULAR), list("Marine Radio Headset", floor(scale * 15), /obj/item/device/radio/headset/almayer, VENDOR_ITEM_REGULAR), list("M10 Pattern Marine Helmet", floor(scale * 15), /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR), @@ -112,6 +114,7 @@ list("Brown Webbing Vest", 1, /obj/item/clothing/accessory/storage/black_vest/brown_vest, VENDOR_ITEM_REGULAR), list("Black Webbing Vest", 1, /obj/item/clothing/accessory/storage/black_vest, VENDOR_ITEM_REGULAR), list("Webbing", floor(scale * 2), /obj/item/clothing/accessory/storage/webbing, VENDOR_ITEM_REGULAR), + list("Black Webbing", floor(scale * 2), /obj/item/clothing/accessory/storage/webbing/black, VENDOR_ITEM_REGULAR), list("Drop Pouch", 0.75, /obj/item/clothing/accessory/storage/droppouch, VENDOR_ITEM_REGULAR), list("Shoulder Holster", 0.75, /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm index f210aed9518a..7f69c0ff4788 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm @@ -88,6 +88,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list( list("CLOTHING ITEMS", 0, null, null, null), list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), + list("Black Webbing", 10, /obj/item/clothing/accessory/storage/webbing/black, null, VENDOR_ITEM_REGULAR), list("Brown Webbing Vest", 15, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_REGULAR), list("Black Webbing Vest", 15, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_REGULAR), list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm index 4507dceae07c..b8bc44523c0f 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm @@ -106,6 +106,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_smartgun, list( 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("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, 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("MASK (CHOOSE 1)", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm index 8e84f7556b50..404c3aa1cbc3 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm @@ -93,6 +93,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_specialist, list( 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("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, 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("MASK (CHOOSE 1)", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm index 430a673c5cb7..00c30b1f4936 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm @@ -129,6 +129,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tl, list( list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, 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("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, 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("MASK (CHOOSE 1)", 0, null, null, null), diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index 5ba77f41dab5..8c6d3e16beee 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -35,6 +35,26 @@ paint_type = "full_camo" icon_state = "full_camo" +/obj/item/facepaint/sniper/snow + name = "fullbody paint snow" + paint_type = "full_camo_snow" + icon_state = "full_camo_snow" + +/obj/item/facepaint/sniper/desert + name = "fullbody paint desert" + paint_type = "full_camo_desert" + icon_state = "full_camo_desert" + +/obj/item/facepaint/sniper/jungle + name = "fullbody paint jungle" + paint_type = "full_camo_jungle" + icon_state = "full_camo_jungle" + +/obj/item/facepaint/sniper/urban + name = "fullbody paint urban" + paint_type = "full_camo_urban" + icon_state = "full_camo_urban" + /obj/item/facepaint/skull name = "skull paint" desc = "Paint, for your face. Make your enemies need a change of underwear from the sheer terror a goddamn skull on your face will bring to them. WARNING: DOES NOT MIX WELL WITH BEARDS." diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm index aec498b5847a..e0cda2fc11a3 100644 --- a/code/game/objects/items/props/helmetgarb.dm +++ b/code/game/objects/items/props/helmetgarb.dm @@ -27,6 +27,16 @@ WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/helmet_covers.dmi', ) +/obj/item/prop/helmetgarb/netting/desert + name = "desert combat netting" + desc = "Probably combat netting for a helmet. Probably just an extra hairnet that got ordered for the phantom Almayer cooking staff. Probably useless." + icon_state = "netting_desert" + +/obj/item/prop/helmetgarb/netting/jungle + name = "jungle combat netting" + desc = "Probably combat netting for a helmet. Probably just an extra hairnet that got ordered for the phantom Almayer cooking staff. Probably useless." + icon_state = "netting_jungle" + /obj/item/prop/helmetgarb/spent_buckshot name = "spent buckshot" desc = "Three spent rounds of good ol' buckshot. You know they used to paint these green? Strange times." @@ -77,6 +87,16 @@ WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/helmet_covers.dmi', ) +/obj/item/prop/helmetgarb/raincover/jungle + name = "jungle raincover" + desc = "The standard M10 combat helmet is already water-resistant at depths of up to 10 meters. This makes the top potentially water-proof. At least it's something." + icon_state = "raincover_jungle" + +/obj/item/prop/helmetgarb/raincover/urban + name = "urban raincover" + desc = "The standard M10 combat helmet is already water-resistant at depths of up to 10 meters. This makes the top potentially water-proof. At least it's something." + icon_state = "raincover_urban" + /obj/item/prop/helmetgarb/rabbitsfoot name = "Rabbit's Foot" desc = "Lucky for you, but not the rabbit, didn't really do it much good." diff --git a/code/game/objects/items/weapons/blades.dm b/code/game/objects/items/weapons/blades.dm index 253e3cd64f11..4ec23fc16cf8 100644 --- a/code/game/objects/items/weapons/blades.dm +++ b/code/game/objects/items/weapons/blades.dm @@ -152,6 +152,284 @@ throwforce = MELEE_FORCE_STRONG edge = 1 +/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Colonial Companion Mk. II - Swiss Army Knife with multiple modes - sprites by Crowford. + +/obj/item/weapon/swiss_army_knife + name = "Colonial Companion Mk. II" + desc = "Your reliable partner in every adventure. This versatile multi-tool seamlessly folds and switches between seven essential modes, each crafted for a specific purpose. Whether you need a razor-sharp blade, a precise screwdriver, or even a handy spoon, it's always ready—just a flick of the wrist away, ready to tackle whatever challenge lies ahead." + icon = 'icons/obj/items/tools.dmi' + icon_state = "swiss_stock" // Default state when all tools are folded + force = 0 + throwforce = 0 + sharp = 0 + throw_range = 6 + w_class = SIZE_SMALL // Size for all modes + var/mode = "swiss_stock" + attack_verb = list("hit") + var/loaded + +// The tool modes list + var/list/tool_modes = list( + "swiss_stock", + "swiss_knife", + "swiss_screwdriver", + "swiss_cutters", + "swiss_spoon", + "swiss_opener", + "swiss_corkscrew" +) + +/obj/item/weapon/swiss_army_knife/Initialize(mapload, ...) + . = ..() + create_reagents(5) + +/obj/item/weapon/swiss_army_knife/attack_self(mob/user) + . = ..() + if(mode != "swiss_stock") + switch_tool("swiss_stock") + else + switch_tool(pick(tool_modes)) + +/obj/item/weapon/swiss_army_knife/attack(mob/living/carbon/mob as mob, mob/living/carbon/user as mob) + if(mode == "swiss_cutters") + if((mob.handcuffed) && (istype(mob.handcuffed, /obj/item/restraint/adjustable/cable))) + user.visible_message("\The [usr] cuts \the [mob]'s restraints with \the [src]!",\ + "You cut \the [mob]'s restraints with \the [src]!",\ + "You hear cable being cut.") + mob.handcuffed = null + mob.handcuff_update() + return + else + ..() + if(mode == "swiss_spoon") + if(!istype(mob)) + return ..() + if(user.a_intent != INTENT_HELP) + return ..() + + if (reagents.total_volume > 0) + + var/fullness = mob.nutrition + (mob.reagents.get_reagent_amount("nutriment") * 25) + if(fullness > NUTRITION_HIGH) + to_chat(user, SPAN_WARNING("[user == mob ? "You" : "They"] don't feel like eating more right now.")) + return + reagents.set_source_mob(user) + reagents.trans_to_ingest(mob, reagents.total_volume) + if(mob == user) + for(var/mob/O in viewers(mob, null)) + O.show_message(SPAN_NOTICE("[user] eats some [loaded] from \the [src]."), SHOW_MESSAGE_VISIBLE) + mob.reagents.add_reagent("nutriment", 1) + else + for(var/mob/O in viewers(mob, null)) + O.show_message(SPAN_NOTICE("[user] feeds [mob] some [loaded] from \the [src]"), SHOW_MESSAGE_VISIBLE) + mob.reagents.add_reagent("nutriment", 1) + playsound(mob.loc,'sound/items/eatfood.ogg', 15, 1) + overlays.Cut() + return + +/obj/item/weapon/swiss_army_knife/proc/switch_tool(new_state) + switch(new_state) + if("swiss_stock") + desc = initial(desc) + force = initial(force) + throwforce = initial(throwforce) + sharp = initial(sharp) + attack_verb = initial(attack_verb) + flags_item = initial(flags_item) + icon_state = initial(icon_state) + attack_speed = initial(attack_speed) + flags_atom = initial(flags_atom) + REMOVE_TRAITS_IN(src,src) + if("swiss_knife") + desc = "A sharp knife for cutting things." + sharp = IS_SHARP_ITEM_ACCURATE + force = MELEE_FORCE_NORMAL + throwforce = MELEE_FORCE_NORMAL + throw_speed = SPEED_VERY_FAST + throw_range = 6 + hitsound = 'sound/weapons/slash.ogg' + attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + attack_speed = 9 + flags_item = CAN_DIG_SHRAPNEL + if("swiss_screwdriver") + desc = "A trusty screwdriver for all your fastening needs." + force = 2 + throwforce = 0 + flags_atom = FPRINT|CONDUCT + matter = list("metal" = 75) + attack_verb = list("stabbed") + flags_item = CAN_DIG_SHRAPNEL + ADD_TRAIT(src,TRAIT_TOOL_SCREWDRIVER,src) + if("swiss_cutters") + desc = "Cutters for cutting through wires and various materials." + attack_verb = list("pinched", "nipped") + force = 5 + throwforce = 0 + flags_atom = FPRINT|CONDUCT + sharp = IS_SHARP_ITEM_SIMPLE + edge = 1 + ADD_TRAIT(src,TRAIT_TOOL_WIRECUTTERS,src) + if("swiss_spoon") + desc = "A simple spoon." + attack_verb = list("scoop", "stir") + force = 0 + throwforce = 0 + sharp = 0 + if("swiss_opener") + desc = "A simple can opener, can be used as a knife, although weaker." + sharp = IS_SHARP_ITEM_ACCURATE + force = MELEE_FORCE_WEAK + throwforce = MELEE_FORCE_WEAK + throw_speed = SPEED_VERY_FAST + throw_range = 6 + hitsound = 'sound/weapons/slash.ogg' + attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + attack_speed = 9 + flags_item = CAN_DIG_SHRAPNEL + if("swiss_corkscrew") + desc = "A simple corkscrew." + force = 2 + throwforce = 0 + flags_atom = FPRINT|CONDUCT + attack_verb = list("stabbed") + flags_item = CAN_DIG_SHRAPNEL + mode = new_state + icon_state = new_state + update_icon() + + + +/obj/item/weapon/swiss_army_knife/knife + icon_state = "swiss_knife" + desc = "A sharp knife for cutting things." + sharp = IS_SHARP_ITEM_ACCURATE + force = MELEE_FORCE_NORMAL + throwforce = MELEE_FORCE_NORMAL + throw_speed = SPEED_VERY_FAST + throw_range = 6 + hitsound = 'sound/weapons/slash.ogg' + attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + attack_speed = 9 + flags_item = CAN_DIG_SHRAPNEL + +/obj/item/weapon/swiss_army_knife/screwdriver + icon_state = "swiss_screwdriver" + desc = "A trusty screwdriver for all your fastening needs." + force = 2 + throwforce = 0 + flags_atom = FPRINT|CONDUCT + matter = list("metal" = 75) + attack_verb = list("stabbed") + flags_item = CAN_DIG_SHRAPNEL + _status_traits = list(TRAIT_TOOL_SCREWDRIVER) + +/obj/item/weapon/swiss_army_knife/screwdriver/attack(mob/living/carbon/mob as mob, mob/living/carbon/user as mob) + if(!istype(mob)) + return ..() + if(user.zone_selected != "eyes") // && user.zone_selected != "head") + return ..() + if(ishuman(mob)) + var/mob/living/carbon/human/H = mob + var/datum/internal_organ/eyes/E = H.internal_organs_by_name["eyes"] + if(E) + var/safety = H.get_eye_protection() + if(!safety) + user.visible_message(SPAN_DANGER("[user] stabs [H] in the eyes with [src]!"), + SPAN_DANGER("You stab [H] in the eyes with [src]!")) + E.take_damage(rand(8,20)) + return ..() + +/obj/item/weapon/swiss_army_knife/wirecutters + icon_state = "swiss_cutters" + desc = "Cutters for cutting through wires and various materials." + attack_verb = list("pinched", "nipped") + force = 5 + throwforce = 0 + flags_atom = FPRINT|CONDUCT + sharp = IS_SHARP_ITEM_SIMPLE + edge = 1 + _status_traits = list(TRAIT_TOOL_WIRECUTTERS) + +/obj/item/weapon/swiss_army_knife/wirecutters/attack(mob/living/carbon/mob, mob/user) + if((mob.handcuffed) && (istype(mob.handcuffed, /obj/item/restraint/adjustable/cable))) + user.visible_message("\The [usr] cuts \the [mob]'s restraints with \the [src]!",\ + "You cut \the [mob]'s restraints with \the [src]!",\ + "You hear cable being cut.") + mob.handcuffed = null + mob.handcuff_update() + return + else + ..() + +/obj/item/weapon/swiss_army_knife/spoon + icon_state = "swiss_spoon" + desc = "A simple spoon." + attack_verb = list("scoop", "stir") + force = 0 + throwforce = 0 + sharp = 0 + + +/obj/item/weapon/swiss_army_knife/spoon/Initialize() + . = ..() + if (prob(60)) + src.pixel_y = rand(0, 4) + create_reagents(5) + return + +/obj/item/weapon/swiss_army_knife/spoon/attack(mob/living/carbon/mob as mob, mob/living/carbon/user as mob) + if(!istype(mob)) + return ..() + if(user.a_intent != INTENT_HELP) + return ..() + + if (reagents.total_volume > 0) + var/fullness = mob.nutrition + (mob.reagents.get_reagent_amount("nutriment") * 25) + if(fullness > NUTRITION_HIGH) + to_chat(user, SPAN_WARNING("[user == mob ? "You" : "They"] don't feel like eating more right now.")) + return + reagents.set_source_mob(user) + reagents.trans_to_ingest(mob, reagents.total_volume) + if(mob == user) + for(var/mob/O in viewers(mob, null)) + O.show_message(SPAN_NOTICE("[user] eats some [loaded] from \the [src]."), SHOW_MESSAGE_VISIBLE) + mob.reagents.add_reagent("nutriment", 1) + else + for(var/mob/O in viewers(mob, null)) + O.show_message(SPAN_NOTICE("[user] feeds [mob] some [loaded] from \the [src]"), SHOW_MESSAGE_VISIBLE) + mob.reagents.add_reagent("nutriment", 1) + playsound(mob.loc,'sound/items/eatfood.ogg', 15, 1) + overlays.Cut() + return + else + ..() + +/obj/item/weapon/swiss_army_knife/can_opener + icon = 'icons/obj/items/tools.dmi' + icon_state = "swiss_opener" + desc = "A simple can opener, can be used as a knife, although weaker." + sharp = IS_SHARP_ITEM_ACCURATE + force = MELEE_FORCE_WEAK + throwforce = MELEE_FORCE_WEAK + throw_speed = SPEED_VERY_FAST + throw_range = 6 + hitsound = 'sound/weapons/slash.ogg' + attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + attack_speed = 9 + flags_item = CAN_DIG_SHRAPNEL + +/obj/item/weapon/swiss_army_knife/corkscrew + icon = 'icons/obj/items/tools.dmi' + icon_state = "swiss_corkscrew" + desc = "A simple corkscrew." + attack_verb = list("turn", "screw", "poke", "twist") + force = 0 + throwforce = 0 + +/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + ///For digging shrapnel out of OTHER people, not yourself. Triggered by human/attackby() so target is definitely human. User might not be. /obj/item/proc/dig_out_shrapnel_check(mob/living/carbon/human/target, mob/living/carbon/human/user) if(user.a_intent == INTENT_HELP && (target == user || skillcheck(user, SKILL_MEDICAL, SKILL_MEDICAL_MEDIC))) //Squad medics and above, or yourself diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index dc35ba261b2c..5aa695cdf761 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -34,9 +34,29 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) path = /obj/item/clothing/glasses/sunglasses/aviator /datum/gear/eyewear/eyepatch - display_name = "Eyepatch" + display_name = "Eyepatch, black" path = /obj/item/clothing/glasses/eyepatch +/datum/gear/eyewear/eyepatch/left + display_name = "Eyepatch, black flipped" + path = /obj/item/clothing/glasses/eyepatch/left + +/datum/gear/eyewear/eyepatch/white + display_name = "Eyepatch, white" + path = /obj/item/clothing/glasses/eyepatch/white + +/datum/gear/eyewear/eyepatch/white/left + display_name = "Eyepatch, white flipped" + path = /obj/item/clothing/glasses/eyepatch/white/left + +/datum/gear/eyewear/eyepatch/green + display_name = "Eyepatch, green" + path = /obj/item/clothing/glasses/eyepatch/green + +/datum/gear/eyewear/eyepatch/green/left + display_name = "Eyepatch, green flipped" + path = /obj/item/clothing/glasses/eyepatch/green/left + /datum/gear/eyewear/rpg_glasses display_name = "Marine RPG Glasses" path = /obj/item/clothing/glasses/regular @@ -66,6 +86,38 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) display_name = "Ballistic goggles, orange" path = /obj/item/clothing/glasses/mgoggles/orange +/datum/gear/eyewear/goggles_red + display_name = "Ballistic goggles, red" + path = /obj/item/clothing/glasses/mgoggles/red + +/datum/gear/eyewear/goggles_red/prescription + display_name = "Prescription ballistic goggles, red" + path = /obj/item/clothing/glasses/mgoggles/red/prescription + +/datum/gear/eyewear/goggles_blue + display_name = "Ballistic goggles, blue" + path = /obj/item/clothing/glasses/mgoggles/blue + +/datum/gear/eyewear/goggles_blue/prescription + display_name = "Prescription ballistic goggles, blue" + path = /obj/item/clothing/glasses/mgoggles/blue/prescription + +/datum/gear/eyewear/goggles_purple + display_name = "Ballistic goggles, purple" + path = /obj/item/clothing/glasses/mgoggles/purple + +/datum/gear/eyewear/goggles_purple/prescription + display_name = "Prescription ballistic goggles, purple" + path = /obj/item/clothing/glasses/mgoggles/purple/prescription + +/datum/gear/eyewear/goggles_yellow + display_name = "Ballistic goggles, yellow" + path = /obj/item/clothing/glasses/mgoggles/yellow + +/datum/gear/eyewear/goggles_yellow/prescription + display_name = "Prescription ballistic goggles, yellow" + path = /obj/item/clothing/glasses/mgoggles/yellow/prescription + /datum/gear/eyewear/goggles_orange/prescription display_name = "Prescription ballistic goggles, orange" path = /obj/item/clothing/glasses/mgoggles/orange/prescription @@ -78,10 +130,49 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) display_name = "Prescription ballistic goggles, M1A1" path = /obj/item/clothing/glasses/mgoggles/v2/prescription +/datum/gear/eyewear/goggles2/blue + display_name = "Ballistic goggles, M1A1 blue" + path = /obj/item/clothing/glasses/mgoggles/v2/blue + +/datum/gear/eyewear/goggles2/blue/prescription + display_name = "Prescription ballistic goggles, M1A1 blue" + path = /obj/item/clothing/glasses/mgoggles/v2/blue/prescription + +/datum/gear/eyewear/goggles2/polarized_blue + display_name = "Polarized Ballistic goggles, M1A1 blue" + path = /obj/item/clothing/glasses/mgoggles/v2/polarized_blue + +/datum/gear/eyewear/goggles2/polarized_blue/prescription + display_name = "Prescription Polarized ballistic goggles, M1A1 blue" + path = /obj/item/clothing/glasses/mgoggles/v2/polarized_blue/prescription + +/datum/gear/eyewear/goggles2/polarized_orange + display_name = "Polarized Ballistic goggles, M1A1 orange" + path = /obj/item/clothing/glasses/mgoggles/v2/polarized_orange + +/datum/gear/eyewear/goggles2/polarized_orange/prescription + display_name = "Prescription Polarized ballistic goggles, M1A1 orange" + path = /obj/item/clothing/glasses/mgoggles/v2/polarized_orange/prescription + /datum/gear/eyewear/bimex_shades display_name = "BiMex personal shades" path = /obj/item/clothing/glasses/sunglasses/big - cost = 5 + cost = 4 + +/datum/gear/eyewear/new_bimex/black + display_name = "BiMex tactical shades, black" + path = /obj/item/clothing/glasses/sunglasses/big/new_bimex/black + cost = 4 + +/datum/gear/eyewear/new_bimex + display_name = "BiMex tactical shades, yellow" + path = /obj/item/clothing/glasses/sunglasses/big/new_bimex + cost = 4 + +/datum/gear/eyewear/new_bimex/bronze + display_name = "BiMex tactical shades, bronze" + path = /obj/item/clothing/glasses/sunglasses/big/new_bimex/bronze + cost = 4 /datum/gear/eyewear/sunglasses display_name = "Sunglasses" @@ -159,6 +250,56 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) display_name = "Scarf, white" path = /obj/item/clothing/mask/tornscarf/snow +/datum/gear/mask/smock_classic + display_name = "Smock, classic" // much like the scarves, but larger - different design. + path = /obj/item/clothing/mask/tornscarf/smock/classic + cost = 4 + +/datum/gear/mask/smock_jungle + display_name = "Smock, jungle" + path = /obj/item/clothing/mask/tornscarf/smock + cost = 4 + +/datum/gear/mask/smock_snow + display_name = "Smock, snow" + path = /obj/item/clothing/mask/tornscarf/smock/snow + cost = 4 + +/datum/gear/mask/smock_desert + display_name = "Smock, desert" + path = /obj/item/clothing/mask/tornscarf/smock/desert + cost = 4 + +/datum/gear/mask/smock_urban + display_name = "Smock, urban" + path = /obj/item/clothing/mask/tornscarf/smock/urban + cost = 4 + +/datum/gear/mask/smock_black + display_name = "Smock, black" + path = /obj/item/clothing/mask/tornscarf/smock/black + cost = 4 + +/datum/gear/mask/keffiyeh + display_name = "Keffiyeh" // Traditional middle-eastern headdress, works like a balaclava/scarf. + path = /obj/item/clothing/mask/rebreather/scarf/keffiyeh + +/datum/gear/mask/keffiyeh_white + display_name = "Keffiyeh, white" + path = /obj/item/clothing/mask/rebreather/scarf/keffiyeh/white + +/datum/gear/mask/keffiyeh_red + display_name = "Keffiyeh, red" + path = /obj/item/clothing/mask/rebreather/scarf/keffiyeh/red + +/datum/gear/mask/keffiyeh_green + display_name = "Keffiyeh, green" + path = /obj/item/clothing/mask/rebreather/scarf/keffiyeh/green + +/datum/gear/mask/keffiyeh_black + display_name = "Keffiyeh, black" + path = /obj/item/clothing/mask/rebreather/scarf/keffiyeh/black + /datum/gear/mask/uscm allowed_origins = USCM_ORIGINS @@ -314,6 +455,14 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) display_name = "Helmet netting" path = /obj/item/prop/helmetgarb/netting +/datum/gear/helmet_garb/netting/desert + display_name = "Desert Helmet netting" + path = /obj/item/prop/helmetgarb/netting/desert + +/datum/gear/helmet_garb/netting/jungle + display_name = "Jungle Helmet netting" + path = /obj/item/prop/helmetgarb/netting/jungle + /datum/gear/helmet_garb/lucky_feather display_name = "Lucky feather, red" path = /obj/item/prop/helmetgarb/lucky_feather @@ -342,6 +491,14 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) display_name = "Rain cover" path = /obj/item/prop/helmetgarb/raincover +/datum/gear/helmet_garb/raincover/jungle + display_name = "Jungle Rain cover" + path = /obj/item/prop/helmetgarb/raincover/jungle + +/datum/gear/helmet_garb/raincover/urban + display_name = "Urban Rain cover" + path = /obj/item/prop/helmetgarb/raincover/urban + /datum/gear/helmet_garb/rabbits_foot display_name = "Rabbit's foot" path = /obj/item/prop/helmetgarb/rabbitsfoot @@ -386,11 +543,11 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) /datum/gear/paperwork category = "Paperwork" + cost = 1 /datum/gear/paperwork/pen display_name = "Pen, black" path = /obj/item/tool/pen - cost = 1 /datum/gear/paperwork/pen_blue display_name = "Pen, blue" @@ -407,7 +564,7 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) /datum/gear/paperwork/pen_fountain display_name = "Pen, fountain" path = /obj/item/tool/pen/fountain - cost = 3 + cost = 2 /datum/gear/paperwork/paper display_name = "Sheet of paper" @@ -456,10 +613,12 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) /datum/gear/toy category = "Recreational" + cost = 1 /datum/gear/toy/camera display_name = "Camera" path = /obj/item/device/camera + cost = 2 /datum/gear/toy/mags cost = 1 @@ -543,6 +702,7 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) /datum/gear/toy/walkman display_name = "Walkman" path = /obj/item/device/walkman + cost = 2 /datum/gear/toy/crayon display_name = "Crayon" @@ -616,7 +776,6 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) /datum/gear/plush/therapy/random display_name = "Therapy plush (???)" path = /obj/item/toy/plush/therapy/random_color - cost = 7 /datum/gear/weapon category = "Weapons" @@ -626,6 +785,38 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) display_name = "Type 80 Bayonet" path = /obj/item/attachable/bayonet/upp_replica +/datum/gear/weapon/antique_Bayonet + display_name = "antique bayonet" // ancient bayonet - family heirloom perhaps + path = /obj/item/attachable/bayonet/antique + +/datum/gear/weapon/L5_Bayonet + display_name = "L5 Bayonet" + path = /obj/item/attachable/bayonet/rmc_replica + +/datum/gear/weapon/custom_Bayonet + display_name = "M5 'Raven's Claw' tactical bayonet" // custom style bayonet with variants, exclusive to loadout and unique. Name might need changing. + path = /obj/item/attachable/bayonet/custom + +/datum/gear/weapon/custom_Bayonet/red + display_name = "M5 'Raven's Claw' tactical bayonet, red" + path = /obj/item/attachable/bayonet/custom/red + +/datum/gear/weapon/custom_Bayonet/blue + display_name = "M5 'Raven's Claw' tactical bayonet, blue" + path = /obj/item/attachable/bayonet/custom/blue + +/datum/gear/weapon/custom_Bayonet/black + display_name = "M5 'Raven's Claw' tactical bayonet, black" + path = /obj/item/attachable/bayonet/custom/black + +/datum/gear/weapon/tanto_Bayonet + display_name = "T9 tactical bayonet" // TWE/CLF bayonet + path = /obj/item/attachable/bayonet/tanto + +/datum/gear/weapon/tanto_Bayonet/blue + display_name = "T9 tactical bayonet, blue" + path = /obj/item/attachable/bayonet/tanto/blue + /datum/gear/weapon/m8_cartridge_bayonet display_name = "M8 Cartridge Bayonet" path = /obj/item/storage/box/co2_knife @@ -650,8 +841,15 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) path = /obj/item/weapon/gun/revolver/m44/custom allowed_origins = USCM_ORIGINS +/datum/gear/weapon/model_37_revolver_black + display_name = "S&W .38 model 37 Custom revolver" + path = /obj/item/weapon/gun/revolver/small/black + allowed_origins = USCM_ORIGINS + cost = 4 + /datum/gear/drink category = "Canned drinks" + cost = 1 /datum/gear/drink/water display_name = "Bottled water" @@ -693,14 +891,14 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) /datum/gear/drink/boda display_name = "Boda Soda" path = /obj/item/reagent_container/food/drinks/cans/boda - cost = 3 //Legally imported from UPP. + cost = 2 //Legally imported from UPP. /datum/gear/drink/boda/plus display_name = "Boda Cola" path = /obj/item/reagent_container/food/drinks/cans/bodaplus /datum/gear/drink/alcohol - cost = 3 //Illegal in military. + cost = 2 //Illegal in military. /datum/gear/drink/alcohol/ale display_name = "Weyland-Yutani IPA Ale" @@ -720,6 +918,7 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) /datum/gear/flask category = "Flasks" + cost = 1 /datum/gear/flask/canteen display_name = "Canteen" @@ -751,6 +950,7 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) /datum/gear/snack_sweet category = "Food (sweets)" + cost = 1 /datum/gear/snack_sweet/candy display_name = "Bar of candy" @@ -771,7 +971,6 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) /datum/gear/snack_sweet/fortune_cookie display_name = "Fortune cookie" path = /obj/item/reagent_container/food/snacks/fortunecookie/prefilled - cost = 3 /datum/gear/snack_sweet/donut_normal display_name = "Donut" @@ -787,6 +986,7 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) /datum/gear/snack_packaged category = "Food (packaged)" + cost = 1 /datum/gear/snack_packaged/beef_jerky display_name = "Beef jerky" @@ -818,6 +1018,7 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) /datum/gear/snack_grown category = "Food (healthy)" + cost = 1 /datum/gear/snack_grown/apple display_name = "Apple" @@ -849,6 +1050,7 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) /datum/gear/smoking category = "Smoking" + cost = 1 /datum/gear/smoking/cigarette display_name = "Cigarette" @@ -866,6 +1068,16 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) path = /obj/item/clothing/mask/cigarette/cigar cost = 2 +/datum/gear/smoking/cigarette/tarbacks + display_name = "Tarbacks case" + path = /obj/item/storage/fancy/cigar/tarbacks + cost = 6 + +/datum/gear/smoking/cigarette/tarbacktube + display_name = "Tarback tube" + path = /obj/item/storage/fancy/cigar/tarbacktube + cost = 2 + /datum/gear/smoking/pack_emerald_green display_name = "Pack Of Emerald Greens" path = /obj/item/storage/fancy/cigarettes/emeraldgreen @@ -874,10 +1086,32 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) display_name = "Pack Of Lucky Strikes" path = /obj/item/storage/fancy/cigarettes/lucky_strikes +/datum/gear/smoking/arcturian_ace + display_name = "Pack Of Arcturian Ace" + path = /obj/item/storage/fancy/cigarettes/arcturian_ace + +/datum/gear/smoking/lady_finger + display_name = "Pack Of Lady Fingers" + path = /obj/item/storage/fancy/cigarettes/lady_finger + +/datum/gear/smoking/lucky_strikes_4 + display_name = "Pack Of Lucky Strikes Mini" + path = /obj/item/storage/fancy/cigarettes/lucky_strikes_4 + +/datum/gear/smoking/wypacket + display_name = "Pack Of Weyland-Yutani Gold" + path = /obj/item/storage/fancy/cigarettes/wypacket + cost = 2 + +/datum/gear/smoking/kpack + display_name = "Pack Of Koorlander Gold" + path = /obj/item/storage/fancy/cigarettes/kpack + cost = 2 + /datum/gear/smoking/weed_joint display_name = "Joint of space weed" path = /obj/item/clothing/mask/cigarette/weed - cost = 4 + cost = 2 /datum/gear/smoking/lighter display_name = "Lighter, cheap" @@ -892,6 +1126,16 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) display_name = "Black lighter, zippo" path = /obj/item/tool/lighter/zippo/black +/datum/gear/smoking/zippo/gold + display_name = "Golden lighter, zippo" + path = /obj/item/tool/lighter/zippo/gold + cost = 3 + +/datum/gear/smoking/zippo/executive + display_name = "Weyland-Yutani executive Zippo lighter" + path = /obj/item/tool/lighter/zippo/executive + cost = 3 + /datum/gear/smoking/zippo/blue display_name = "Blue lighter, zippo" path = /obj/item/tool/lighter/zippo/blue @@ -899,12 +1143,10 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) /datum/gear/smoking/electronic_cigarette display_name = "Electronic cigarette" path = /obj/item/clothing/mask/electronic_cigarette - cost = 3 /datum/gear/smoking/electronic_cigarette/cigar display_name = "Electronic cigar" path = /obj/item/clothing/mask/electronic_cigarette/cigar - cost = 4 /datum/gear/misc category = "Miscellaneous" @@ -931,6 +1173,26 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) path = /obj/item/facepaint/sniper cost = 4 //To match with the skull paint amount of point, gave this amount of point for the same reason of the skull facepaint (too cool for everyone to be able to constantly use) +/datum/gear/misc/facepaint_body/snow + display_name = "Fullbody paint, snow" + path = /obj/item/facepaint/sniper/snow + cost = 4 + +/datum/gear/misc/facepaint_body/desert + display_name = "Fullbody paint, desert" + path = /obj/item/facepaint/sniper/desert + cost = 4 + +/datum/gear/misc/facepaint_body/jungle + display_name = "Fullbody paint, jungle" + path = /obj/item/facepaint/sniper/jungle + cost = 4 + +/datum/gear/misc/facepaint_body/urban + display_name = "Fullbody paint, urban" + path = /obj/item/facepaint/sniper/urban + cost = 4 + /datum/gear/misc/jungle_boots display_name = "Jungle pattern combat boots" path = /obj/item/clothing/shoes/marine/jungle @@ -946,6 +1208,21 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) path = /obj/item/clothing/gloves/marine/brown cost = 2 +/datum/gear/misc/grey_boots + display_name = "grey combat boots" + path = /obj/item/clothing/shoes/marine/grey + cost = 2 + +/datum/gear/misc/urban_boots + display_name = "Urban pattern combat boots" + path = /obj/item/clothing/shoes/marine/urban + cost = 2 + +/datum/gear/misc/grey_gloves + display_name = "grey combat gloves" + path = /obj/item/clothing/gloves/marine/grey + cost = 2 + /datum/gear/misc/pdt_kit display_name = "PDT/L kit" path = /obj/item/storage/box/pdt_kit @@ -975,9 +1252,47 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) display_name = "Falling Falcons shoulder patch" path = /obj/item/clothing/accessory/patch/falcon +/datum/gear/misc/patch_uscm/falconalt + display_name = "Falling Falcons UA shoulder patch" + path = /obj/item/clothing/accessory/patch/falconalt + +/datum/gear/misc/patch_uscm/falconlarge + display_name = "Falling Falcons large chest patch" + path = /obj/item/clothing/accessory/patch/falconlarge + +/datum/gear/misc/patch_uscm/falcon_squad_alpha + display_name = "Falling Falcons shoulder patch, Alpha" + path = /obj/item/clothing/accessory/patch/falcon/squad/alpha + +/datum/gear/misc/patch_uscm/falcon_squad_bravo + display_name = "Falling Falcons shoulder patch, Bravo" + path = /obj/item/clothing/accessory/patch/falcon/squad/bravo + +/datum/gear/misc/patch_uscm/falcon_squad_charlie + display_name = "Falling Falcons shoulder patch, Charlie" + path = /obj/item/clothing/accessory/patch/falcon/squad/charlie + +/datum/gear/misc/patch_uscm/falcon_squad_delta + display_name = "Falling Falcons shoulder patch, Delta" + path = /obj/item/clothing/accessory/patch/falcon/squad/delta + +/datum/gear/misc/patch_uscm/falcon_squad_echo + display_name = "Falling Falcons shoulder patch, Echo" + path = /obj/item/clothing/accessory/patch/falcon/squad/echo + +/datum/gear/misc/patch_uscm/uapatch + display_name = "United Americas shoulder patch" + path = /obj/item/clothing/accessory/patch/ua + +/datum/gear/misc/patch_uscm/medic_patch + display_name = "Field Medic shoulder patch" + path = /obj/item/clothing/accessory/patch/medic_patch + allowed_origins = list(ORIGIN_CIVILIAN, USCM_ORIGINS, ORIGIN_UPP) + /datum/gear/misc/family_photo display_name = "Family photo" path = /obj/item/prop/helmetgarb/family_photo + cost = 1 /datum/gear/misc/compass display_name = "Compass" @@ -987,8 +1302,111 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) /datum/gear/misc/bug_spray display_name = "Bug spray" path = /obj/item/prop/helmetgarb/bug_spray + cost = 1 /datum/gear/misc/straight_razor display_name = "Cut-throat razor" path = /obj/item/weapon/straight_razor - cost = 3 + cost = 2 + +/datum/gear/misc/swiss_army_knife + display_name = "Colonial Companion Mk. II" + path = /obj/item/weapon/swiss_army_knife + cost = 7 // Expensive because it's literally a multi-tool, wirecutters, screwdriver, knife. + +// Civilian only + +/datum/gear/civilian + category = "Civilian only (restricted)" + allowed_origins = list(ORIGIN_CIVILIAN) + +/datum/gear/civilian/patch + display_name = "Weyland-Yutani shoulder patch, black" + path = /obj/item/clothing/accessory/patch/wy + cost = 1 + slot = WEAR_IN_ACCESSORY + +/datum/gear/civilian/patch/wy_white + display_name = "Weyland-Yutani shoulder patch, white" + path = /obj/item/clothing/accessory/patch/wy_white + +/datum/gear/civilian/patch/wy_fury + display_name = "Weyland-Yutani Fury '161' patch" + path = /obj/item/clothing/accessory/patch/wyfury + +/datum/gear/civilian/patch/twepatch + display_name = "Three World Empire shoulder patch" + path = /obj/item/clothing/accessory/patch/twe + +/datum/gear/civilian/patch/upp_alt + display_name = "Union of Progressive Peoples shoulder patch, gold" + path = /obj/item/clothing/accessory/patch/upp/alt + +/datum/gear/civilian/patch/som + display_name = "Sons of Mars shoulder patch" + path = /obj/item/clothing/accessory/patch/sons_of_mars + +/datum/gear/civilian/patch/merc_patch + display_name = "Old Freelancer shoulder patch" + path = /obj/item/clothing/accessory/patch/merc_patch + +// Cheap Civilian shades - colorful! + +/datum/gear/civilian/eyewear/bimax_shades + display_name = "BiMax personal shades" + path = /obj/item/clothing/glasses/sunglasses/big/fake + +/datum/gear/civilian/eyewear/bimax_shades/red + display_name = "BiMax personal shades, red" + path = /obj/item/clothing/glasses/sunglasses/big/fake/red + +/datum/gear/civilian/eyewear/bimax_shades/orange + display_name = "BiMax personal shades, orange" + path = /obj/item/clothing/glasses/sunglasses/big/fake/orange + +/datum/gear/civilian/eyewear/bimax_shades/yellow + display_name = "BiMax personal shades, yellow" + path = /obj/item/clothing/glasses/sunglasses/big/fake/yellow + +/datum/gear/civilian/eyewear/bimax_shades/green + display_name = "BiMax personal shades, green" + path = /obj/item/clothing/glasses/sunglasses/big/fake/green + +/datum/gear/civilian/eyewear/bimax_shades/blue + display_name = "BiMax personal shades, blue" + path = /obj/item/clothing/glasses/sunglasses/big/fake/blue + +// Civilian shoes + +/datum/gear/civilian/shoes + display_name = "black shoes" + path = /obj/item/clothing/shoes/black + cost = 1 + +/datum/gear/civilian/shoes/brown + display_name = "brown shoes" + path = /obj/item/clothing/shoes/brown + +/datum/gear/civilian/shoes/blue + display_name = "blue shoes" + path = /obj/item/clothing/shoes/blue + +/datum/gear/civilian/shoes/green + display_name = "green shoes" + path = /obj/item/clothing/shoes/green + +/datum/gear/civilian/shoes/yellow + display_name = "yellow shoes" + path = /obj/item/clothing/shoes/yellow + +/datum/gear/civilian/shoes/purple + display_name = "purple shoes" + path = /obj/item/clothing/shoes/purple + +/datum/gear/civilian/shoes/red + display_name = "red shoes" + path = /obj/item/clothing/shoes/red + +/datum/gear/civilian/shoes/rainbow + display_name = "rainbow shoes" + path = /obj/item/clothing/shoes/rainbow diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 53e99fe5bb3b..39a9f0bd1058 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -210,6 +210,26 @@ flags_equip_slot = SLOT_EYES|SLOT_FACE flags_obj = OBJ_IS_HELMET_GARB +/obj/item/clothing/glasses/eyepatch/left + icon_state = "eyepatch_left" + item_state = "eyepatch_left" + +/obj/item/clothing/glasses/eyepatch/white + icon_state = "eyepatch_white" + item_state = "eyepatch_white" + +/obj/item/clothing/glasses/eyepatch/white/left + icon_state = "eyepatch_white_left" + item_state = "eyepatch_white_left" + +/obj/item/clothing/glasses/eyepatch/green + icon_state = "eyepatch_green" + item_state = "eyepatch_green" + +/obj/item/clothing/glasses/eyepatch/green/left + icon_state = "eyepatch_green_left" + item_state = "eyepatch_green_left" + /obj/item/clothing/glasses/monocle name = "monocle" gender = NEUTER @@ -532,6 +552,111 @@ inactive_icon_state = "mgoggles2" prescription = TRUE +/obj/item/clothing/glasses/mgoggles/red + name = "red marine ballistic goggles" + desc = "Standard issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This one has scarlet colored day lenses." + icon_state = "mgogglesred" + active_icon_state = "mgogglesred_down" + inactive_icon_state = "mgogglesred" + +/obj/item/clothing/glasses/mgoggles/red/prescription + name = "prescription red marine ballistic goggles" + desc = "Standard issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This one has scarlet colored day lenses." + icon_state = "mgogglesred" + active_icon_state = "mgogglesred_down" + inactive_icon_state = "mgogglesred" + prescription = TRUE + +/obj/item/clothing/glasses/mgoggles/blue + name = "blue marine ballistic goggles" + desc = "Standard issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This one has blue colored day lenses." + icon_state = "mgogglesblue" + active_icon_state = "mgogglesblue_down" + inactive_icon_state = "mgogglesblue" + +/obj/item/clothing/glasses/mgoggles/blue/prescription + name = "prescription blue marine ballistic goggles" + desc = "Standard issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This one has blue colored day lenses." + icon_state = "mgogglesblue" + active_icon_state = "mgogglesblue_down" + inactive_icon_state = "mgogglesblue" + prescription = TRUE + +/obj/item/clothing/glasses/mgoggles/purple + name = "purple marine ballistic goggles" + desc = "Standard issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This one has purple colored day lenses." + icon_state = "mgogglespurple" + active_icon_state = "mgogglespurple_down" + inactive_icon_state = "mgogglespurple" + +/obj/item/clothing/glasses/mgoggles/purple/prescription + name = "prescription purple marine ballistic goggles" + desc = "Standard issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This one has purple colored day lenses." + icon_state = "mgogglespurple" + active_icon_state = "mgogglespurple_down" + inactive_icon_state = "mgogglespurple" + prescription = TRUE + +/obj/item/clothing/glasses/mgoggles/yellow + name = "yellow marine ballistic goggles" + desc = "Standard issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This one has yellow colored day lenses." + icon_state = "mgogglesyellow" + active_icon_state = "mgogglesyellow_down" + inactive_icon_state = "mgogglesyellow" + +/obj/item/clothing/glasses/mgoggles/yellow/prescription + name = "prescription yellow marine ballistic goggles" + desc = "Standard issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This one has yellow colored day lenses." + icon_state = "mgogglesyellow" + active_icon_state = "mgogglesyellow_down" + inactive_icon_state = "mgogglesyellow" + prescription = TRUE + +/obj/item/clothing/glasses/mgoggles/v2/blue + name = "M1A1 marine ballistic goggles" + desc = "Newer issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This version has larger lenses." + icon_state = "m2gogglesblue" + active_icon_state = "m2gogglesblue_down" + inactive_icon_state = "m2gogglesblue" + +/obj/item/clothing/glasses/mgoggles/v2/blue/prescription + name = "prescription M1A1 marine ballistic goggles" + desc = "Newer issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This version has larger lenses." + icon_state = "m2gogglesblue" + active_icon_state = "m2gogglesblue_down" + inactive_icon_state = "m2gogglesblue" + prescription = TRUE + +/obj/item/clothing/glasses/mgoggles/v2/polarized_blue + name = "M1A1 marine polarized ballistic goggles" + desc = "Newer issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This version has larger polarized lenses." + icon_state = "polarizedblue" + active_icon_state = "polarizedblue_down" + inactive_icon_state = "polarizedblue" + +/obj/item/clothing/glasses/mgoggles/v2/polarized_blue/prescription + name = "prescription M1A1 marine polarized ballistic goggles" + desc = "Newer issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This version has larger polarized lenses." + icon_state = "polarizedblue" + active_icon_state = "polarizedblue_down" + inactive_icon_state = "polarizedblue" + prescription = TRUE + +/obj/item/clothing/glasses/mgoggles/v2/polarized_orange + name = "M1A1 marine polarized ballistic goggles" + desc = "Newer issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This version has larger polarized lenses." + icon_state = "polarizedorange" + active_icon_state = "polarizedorange_down" + inactive_icon_state = "polarizedorange" + +/obj/item/clothing/glasses/mgoggles/v2/polarized_orange/prescription + name = "prescription M1A1 marine polarized ballistic goggles" + desc = "Newer issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This version has larger polarized lenses." + icon_state = "polarizedorange" + active_icon_state = "polarizedorange_down" + inactive_icon_state = "polarizedorange" + prescription = TRUE + /obj/item/clothing/glasses/mgoggles/on_enter_storage(obj/item/storage/internal/S) ..() @@ -730,6 +855,52 @@ flags_equip_slot = SLOT_EYES|SLOT_FACE flags_obj = OBJ_IS_HELMET_GARB +/obj/item/clothing/glasses/sunglasses/big/fake + name = "\improper BiMax personal shades" + desc = "These are a bargain-bin pair of BiMex-style sunglasses—emphasis on the style. Marketed as 'BiMax,' with an 'A' to sidestep copyright, these knockoffs are popular with penny-pinching spacers and wannabe badasses. While the real deal boasts patented mirror refraction for atomic flash, solar radiation, and targeting laser protection, these cut-rate imitations barely keep UV rays at bay. As for that famous story of a laser pistol reflecting off the originals? Good luck finding anyone who believes these could pull it off. But hey, they’re cheap, and their 'Save the Budget and Look Cool Doing It' slogan really sells it." + icon_state = "bigsunglasses" + item_state = "bigsunglasses" + eye_protection = FALSE + clothing_traits = FALSE + +/obj/item/clothing/glasses/sunglasses/big/fake/red + icon_state = "bigsunglasses_red" + item_state = "bigsunglasses_red" + +/obj/item/clothing/glasses/sunglasses/big/fake/orange + icon_state = "bigsunglasses_orange" + item_state = "bigsunglasses_orange" + +/obj/item/clothing/glasses/sunglasses/big/fake/yellow + icon_state = "bigsunglasses_yellow" + item_state = "bigsunglasses_yellow" + +/obj/item/clothing/glasses/sunglasses/big/fake/green + icon_state = "bigsunglasses_green" + item_state = "bigsunglasses_green" + +/obj/item/clothing/glasses/sunglasses/big/fake/blue + icon_state = "bigsunglasses_blue" + item_state = "bigsunglasses_blue" + +/obj/item/clothing/glasses/sunglasses/big/new_bimex + name = "\improper BiMex Tactical Shades" + desc = "Sleek, angular shades designed for the modern operator. BiMex's latest 'TactOptix' line comes with advanced polarization and lightweight ballistic lenses capable of shrugging off small shrapnel impacts. A favorite among frontline operators and deep-space scouts, these shades are marketed as 'combat-tested and action-approved.' Rumors abound of lucky users surviving close-range laser shots thanks to the multi-reflective lens coating, though BiMex's official stance is to 'Stop standing in front of lasers.'" + icon_state = "bimex_polarized_yellow" + item_state = "bimex_polarized_yellow" + eye_protection = EYE_PROTECTION_FLASH + clothing_traits = list(TRAIT_BIMEX) + flags_equip_slot = SLOT_EYES|SLOT_FACE + flags_obj = OBJ_IS_HELMET_GARB + +/obj/item/clothing/glasses/sunglasses/big/new_bimex/black + icon_state = "bimex_black" + item_state = "bimex_black" + +/obj/item/clothing/glasses/sunglasses/big/new_bimex/bronze + icon_state = "bimex_polarized_bronze" + item_state = "bimex_polarized_bronze" + /obj/item/clothing/glasses/sunglasses/aviator name = "aviator shades" desc = "A pair of tan tinted sunglasses. You can faintly hear 80's music playing while wearing these." diff --git a/code/modules/clothing/gloves/marine_gloves.dm b/code/modules/clothing/gloves/marine_gloves.dm index 1d59d25b7990..5bb177a619e5 100644 --- a/code/modules/clothing/gloves/marine_gloves.dm +++ b/code/modules/clothing/gloves/marine_gloves.dm @@ -59,6 +59,13 @@ item_state = "brown" adopts_squad_color = FALSE +/obj/item/clothing/gloves/marine/grey + name = "marine grey combat gloves" + desc = "Standard issue marine tactical gloves. It reads: 'knit by Marine Widows Association'. These are a shade of grey instead of the classic black." + icon_state = "marine_grey" + item_state = "marine_grey" + adopts_squad_color = FALSE + /obj/item/clothing/gloves/marine/medical name = "marine medical combat gloves" desc = "Standard issue marine sterile gloves, offers regular protection whilst offering the user a better grip when performing medical work." diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index fbbd04f0a2be..af934336cfda 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -185,17 +185,36 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/clothing/glasses/mgoggles = PREFIX_HELMET_GARB_OVERRIDE, // helmet_ /obj/item/clothing/glasses/mgoggles/v2 = NO_GARB_OVERRIDE, /obj/item/clothing/glasses/mgoggles/v2/prescription = NO_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/blue = NO_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/blue/prescription = NO_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/polarized_blue = NO_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/polarized_blue/prescription = NO_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/polarized_orange = NO_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/polarized_orange/prescription = NO_GARB_OVERRIDE, /obj/item/clothing/glasses/mgoggles/prescription = PREFIX_HELMET_GARB_OVERRIDE, // helmet_ /obj/item/clothing/glasses/mgoggles/black = PREFIX_HELMET_GARB_OVERRIDE, // helmet_ /obj/item/clothing/glasses/mgoggles/black/prescription = PREFIX_HELMET_GARB_OVERRIDE, // helmet_ /obj/item/clothing/glasses/mgoggles/orange = PREFIX_HELMET_GARB_OVERRIDE, // helmet_ /obj/item/clothing/glasses/mgoggles/orange/prescription = PREFIX_HELMET_GARB_OVERRIDE, // helmet_ + /obj/item/clothing/glasses/mgoggles/blue = PREFIX_HELMET_GARB_OVERRIDE, // helmet_ + /obj/item/clothing/glasses/mgoggles/blue/prescription = PREFIX_HELMET_GARB_OVERRIDE, // helmet_ + /obj/item/clothing/glasses/mgoggles/purple = PREFIX_HELMET_GARB_OVERRIDE, // helmet_ + /obj/item/clothing/glasses/mgoggles/purple/prescription = PREFIX_HELMET_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/yellow = PREFIX_HELMET_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/yellow/prescription = PREFIX_HELMET_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/red = PREFIX_HELMET_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/red/prescription = PREFIX_HELMET_GARB_OVERRIDE, /obj/item/clothing/glasses/sunglasses = NO_GARB_OVERRIDE, /obj/item/clothing/glasses/sunglasses/prescription = NO_GARB_OVERRIDE, /obj/item/clothing/glasses/sunglasses/aviator = NO_GARB_OVERRIDE, /obj/item/clothing/glasses/sunglasses/big = NO_GARB_OVERRIDE, /obj/item/clothing/glasses/sunglasses/sechud = NO_GARB_OVERRIDE, /obj/item/clothing/glasses/eyepatch = NO_GARB_OVERRIDE, + /obj/item/clothing/glasses/eyepatch/left = NO_GARB_OVERRIDE, + /obj/item/clothing/glasses/eyepatch/white = NO_GARB_OVERRIDE, + /obj/item/clothing/glasses/eyepatch/white/left = NO_GARB_OVERRIDE, + /obj/item/clothing/glasses/eyepatch/green = NO_GARB_OVERRIDE, + /obj/item/clothing/glasses/eyepatch/green/left = NO_GARB_OVERRIDE, /obj/item/clothing/glasses/regular/hipster = NO_GARB_OVERRIDE, /obj/item/clothing/glasses/regular = NO_GARB_OVERRIDE, /obj/item/clothing/glasses/mbcg = NO_GARB_OVERRIDE, @@ -217,12 +236,16 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( // PREFERENCES GEAR /obj/item/prop/helmetgarb/gunoil = NO_GARB_OVERRIDE, /obj/item/prop/helmetgarb/netting = NO_GARB_OVERRIDE, + /obj/item/prop/helmetgarb/netting/desert = NO_GARB_OVERRIDE, + /obj/item/prop/helmetgarb/netting/jungle = NO_GARB_OVERRIDE, /obj/item/prop/helmetgarb/spent_buckshot = NO_GARB_OVERRIDE, /obj/item/prop/helmetgarb/spent_slug = NO_GARB_OVERRIDE, /obj/item/prop/helmetgarb/spent_flech = NO_GARB_OVERRIDE, /obj/item/prop/helmetgarb/cartridge = NO_GARB_OVERRIDE, /obj/item/prop/helmetgarb/prescription_bottle = NO_GARB_OVERRIDE, /obj/item/prop/helmetgarb/raincover = NO_GARB_OVERRIDE, + /obj/item/prop/helmetgarb/raincover/jungle = NO_GARB_OVERRIDE, + /obj/item/prop/helmetgarb/raincover/urban = NO_GARB_OVERRIDE, /obj/item/prop/helmetgarb/rabbitsfoot = NO_GARB_OVERRIDE, /obj/item/prop/helmetgarb/rosary = NO_GARB_OVERRIDE, // This one was already in the game for some reason, but never had an object /obj/item/prop/helmetgarb/lucky_feather = NO_GARB_OVERRIDE, diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 8e1259fe01d1..af1312a2491b 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -254,6 +254,67 @@ icon_state = "torn_scarf_black" item_state = "torn_scarf_black" +/obj/item/clothing/mask/rebreather/scarf/keffiyeh + name = "Keffiyeh" + desc = "A traditional headscarf worn for protection from the elements and to conceal the face. Typically made of cotton, it can provide shade from the sun, guard against dust, and serve as camouflage in arid environments. Often worn by soldiers and civilians alike in desert and hostile regions, the keffiyeh has become a symbol of cultural identity and resilience." + icon_state = "keffiyeh" + item_state = "keffiyeh" + original_state = "keffiyeh" + flags_inventory = COVERMOUTH|ALLOWREBREATH|ALLOWCPR + flags_inv_hide = HIDEFACE|HIDELOWHAIR + flags_cold_protection = BODY_FLAG_HEAD + min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT + +/obj/item/clothing/mask/rebreather/scarf/keffiyeh/white + icon_state = "keffiyeh_white" + item_state = "keffiyeh_white" + original_state = "keffiyeh_white" + +/obj/item/clothing/mask/rebreather/scarf/keffiyeh/red + icon_state = "keffiyeh_red" + item_state = "keffiyeh_red" + original_state = "keffiyeh_red" + +/obj/item/clothing/mask/rebreather/scarf/keffiyeh/green + icon_state = "keffiyeh_green" + item_state = "keffiyeh_green" + original_state = "keffiyeh_green" + +/obj/item/clothing/mask/rebreather/scarf/keffiyeh/black + icon_state = "keffiyeh_black" + item_state = "keffiyeh_black" + original_state = "keffiyeh_black" + +/obj/item/clothing/mask/tornscarf/smock + name = "tactical smock" + desc = "A tactical smock used to keep warm in the cold, and provide increased camouflage." + icon_state = "smock_jungle" + item_state = "smock_jungle" + w_class = SIZE_SMALL + flags_inventory = ALLOWCPR + flags_cold_protection = BODY_FLAG_HEAD + min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT + +/obj/item/clothing/mask/tornscarf/smock/classic + icon_state = "smock_classic" + item_state = "smock_classic" + +/obj/item/clothing/mask/tornscarf/smock/snow + icon_state = "smock_snow" + item_state = "smock_snow" + +/obj/item/clothing/mask/tornscarf/smock/desert + icon_state = "smock_desert" + item_state = "smock_desert" + +/obj/item/clothing/mask/tornscarf/smock/urban + icon_state = "smock_urban" + item_state = "smock_urban" + +/obj/item/clothing/mask/tornscarf/smock/black + icon_state = "smock_black" + item_state = "smock_black" + /obj/item/clothing/mask/owlf_mask name = "\improper OWLF gas mask" desc = "A close-fitting mask that can be connected to an air supply." diff --git a/code/modules/clothing/shoes/marine_shoes.dm b/code/modules/clothing/shoes/marine_shoes.dm index b71c69643ff4..ccaf6582b5d2 100644 --- a/code/modules/clothing/shoes/marine_shoes.dm +++ b/code/modules/clothing/shoes/marine_shoes.dm @@ -52,6 +52,20 @@ /obj/item/clothing/shoes/marine/brown/knife spawn_item_type = /obj/item/attachable/bayonet +/obj/item/clothing/shoes/marine/grey + icon_state = "marine_grey" + desc = "Standard issue combat boots for combat scenarios or combat situations. All combat, all the time. These are grey." + +/obj/item/clothing/shoes/marine/grey/knife + spawn_item_type = /obj/item/attachable/bayonet + +/obj/item/clothing/shoes/marine/urban + icon_state = "marine_grey_alt" + desc = "Don't go walkin' slow, the devil's on the loose." + +/obj/item/clothing/shoes/marine/urban/knife + spawn_item_type = /obj/item/attachable/bayonet + /obj/item/clothing/shoes/marine/monkey name = "monkey combat boots" desc = "A sturdy pair of combat boots, the reflection of the polished leather reflects your true self." diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index c54bfe1a98b7..f9e85832f8a8 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -462,7 +462,97 @@ desc = "A fire-resistant shoulder patch, worn by the men and women of the UPP Naval Infantry." icon_state = "navalpatch" -//misc +/obj/item/clothing/accessory/patch/ua + name = "United Americas patch" + desc = "A fire-resistant shoulder patch, worn by the men and women of the United Americas, An economic and political giant in both the Sol system and throughout the offworld colonies, the military might of the UA is unparalleled.." + icon_state = "uapatch" + +/obj/item/clothing/accessory/patch/falconalt + name = "USCM Falling Falcons UA patch" + desc = "A fire-resistant shoulder patch, worn by the men and women of the Falling Falcons, the 2nd battalion of the 4th brigade of the USCM." + icon_state = "fallingfalconsaltpatch" + +/obj/item/clothing/accessory/patch/twe + name = "Three World Empire patch" + desc = "A fire-resistant shoulder patch, worn by the men and women loyal to the Three World Empire, An older style symbol of the TWE." + icon_state = "twepatch" + +/obj/item/clothing/accessory/patch/falconlarge + name = "USCM Falling Falcons chest patch" + desc = "A fire-resistant shoulder patch, worn by the men and women of the Falling Falcons, the 2nd battalion of the 4th brigade of the USCM." + icon_state = "fallingfalconsbigpatch" + +/obj/item/clothing/accessory/patch/wy + name = "Weyland-Yutani patch" + desc = "A fire-resistant black shoulder patch featuring the Weyland-Yutani logo. A symbol of loyalty to the corporation, or perhaps ironic mockery, depending on your viewpoint." + icon_state = "wypatch" + +/obj/item/clothing/accessory/patch/wy_faction + name = "Weyland-Yutani patch" // For WY factions like PMC's - on the right shoulder rather then left. + desc = "A fire-resistant black shoulder patch featuring the Weyland-Yutani logo. A symbol of loyalty to the corporation." + icon_state = "wypatch_faction" + +/obj/item/clothing/accessory/patch/wy_white + name = "Weyland-Yutani patch" + desc = "A fire-resistant white shoulder patch featuring the Weyland-Yutani logo. A symbol of loyalty to the corporation, or perhaps ironic mockery, depending on your viewpoint." + icon_state = "wypatch_white" + +/obj/item/clothing/accessory/patch/wyfury + name = "Weyland-Yutani Fury '161' patch" + desc = "A fire-resistant shoulder patch. Was worn by workers and then later prisoners on the Fiorina 'Fury' 161 facility, a rare relic, after the facility went dark in 2179." + icon_state = "fury161patch" + +/obj/item/clothing/accessory/patch/upp/alt + name = "UPP patch" + desc = "An old fire-resistant shoulder patch, worn by the men and women of the Union of Progressive Peoples Armed Collective." + icon_state = "upppatch_alt" + +/obj/item/clothing/accessory/patch/falcon/squad/alpha + name = "USCM Falling Falcons patch" + desc = "A fire-resistant shoulder patch, a squad patch worn by the Falling Falcons—2nd Battalion, 4th Brigade, USCM. Stitched in Alpha Squad's bold red" + icon_state = "fallingfalcons_alpha" + +/obj/item/clothing/accessory/patch/falcon/squad/bravo + name = "USCM Falling Falcons patch" + desc = "A fire-resistant shoulder patch, a squad patch worn by the Falling Falcons—2nd Battalion, 4th Brigade, USCM. Stitched in Bravo Squad's bold yellow." + icon_state = "fallingfalcons_bravo" + +/obj/item/clothing/accessory/patch/falcon/squad/charlie + name = "USCM Falling Falcons patch" + desc = "A fire-resistant shoulder patch, a squad patch worn by the Falling Falcons—2nd Battalion, 4th Brigade, USCM. Stitched in Charlie Squad's deep purple." + icon_state = "fallingfalcons_charlie" + +/obj/item/clothing/accessory/patch/falcon/squad/delta + name = "USCM Falling Falcons patch" + desc = "A fire-resistant shoulder patch, a squad patch worn by the Falling Falcons—2nd Battalion, 4th Brigade, USCM. Stitched in Delta Squad's striking blue." + icon_state = "fallingfalcons_delta" + +/obj/item/clothing/accessory/patch/falcon/squad/echo + name = "USCM Falling Falcons patch" + desc = "A fire-resistant shoulder patch, a squad patch worn by the Falling Falcons—2nd Battalion, 4th Brigade, USCM. Stitched in Echo Squad's vivid green." + icon_state = "fallingfalcons_echo" + +/obj/item/clothing/accessory/patch/sons_of_mars + name = "Sons of Mars patch" + desc = "An old, worn fire-resistant circular patch with a gold star on a split orange and red background. Once worn by members of the Sons of Mars, a resistance group that fought against corporate control on Mars. Though not forgotten, the patch serves as a reminder of a time when Martian rebels stood defiant, a symbol of rebellion largely overlooked in today's era." + icon_state = "sompatch" + +/obj/item/clothing/accessory/patch/freelancer_patch + name = "Freelancer's Guild patch" + desc = "A fire-resistant circular patch featuring a white skull on a vertically split black and blue background. Worn by a skilled mercenary of the Freelancers, a well-equipped group for hire across the outer colonies, known for their professionalism and neutrality. This patch is a personal memento from the wearer’s time with the group, representing a life spent navigating the dangerous world of mercenary contracts." + icon_state = "mercpatch" + +/obj/item/clothing/accessory/patch/merc_patch + name = "Old Freelancer's Guild patch" + desc = "An old, worn fire-resistant circular patch featuring a white skull on a vertically split black and red background. Worn by a well-equipped mercenary group for hire across the outer colonies, known for their professionalism and neutrality. The current owner’s connection to the patch is unclear—whether it was once earned as part of service, kept as a memento, or simply found, disconnected from its original wearer." + icon_state = "mercpatch_red" + +/obj/item/clothing/accessory/patch/medic_patch + name = "Field Medic patch" + desc = "A circular patch featuring a red cross on a white background with a bold red outline. Universally recognized as a symbol of aid and neutrality, it is worn by medics across the colonies. Whether a sign of true medical expertise, a keepsake, or merely a decoration, its presence offers a glimmer of hope in dire times." + icon_state = "medicpatch" + +// Misc /obj/item/clothing/accessory/dogtags name = "Attachable Dogtags" @@ -604,6 +694,11 @@ icon_state = "webbing" hold = /obj/item/storage/internal/accessory/webbing +/obj/item/clothing/accessory/storage/webbing/black + name = "black webbing" + icon_state = "webbing_black" + item_state = "webbing_black" + /obj/item/clothing/accessory/storage/webbing/five_slots hold = /obj/item/storage/internal/accessory/webbing/five_slots diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index 6f1e84b1421b..491e853a7e98 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -206,10 +206,10 @@ if(current_gear) if(current_gear.allowed_roles && !(assignment in current_gear.allowed_roles)) to_chat(new_human, SPAN_WARNING("Custom gear [current_gear.display_name] cannot be equipped: Invalid Role")) - return + continue if(current_gear.allowed_origins && !(new_human.origin in current_gear.allowed_origins)) to_chat(new_human, SPAN_WARNING("Custom gear [current_gear.display_name] cannot be equipped: Invalid Origin")) - return + continue if(!(current_gear.slot && new_human.equip_to_slot_or_del(new current_gear.path, current_gear.slot))) var/obj/equipping_gear = new current_gear.path new_human.equip_to_slot_or_del(equipping_gear, WEAR_IN_BACK) diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm index 81cb64644b93..77e9ff1f5799 100644 --- a/code/modules/gear_presets/clf.dm +++ b/code/modules/gear_presets/clf.dm @@ -148,7 +148,8 @@ list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), list("Random Useful (Or Not) Item", 5, /obj/effect/essentials_set/random/clf_bonus_item, null, VENDOR_ITEM_REGULAR), list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR) + list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), + list("Black Webbing", 10, /obj/item/clothing/accessory/storage/webbing/black, null, VENDOR_ITEM_REGULAR), ) diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index b33e564985d0..4bdac6312921 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -769,6 +769,7 @@ new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/freelancer_patch, WEAR_ACCESSORY) spawn_merc_helmet(new_human) /datum/equipment_preset/corpse/freelancer/burst diff --git a/code/modules/gear_presets/other.dm b/code/modules/gear_presets/other.dm index fc2ebe3d0e63..8ee6356f37a6 100644 --- a/code/modules/gear_presets/other.dm +++ b/code/modules/gear_presets/other.dm @@ -71,6 +71,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/freelancer, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/freelancer_patch, WEAR_ACCESSORY) spawn_merc_helmet(new_human) //storage and specific stuff, they all get an ERT medpouch. new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch, WEAR_L_EAR) @@ -151,6 +152,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/freelancer, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/freelancer_patch, WEAR_ACCESSORY) spawn_merc_helmet(new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch, WEAR_L_EAR) @@ -218,6 +220,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/freelancer/beret, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/freelancer_patch, WEAR_ACCESSORY) if(new_human.disabilities & NEARSIGHTED) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES) else diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm index 00958227c7d8..793c2fa83a5b 100644 --- a/code/modules/gear_presets/pmc.dm +++ b/code/modules/gear_presets/pmc.dm @@ -69,6 +69,7 @@ var/choice = rand(1,5) new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) if(prob(50)) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET) else @@ -193,6 +194,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), + list("Black Webbing", 10, /obj/item/clothing/accessory/storage/webbing/black, null, VENDOR_ITEM_REGULAR), list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), ) @@ -210,6 +212,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) if(prob(50)) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET) else @@ -347,6 +350,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) if(new_human.disabilities & NEARSIGHTED) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES) else @@ -524,6 +528,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) @@ -713,6 +718,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) @@ -869,6 +875,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) @@ -1009,6 +1016,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/gunner, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) @@ -1118,6 +1126,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles/m42c, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/m39/full/elite, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) @@ -1242,6 +1251,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tank, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) spawn_weapon(/obj/item/weapon/gun/smg/m39/elite, /obj/item/ammo_magazine/smg/m39/ap, new_human, 0, 0) @@ -1366,6 +1376,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) @@ -1518,6 +1529,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) if(new_human.disabilities & NEARSIGHTED) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES) @@ -1694,6 +1706,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) @@ -1842,6 +1855,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/director, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/pmc, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable, WEAR_BACK) @@ -1912,6 +1926,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/leader, WEAR_HEAD) new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) diff --git a/code/modules/gear_presets/survivors/misc.dm b/code/modules/gear_presets/survivors/misc.dm index 7d02b5084a66..1bc4d6298fee 100644 --- a/code/modules/gear_presets/survivors/misc.dm +++ b/code/modules/gear_presets/survivors/misc.dm @@ -193,6 +193,7 @@ Everything below isn't used or out of place. new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) diff --git a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm index 941bdcfe51b3..97409d970296 100644 --- a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm +++ b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm @@ -35,6 +35,7 @@ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/hvh, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) add_pmc_survivor_weapon(new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) @@ -62,6 +63,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) if(new_human.disabilities & NEARSIGHTED) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES) else @@ -88,6 +90,7 @@ new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/med_small_stack(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_R_HAND) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/cct/hvh, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) ..() // /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_leader @@ -208,6 +211,7 @@ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/leader, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/command/hvh, WEAR_L_EAR) diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index b50ee579182b..e0e4ba790717 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -366,7 +366,8 @@ WEAR_HANDS = /obj/item/clothing/gloves/marine/veteran, WEAR_R_HAND = /obj/item/storage/pouch/flare/full, WEAR_FEET = /obj/item/clothing/shoes/marine/upp/knife, - WEAR_L_HAND = /obj/item/storage/large_holster/katana/full + WEAR_L_HAND = /obj/item/storage/large_holster/katana/full, + WEAR_ACCESSORY = /obj/item/clothing/accessory/patch/freelancer_patch ) /datum/equipment_preset/synth/survivor/surveyor_synth diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 433caeac2264..f5e834244cc0 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -234,6 +234,7 @@ list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Black Webbing", 10, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("ENGINEERING SUPPLIES", 0, null, null, null), diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 4632e4a458c5..ec4fa3b01201 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -28,6 +28,7 @@ name = "USCM Corporate Liaison (CL)" faction_group = FACTION_LIST_MARINE_WY flags = EQUIPMENT_PRESET_START_OF_ROUND + origin_override = ORIGIN_CIVILIAN idtype = /obj/item/card/id/silver/cl access = list( @@ -145,6 +146,7 @@ /datum/equipment_preset/uscm_ship/reporter name = "Combat Correspondent (Press)" flags = EQUIPMENT_PRESET_START_OF_ROUND + origin_override = ORIGIN_CIVILIAN access = list( ACCESS_MARINE_COMMAND, @@ -179,6 +181,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/device/camera(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) // Needs backpack for loadout gear to spawn /datum/equipment_preset/uscm_ship/reporter/load_preset(mob/living/carbon/human/new_human, randomise, count_participant, client/mob_client, show_job_gear) . = ..() diff --git a/code/modules/gear_presets/whiteout.dm b/code/modules/gear_presets/whiteout.dm index 3382f145f04e..874eb87eee29 100644 --- a/code/modules/gear_presets/whiteout.dm +++ b/code/modules/gear_presets/whiteout.dm @@ -47,6 +47,8 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/EX, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/EX, WEAR_IN_BACK) + // accessory + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) //face new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles/m42c, WEAR_EYES) @@ -98,6 +100,8 @@ new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) + // accessory + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) //face new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/medhud, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) @@ -149,6 +153,8 @@ new_human.equip_to_slot_or_del(M, WEAR_BODY) for(var/i in 1 to W.hold.storage_slots) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_ACCESSORY) + // accessory + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) //jacket var/obj/item/clothing/suit/storage/marine/smartgunner/veteran/pmc/terminator/armor = new() new_human.equip_to_slot_or_del(armor, WEAR_JACKET) @@ -200,6 +206,8 @@ new_human.equip_to_slot_or_del(M, WEAR_BODY) for(var/i in 1 to W.hold.storage_slots) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_ACCESSORY) + // accessory + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) //jacket var/obj/item/clothing/suit/storage/marine/veteran/pmc/commando/armor = new() new_human.equip_to_slot_or_del(armor, WEAR_JACKET) @@ -250,6 +258,8 @@ new_human.equip_to_slot_or_del(uniform, WEAR_BODY) for(var/i in 1 to accessory.hold.storage_slots) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_ACCESSORY) + // accessory + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) //jacket var/obj/item/clothing/suit/storage/marine/veteran/pmc/commando/armor = new() new_human.equip_to_slot_or_del(armor, WEAR_JACKET) @@ -303,6 +313,8 @@ for(var/i in 1 to armor.storage_slots) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) + // accessory + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) //waist new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/flamer/deathsquad/standard, WEAR_WAIST) //limbs @@ -337,6 +349,8 @@ for(var/i in 1 to armor.storage_slots) new_human.equip_to_slot_or_del(new /obj/item/stack/nanopaste, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/dirty, WEAR_J_STORE) + // accessory + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) //waist new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/pmc/full, WEAR_WAIST) //limbs @@ -385,6 +399,8 @@ for(var/i in 1 to armor.storage_slots) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/elite, WEAR_J_STORE) + // accessory + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) //waist new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/full, WEAR_WAIST) //limbs diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 3a1a840c5eed..be399d2296e7 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -343,14 +343,65 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/bayonet/rmc name = "\improper L5 bayonet" desc = "The standard-issue bayonet of the RMC, the L5 is balanced to also function as an effective throwing knife." - icon_state = "upp_bayonet" // PLACEHOLDER PLEASE REPLACE + icon_state = "twe_bayonet" // PLACEHOLDER PLEASE REPLACE item_state = "combat_knife" - attach_icon = "upp_bayonet_a" // PLACEHOLDER PLEASE REPLACE + attach_icon = "twe_bayonet_a" // PLACEHOLDER PLEASE REPLACE throwforce = MELEE_FORCE_TIER_10 //doubled by throwspeed to 100 throw_speed = SPEED_REALLY_FAST throw_range = 7 pry_delay = 1 SECONDS +/obj/item/attachable/bayonet/antique + name = "\improper antique bayonet" + desc = "An antique-style bayonet, has a long blade, wooden handle with brass fittings, reflecting historical craftsmanship." + icon_state = "antique_bayonet" + item_state = "combat_knife" + attach_icon = "antique_bayonet_a" + +/obj/item/attachable/bayonet/rmc_replica + name = "\improper L5 bayonet" + desc = "The standard-issue bayonet of the RMC, it's dulled from heavy use." + icon_state = "twe_bayonet" + item_state = "combat_knife" + attach_icon = "twe_bayonet_a" + +/obj/item/attachable/bayonet/custom + name = "\improper M5 'Raven's Claw' tactical bayonet" + desc = "A prototype bayonet-combat knife hybrid, engineered for close-quarters engagements and urban operations. Its rugged construction, quick-detach mechanism and deadly versatility make it a formidable tool." + icon_state = "bayonet_custom" + item_state = "combat_knife" + attach_icon = "bayonet_custom_a" + +/obj/item/attachable/bayonet/custom/red + desc = "A prototype bayonet-combat knife hybrid, engineered for close-quarters engagements and urban operations. Its rugged construction, quick-detach mechanism and deadly versatility make it a formidable tool. This version has been customized with a red grip and gold detailing, giving it a unique and distinctive appearance." + icon_state = "bayonet_custom_red" + item_state = "combat_knife" + attach_icon = "bayonet_custom_red_a" + +/obj/item/attachable/bayonet/custom/blue + desc = "A prototype bayonet-combat knife hybrid, engineered for close-quarters engagements and urban operations. Its rugged construction, quick-detach mechanism and deadly versatility make it a formidable tool. This version has been customized with a blue grip and gold detailing, giving it a unique and distinctive appearance." + icon_state = "bayonet_custom_blue" + item_state = "combat_knife" + attach_icon = "bayonet_custom_blue_a" + +/obj/item/attachable/bayonet/custom/black + desc = "A prototype bayonet-combat knife hybrid, engineered for close-quarters engagements and urban operations. Its rugged construction, quick-detach mechanism and deadly versatility make it a formidable tool. This version has been customized with a black grip and gold detailing, giving it a unique and distinctive appearance." + icon_state = "bayonet_custom_black" + item_state = "combat_knife" + attach_icon = "bayonet_custom_black_a" + +/obj/item/attachable/bayonet/tanto + name = "\improper T9 tactical bayonet" + desc = "Preferred by TWE colonial military forces in the Neroid Sector, the T9 is designed for urban combat with a durable tanto blade and quick-attach system, reflecting traditional Japanese blade influences. Occasionally seen in the hands of Colonial Liberation Front (CLF) forces, often stolen from TWE detatchments and outposts across the sector." + icon_state = "bayonet_tanto" + item_state = "combat_knife" + attach_icon = "bayonet_tanto_a" + +/obj/item/attachable/bayonet/tanto/blue + icon_state = "bayonet_tanto_alt" + item_state = "combat_knife" + attach_icon = "bayonet_tanto_alt_a" + /obj/item/attachable/bayonet/van_bandolier name = "\improper Fairbairn-Sykes fighting knife" desc = "This isn't for dressing game or performing camp chores. It's almost certainly not an original. Almost." diff --git a/code/modules/projectiles/guns/boltaction.dm b/code/modules/projectiles/guns/boltaction.dm index 976a94c3e750..a5c9d4ca39fb 100644 --- a/code/modules/projectiles/guns/boltaction.dm +++ b/code/modules/projectiles/guns/boltaction.dm @@ -30,6 +30,15 @@ /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/co2, /obj/item/attachable/bayonet/upp, + /obj/item/attachable/bayonet/antique, + /obj/item/attachable/bayonet/custom, + /obj/item/attachable/bayonet/custom/red, + /obj/item/attachable/bayonet/custom/blue, + /obj/item/attachable/bayonet/custom/black, + /obj/item/attachable/bayonet/tanto, + /obj/item/attachable/bayonet/tanto/blue, + /obj/item/attachable/bayonet/rmc_replica, + /obj/item/attachable/bayonet/rmc, /obj/item/attachable/scope, /obj/item/attachable/scope/mini, /obj/item/attachable/scope/mini/hunting, diff --git a/code/modules/projectiles/guns/lever_action.dm b/code/modules/projectiles/guns/lever_action.dm index 8fa95812839f..a9af716d3bdb 100644 --- a/code/modules/projectiles/guns/lever_action.dm +++ b/code/modules/projectiles/guns/lever_action.dm @@ -325,6 +325,15 @@ their unique feature is that a direct hit will buff your damage and firerate attachable_allowed = list( /obj/item/attachable/bayonet/upp, // Barrel /obj/item/attachable/bayonet, + /obj/item/attachable/bayonet/antique, + /obj/item/attachable/bayonet/custom, + /obj/item/attachable/bayonet/custom/red, + /obj/item/attachable/bayonet/custom/blue, + /obj/item/attachable/bayonet/custom/black, + /obj/item/attachable/bayonet/tanto, + /obj/item/attachable/bayonet/tanto/blue, + /obj/item/attachable/bayonet/rmc_replica, + /obj/item/attachable/bayonet/rmc, /obj/item/attachable/extended_barrel, /obj/item/attachable/heavy_barrel, /obj/item/attachable/suppressor, diff --git a/code/modules/projectiles/guns/pistols.dm b/code/modules/projectiles/guns/pistols.dm index 4a810700ddea..833bf07b6ce2 100644 --- a/code/modules/projectiles/guns/pistols.dm +++ b/code/modules/projectiles/guns/pistols.dm @@ -503,6 +503,15 @@ /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp_replica, /obj/item/attachable/bayonet/upp, + /obj/item/attachable/bayonet/antique, + /obj/item/attachable/bayonet/custom, + /obj/item/attachable/bayonet/custom/red, + /obj/item/attachable/bayonet/custom/blue, + /obj/item/attachable/bayonet/custom/black, + /obj/item/attachable/bayonet/tanto, + /obj/item/attachable/bayonet/tanto/blue, + /obj/item/attachable/bayonet/rmc_replica, + /obj/item/attachable/bayonet/rmc, /obj/item/attachable/extended_barrel, /obj/item/attachable/heavy_barrel, /obj/item/attachable/compensator, diff --git a/code/modules/projectiles/guns/revolvers.dm b/code/modules/projectiles/guns/revolvers.dm index 1e6b052983ce..afeca64385c9 100644 --- a/code/modules/projectiles/guns/revolvers.dm +++ b/code/modules/projectiles/guns/revolvers.dm @@ -304,6 +304,15 @@ attachable_allowed = list( /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp, + /obj/item/attachable/bayonet/antique, + /obj/item/attachable/bayonet/custom, + /obj/item/attachable/bayonet/custom/red, + /obj/item/attachable/bayonet/custom/blue, + /obj/item/attachable/bayonet/custom/black, + /obj/item/attachable/bayonet/tanto, + /obj/item/attachable/bayonet/tanto/blue, + /obj/item/attachable/bayonet/rmc_replica, + /obj/item/attachable/bayonet/rmc, /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, @@ -530,6 +539,11 @@ accuracy_mult_unwielded = BASE_ACCURACY_MULT * 2 addtimer(CALLBACK(src, PROC_REF(recalculate_attachment_bonuses)), 3 SECONDS) +/obj/item/weapon/gun/revolver/small/black + name = "\improper S&W .38 model 37 Custom revolver" + desc = "A Custom, lean .38 made by Smith & Wesson. A timeless classic, from antiquity to the future. This specific model, with its sleek black body and custom ivory grips, is known to be wildly inaccurate, yet extremely lethal." + icon_state = "black_sw357" + item_state = "black_sw357" //------------------------------------------------------- //BURST REVOLVER //Mateba is pretty well known. The cylinder folds up instead of to the side. diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 7f5a476f2339..8ed3ad346918 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -56,6 +56,15 @@ /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp, /obj/item/attachable/bayonet/co2, + /obj/item/attachable/bayonet/antique, + /obj/item/attachable/bayonet/custom, + /obj/item/attachable/bayonet/custom/red, + /obj/item/attachable/bayonet/custom/blue, + /obj/item/attachable/bayonet/custom/black, + /obj/item/attachable/bayonet/tanto, + /obj/item/attachable/bayonet/tanto/blue, + /obj/item/attachable/bayonet/rmc_replica, + /obj/item/attachable/bayonet/rmc, /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/verticalgrip, diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index bceffc7c4ddf..cfebb0252d15 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -257,6 +257,15 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp, /obj/item/attachable/bayonet/co2, + /obj/item/attachable/bayonet/antique, + /obj/item/attachable/bayonet/custom, + /obj/item/attachable/bayonet/custom/red, + /obj/item/attachable/bayonet/custom/blue, + /obj/item/attachable/bayonet/custom/black, + /obj/item/attachable/bayonet/tanto, + /obj/item/attachable/bayonet/tanto/blue, + /obj/item/attachable/bayonet/rmc_replica, + /obj/item/attachable/bayonet/rmc, /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, @@ -1094,6 +1103,15 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp, /obj/item/attachable/bayonet/co2, + /obj/item/attachable/bayonet/antique, + /obj/item/attachable/bayonet/custom, + /obj/item/attachable/bayonet/custom/red, + /obj/item/attachable/bayonet/custom/blue, + /obj/item/attachable/bayonet/custom/black, + /obj/item/attachable/bayonet/tanto, + /obj/item/attachable/bayonet/tanto/blue, + /obj/item/attachable/bayonet/rmc_replica, + /obj/item/attachable/bayonet/rmc, /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/verticalgrip, diff --git a/code/modules/projectiles/guns/smgs.dm b/code/modules/projectiles/guns/smgs.dm index e368327fe6eb..29b254ed2b0a 100644 --- a/code/modules/projectiles/guns/smgs.dm +++ b/code/modules/projectiles/guns/smgs.dm @@ -68,6 +68,15 @@ /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp, /obj/item/attachable/bayonet/co2, + /obj/item/attachable/bayonet/antique, + /obj/item/attachable/bayonet/custom, + /obj/item/attachable/bayonet/custom/red, + /obj/item/attachable/bayonet/custom/blue, + /obj/item/attachable/bayonet/custom/black, + /obj/item/attachable/bayonet/tanto, + /obj/item/attachable/bayonet/tanto/blue, + /obj/item/attachable/bayonet/rmc_replica, + /obj/item/attachable/bayonet/rmc, /obj/item/attachable/heavy_barrel, /obj/item/attachable/scope/mini, /obj/item/attachable/magnetic_harness, diff --git a/code/modules/projectiles/guns/specialist/scout.dm b/code/modules/projectiles/guns/specialist/scout.dm index 5de5a0424a0d..86907a07be84 100644 --- a/code/modules/projectiles/guns/specialist/scout.dm +++ b/code/modules/projectiles/guns/specialist/scout.dm @@ -38,6 +38,15 @@ /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp, /obj/item/attachable/bayonet/co2, + /obj/item/attachable/bayonet/antique, + /obj/item/attachable/bayonet/custom, + /obj/item/attachable/bayonet/custom/red, + /obj/item/attachable/bayonet/custom/blue, + /obj/item/attachable/bayonet/custom/black, + /obj/item/attachable/bayonet/tanto, + /obj/item/attachable/bayonet/tanto/blue, + /obj/item/attachable/bayonet/rmc_replica, + /obj/item/attachable/bayonet/rmc, /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, diff --git a/code/modules/projectiles/guns/specialist/sniper.dm b/code/modules/projectiles/guns/specialist/sniper.dm index ea1fea3ca168..993d64277796 100644 --- a/code/modules/projectiles/guns/specialist/sniper.dm +++ b/code/modules/projectiles/guns/specialist/sniper.dm @@ -508,6 +508,15 @@ /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp_replica, /obj/item/attachable/bayonet/upp, + /obj/item/attachable/bayonet/antique, + /obj/item/attachable/bayonet/custom, + /obj/item/attachable/bayonet/custom/red, + /obj/item/attachable/bayonet/custom/blue, + /obj/item/attachable/bayonet/custom/black, + /obj/item/attachable/bayonet/tanto, + /obj/item/attachable/bayonet/tanto/blue, + /obj/item/attachable/bayonet/rmc_replica, + /obj/item/attachable/bayonet/rmc, //Under, /obj/item/attachable/verticalgrip, /obj/item/attachable/bipod, diff --git a/icons/mob/humans/onmob/clothing/accessory/patches.dmi b/icons/mob/humans/onmob/clothing/accessory/patches.dmi index e6536bfa29c6..812fe7c3a2d3 100644 Binary files a/icons/mob/humans/onmob/clothing/accessory/patches.dmi and b/icons/mob/humans/onmob/clothing/accessory/patches.dmi differ diff --git a/icons/mob/humans/onmob/clothing/accessory/webbings.dmi b/icons/mob/humans/onmob/clothing/accessory/webbings.dmi index a21a61515165..f25ab677c7df 100644 Binary files a/icons/mob/humans/onmob/clothing/accessory/webbings.dmi and b/icons/mob/humans/onmob/clothing/accessory/webbings.dmi differ diff --git a/icons/mob/humans/onmob/clothing/feet.dmi b/icons/mob/humans/onmob/clothing/feet.dmi index 2f0c62b5fe80..290076bd6b33 100644 Binary files a/icons/mob/humans/onmob/clothing/feet.dmi and b/icons/mob/humans/onmob/clothing/feet.dmi differ diff --git a/icons/mob/humans/onmob/clothing/glasses/glasses.dmi b/icons/mob/humans/onmob/clothing/glasses/glasses.dmi index 388d15864609..2137ac9c6b36 100644 Binary files a/icons/mob/humans/onmob/clothing/glasses/glasses.dmi and b/icons/mob/humans/onmob/clothing/glasses/glasses.dmi differ diff --git a/icons/mob/humans/onmob/clothing/glasses/goggles.dmi b/icons/mob/humans/onmob/clothing/glasses/goggles.dmi index 4c13fbc50f74..a6a10ce3652d 100644 Binary files a/icons/mob/humans/onmob/clothing/glasses/goggles.dmi and b/icons/mob/humans/onmob/clothing/glasses/goggles.dmi differ diff --git a/icons/mob/humans/onmob/clothing/glasses/misc.dmi b/icons/mob/humans/onmob/clothing/glasses/misc.dmi index a5fe7dc81d8a..b839c3326e48 100644 Binary files a/icons/mob/humans/onmob/clothing/glasses/misc.dmi and b/icons/mob/humans/onmob/clothing/glasses/misc.dmi differ diff --git a/icons/mob/humans/onmob/clothing/hands.dmi b/icons/mob/humans/onmob/clothing/hands.dmi index fb3890c55e52..623760564949 100644 Binary files a/icons/mob/humans/onmob/clothing/hands.dmi and b/icons/mob/humans/onmob/clothing/hands.dmi differ diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/goggles.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/goggles.dmi index 8e2d6ed9eae1..68037cd439a0 100644 Binary files a/icons/mob/humans/onmob/clothing/helmet_garb/goggles.dmi and b/icons/mob/humans/onmob/clothing/helmet_garb/goggles.dmi differ diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/helmet_covers.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/helmet_covers.dmi index 5031832b303f..f337751d4cac 100644 Binary files a/icons/mob/humans/onmob/clothing/helmet_garb/helmet_covers.dmi and b/icons/mob/humans/onmob/clothing/helmet_garb/helmet_covers.dmi differ diff --git a/icons/mob/humans/onmob/clothing/masks/balaclava.dmi b/icons/mob/humans/onmob/clothing/masks/balaclava.dmi index ab306965eed1..4483216fb6bd 100644 Binary files a/icons/mob/humans/onmob/clothing/masks/balaclava.dmi and b/icons/mob/humans/onmob/clothing/masks/balaclava.dmi differ diff --git a/icons/mob/humans/onmob/clothing/masks/scarves.dmi b/icons/mob/humans/onmob/clothing/masks/scarves.dmi index 82961b4d47e7..d5436b7e23d0 100644 Binary files a/icons/mob/humans/onmob/clothing/masks/scarves.dmi and b/icons/mob/humans/onmob/clothing/masks/scarves.dmi differ diff --git a/icons/mob/humans/onmob/human_face.dmi b/icons/mob/humans/onmob/human_face.dmi index f009b47fdee1..97f5825bc03d 100644 Binary files a/icons/mob/humans/onmob/human_face.dmi and b/icons/mob/humans/onmob/human_face.dmi differ diff --git a/icons/obj/items/clothing/accessory/inventory_overlays/webbings.dmi b/icons/obj/items/clothing/accessory/inventory_overlays/webbings.dmi index 08d18dc15466..1274676d64a9 100644 Binary files a/icons/obj/items/clothing/accessory/inventory_overlays/webbings.dmi and b/icons/obj/items/clothing/accessory/inventory_overlays/webbings.dmi differ diff --git a/icons/obj/items/clothing/accessory/medals.dmi b/icons/obj/items/clothing/accessory/medals.dmi index f6150c0a8dff..b28f091acd61 100644 Binary files a/icons/obj/items/clothing/accessory/medals.dmi and b/icons/obj/items/clothing/accessory/medals.dmi differ diff --git a/icons/obj/items/clothing/accessory/patches.dmi b/icons/obj/items/clothing/accessory/patches.dmi index 6fe5fe8487ee..a3f233db401c 100644 Binary files a/icons/obj/items/clothing/accessory/patches.dmi and b/icons/obj/items/clothing/accessory/patches.dmi differ diff --git a/icons/obj/items/clothing/accessory/webbings.dmi b/icons/obj/items/clothing/accessory/webbings.dmi index 382d6e871edc..d92784e50714 100644 Binary files a/icons/obj/items/clothing/accessory/webbings.dmi and b/icons/obj/items/clothing/accessory/webbings.dmi differ diff --git a/icons/obj/items/clothing/glasses/glasses.dmi b/icons/obj/items/clothing/glasses/glasses.dmi index e6239836877b..e0422835730f 100644 Binary files a/icons/obj/items/clothing/glasses/glasses.dmi and b/icons/obj/items/clothing/glasses/glasses.dmi differ diff --git a/icons/obj/items/clothing/glasses/goggles.dmi b/icons/obj/items/clothing/glasses/goggles.dmi index 6b54413d597a..c6726197a68a 100644 Binary files a/icons/obj/items/clothing/glasses/goggles.dmi and b/icons/obj/items/clothing/glasses/goggles.dmi differ diff --git a/icons/obj/items/clothing/glasses/misc.dmi b/icons/obj/items/clothing/glasses/misc.dmi index 9ccab4aa318b..58a4485b989a 100644 Binary files a/icons/obj/items/clothing/glasses/misc.dmi and b/icons/obj/items/clothing/glasses/misc.dmi differ diff --git a/icons/obj/items/clothing/gloves.dmi b/icons/obj/items/clothing/gloves.dmi index e3529b9e3668..49912d4f7c64 100644 Binary files a/icons/obj/items/clothing/gloves.dmi and b/icons/obj/items/clothing/gloves.dmi differ diff --git a/icons/obj/items/clothing/helmet_garb.dmi b/icons/obj/items/clothing/helmet_garb.dmi index 28b36d800e2c..f1b9e47e7ae9 100644 Binary files a/icons/obj/items/clothing/helmet_garb.dmi and b/icons/obj/items/clothing/helmet_garb.dmi differ diff --git a/icons/obj/items/clothing/masks/balaclava.dmi b/icons/obj/items/clothing/masks/balaclava.dmi index c73fef1deab3..8fa056c8b371 100644 Binary files a/icons/obj/items/clothing/masks/balaclava.dmi and b/icons/obj/items/clothing/masks/balaclava.dmi differ diff --git a/icons/obj/items/clothing/masks/scarves.dmi b/icons/obj/items/clothing/masks/scarves.dmi index 0309a3f96f99..8315228330e9 100644 Binary files a/icons/obj/items/clothing/masks/scarves.dmi and b/icons/obj/items/clothing/masks/scarves.dmi differ diff --git a/icons/obj/items/clothing/shoes.dmi b/icons/obj/items/clothing/shoes.dmi index e85d3baf6f1e..f5c0ff2d081f 100644 Binary files a/icons/obj/items/clothing/shoes.dmi and b/icons/obj/items/clothing/shoes.dmi differ diff --git a/icons/obj/items/paint.dmi b/icons/obj/items/paint.dmi index e540b5bdfe72..2cc3661878a1 100644 Binary files a/icons/obj/items/paint.dmi and b/icons/obj/items/paint.dmi differ diff --git a/icons/obj/items/tools.dmi b/icons/obj/items/tools.dmi index 15ee2bd336ed..ec636ab78303 100644 Binary files a/icons/obj/items/tools.dmi and b/icons/obj/items/tools.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/barrel.dmi b/icons/obj/items/weapons/guns/attachments/barrel.dmi index cedbd065072a..304264cc8215 100644 Binary files a/icons/obj/items/weapons/guns/attachments/barrel.dmi and b/icons/obj/items/weapons/guns/attachments/barrel.dmi differ diff --git a/icons/obj/items/weapons/guns/lineart.dmi b/icons/obj/items/weapons/guns/lineart.dmi index 52ed68016313..082eb6113c2f 100644 Binary files a/icons/obj/items/weapons/guns/lineart.dmi and b/icons/obj/items/weapons/guns/lineart.dmi differ