diff --git a/code/game/machinery/autolathe_datums.dm b/code/game/machinery/autolathe_datums.dm index 02de2b200821..fa6fec094c59 100644 --- a/code/game/machinery/autolathe_datums.dm +++ b/code/game/machinery/autolathe_datums.dm @@ -267,12 +267,6 @@ hidden = TRUE category = AUTOLATHE_CATEGORY_DEVICES_AND_COMPONENTS -/datum/autolathe/recipe/welder_industrial - name = "industrial blowtorch" - path = /obj/item/tool/weldingtool/largetank - hidden = TRUE - category = AUTOLATHE_CATEGORY_TOOLS - /datum/autolathe/recipe/handcuffs name = "handcuffs" path = /obj/item/handcuffs 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 fac4182ea5fe..830511ad4b19 100644 --- a/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm @@ -91,7 +91,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_commanding_officer, list( list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, 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 f1574c8104ff..5dfb6b347b5d 100644 --- a/code/game/machinery/vending/vendor_types/crew/medical.dm +++ b/code/game/machinery/vending/vendor_types/crew/medical.dm @@ -66,7 +66,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_doctor, list( list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -122,7 +122,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_nurse, list( list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -181,7 +181,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_researcher, list( list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), 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 8d86669a1f70..027c9bec2d13 100644 --- a/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm @@ -96,7 +96,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_pilot_officer, list( list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -185,7 +185,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_dropship_crew_chief, list( list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, 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 ee583828ec44..0da9181beb97 100644 --- a/code/game/machinery/vending/vendor_types/crew/sea.dm +++ b/code/game/machinery/vending/vendor_types/crew/sea.dm @@ -47,7 +47,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_sea, list( list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, 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 55053bd724bd..3220c32cf5bf 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -245,7 +245,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_cmo, list( list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), 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 3edbee6bbc47..7804cdfcebb4 100644 --- a/code/game/machinery/vending/vendor_types/crew/staff_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/staff_officer.dm @@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer, list( list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm index 8ddd8df4c3a2..819040e5821d 100644 --- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm +++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm @@ -18,10 +18,8 @@ list("Multitool", 4, /obj/item/device/multitool, null, VENDOR_ITEM_REGULAR), list("Plasteel x10", 7, /obj/item/stack/sheet/plasteel/small_stack, null, VENDOR_ITEM_REGULAR), list("Sandbags x25", 10, /obj/item/stack/sandbags_empty/half, null, VENDOR_ITEM_REGULAR), - list("Industrial Blowtorch", 2, /obj/item/tool/weldingtool/largetank, null, VENDOR_ITEM_REGULAR), - list("High-Capacity Industrial Blowtorch", 4, /obj/item/tool/weldingtool/hugetank, null, VENDOR_ITEM_REGULAR), list("Plastic Explosive", 3, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), - list("Toolkit", 1, /obj/item/storage/firstaid/toolkit/empty, null, VENDOR_ITEM_REGULAR), + list("Engineer Kit", 1, /obj/item/storage/toolkit/empty, null, VENDOR_ITEM_REGULAR), list("FIRSTAID KITS", 0, null, null, null), list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR), @@ -150,7 +148,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list( list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/engineering.dm b/code/game/machinery/vending/vendor_types/engineering.dm index 1983365bd661..2275656d7a30 100644 --- a/code/game/machinery/vending/vendor_types/engineering.dm +++ b/code/game/machinery/vending/vendor_types/engineering.dm @@ -25,7 +25,7 @@ list("Utility Tool Belt", round(scale * 2), /obj/item/storage/belt/utility, VENDOR_ITEM_REGULAR), list("Welding Goggles", round(scale * 2), /obj/item/clothing/glasses/welding, VENDOR_ITEM_REGULAR), list("Welding Helmet", round(scale * 2), /obj/item/clothing/head/welding, VENDOR_ITEM_REGULAR), - list("Toolkit", round(scale * 4), /obj/item/storage/firstaid/toolkit/empty, VENDOR_ITEM_REGULAR), + list("Engineer Kit", round(scale * 2), /obj/item/storage/toolkit/empty, VENDOR_ITEM_REGULAR), list("SCANNERS", -1, null, null), list("Atmos Scanner", round(scale * 2), /obj/item/device/analyzer, VENDOR_ITEM_REGULAR), @@ -37,7 +37,6 @@ list("TOOLS", -1, null, null), list("Blowtorch", round(scale * 4), /obj/item/tool/weldingtool, VENDOR_ITEM_REGULAR), list("Crowbar", round(scale * 4), /obj/item/tool/crowbar, VENDOR_ITEM_REGULAR), - list("High-Capacity Industrial Blowtorch", 2, /obj/item/tool/weldingtool/hugetank, VENDOR_ITEM_REGULAR), list("ME3 Hand Welder", round(scale * 2), /obj/item/tool/weldingtool/simple, VENDOR_ITEM_REGULAR), list("Screwdriver", round(scale * 4), /obj/item/tool/screwdriver, VENDOR_ITEM_REGULAR), list("Wirecutters", round(scale * 4), /obj/item/tool/wirecutters, VENDOR_ITEM_REGULAR), @@ -56,7 +55,7 @@ list("Utility Tool Belt", round(scale * 4), /obj/item/storage/belt/utility, VENDOR_ITEM_REGULAR), list("Cable Coil", round(scale * 4), /obj/item/stack/cable_coil/random, VENDOR_ITEM_REGULAR), list("Welding Goggles", round(scale * 2), /obj/item/clothing/glasses/welding, VENDOR_ITEM_REGULAR), - list("Toolkit", round(scale * 12), /obj/item/storage/firstaid/toolkit/empty, VENDOR_ITEM_REGULAR), + list("Engineer Kit", round(scale * 2), /obj/item/storage/toolkit/empty, VENDOR_ITEM_REGULAR), list("TOOLS", -1, null, null), list("Blowtorch", round(scale * 4), /obj/item/tool/weldingtool, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/intelligence_officer.dm b/code/game/machinery/vending/vendor_types/intelligence_officer.dm index ab38fcb1dfeb..a74c035b2d13 100644 --- a/code/game/machinery/vending/vendor_types/intelligence_officer.dm +++ b/code/game/machinery/vending/vendor_types/intelligence_officer.dm @@ -89,8 +89,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_intelligence_officer, list( list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index 9f870191287b..07284e7f8e71 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -91,9 +91,8 @@ list("Rappel Harness", round(scale * 20), /obj/item/rappel_harness, VENDOR_ITEM_REGULAR), list("POUCHES", -1, null, null), - list("Autoinjector Pouch", round(scale * 2), /obj/item/storage/pouch/autoinjector, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", round(scale * 2), /obj/item/storage/pouch/medkit, VENDOR_ITEM_REGULAR), - list("Medical Pouch", round(scale * 2), /obj/item/storage/pouch/medical, VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", round(scale * 1), /obj/item/storage/pouch/autoinjector, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", round(scale * 2), /obj/item/storage/pouch/medkit, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Full)", round(scale * 5), /obj/item/storage/pouch/firstaid/full, VENDOR_ITEM_REGULAR), list("First Responder Pouch", round(scale * 2), /obj/item/storage/pouch/first_responder, VENDOR_ITEM_REGULAR), list("Syringe Pouch", round(scale * 2), /obj/item/storage/pouch/syringe, VENDOR_ITEM_REGULAR), @@ -104,7 +103,7 @@ list("Flare Pouch (Full)", round(scale * 5), /obj/item/storage/pouch/flare/full, VENDOR_ITEM_REGULAR), list("Document Pouch", round(scale * 2), /obj/item/storage/pouch/document/small, VENDOR_ITEM_REGULAR), list("Sling Pouch", round(scale * 2), /obj/item/storage/pouch/sling, VENDOR_ITEM_REGULAR), - list("Machete Pouch (Full)", round(scale * 4), /obj/item/storage/pouch/machete/full, VENDOR_ITEM_REGULAR), + list("Machete Pouch (Full)", round(scale * 0.5), /obj/item/storage/pouch/machete/full, VENDOR_ITEM_REGULAR), list("Bayonet Pouch", round(scale * 2), /obj/item/storage/pouch/bayonet, VENDOR_ITEM_REGULAR), list("Medium General Pouch", round(scale * 2), /obj/item/storage/pouch/general/medium, VENDOR_ITEM_REGULAR), list("Magazine Pouch", round(scale * 5), /obj/item/storage/pouch/magazine, VENDOR_ITEM_REGULAR), @@ -112,9 +111,9 @@ list("Sidearm Pouch", round(scale * 5), /obj/item/storage/pouch/pistol, VENDOR_ITEM_REGULAR), list("Large Pistol Magazine Pouch", round(scale * 5), /obj/item/storage/pouch/magazine/pistol/large, VENDOR_ITEM_REGULAR), list("Fuel Tank Strap Pouch", round(scale * 4), /obj/item/storage/pouch/flamertank, VENDOR_ITEM_REGULAR), - list("Large General Pouch", round(scale * 2), /obj/item/storage/pouch/general/large, VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", round(scale * 2), /obj/item/storage/pouch/magazine/large, VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", round(scale * 2), /obj/item/storage/pouch/shotgun/large, VENDOR_ITEM_REGULAR), + list("Large General Pouch", round(scale * 1), /obj/item/storage/pouch/general/large, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", round(scale * 1), /obj/item/storage/pouch/magazine/large, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", round(scale * 1), /obj/item/storage/pouch/shotgun/large, VENDOR_ITEM_REGULAR), list("MISCELLANEOUS", -1, null, null), list("Combat Flashlight", round(scale * 5), /obj/item/device/flashlight/combat, VENDOR_ITEM_REGULAR), 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 65169a7591ae..10a227109465 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 @@ -146,7 +146,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_medic, list( list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), 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 c02748fea509..94768340c60e 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 @@ -285,7 +285,7 @@ list("M89-S Signal Flare Pack", round(scale * 1), /obj/item/storage/box/m94/signal, VENDOR_ITEM_REGULAR), list("MISCELLANEOUS", -1, null, null), - list("Toolkit", round(scale * 1), /obj/item/storage/firstaid/toolkit/empty, VENDOR_ITEM_REGULAR), + list("Engineer Kit", round(scale * 1), /obj/item/storage/toolkit/empty, VENDOR_ITEM_REGULAR), list("Map", round(scale * 5), /obj/item/map/current_map, VENDOR_ITEM_REGULAR), list("Extinguisher", round(scale * 5), /obj/item/tool/extinguisher, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", round(scale * 1), /obj/item/tool/extinguisher/mini, VENDOR_ITEM_REGULAR), 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 4f64ca7e81fa..d32f93070852 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 @@ -104,8 +104,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tl, list( list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index a5a5ca40d8fb..e20cb12de44a 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -320,7 +320,7 @@ cases. Override_icon_state should be a list.*/ var/failure = 0 for(var/obj/item/I in src.loc) - if(!S.can_be_inserted(I, TRUE)) + if(!S.can_be_inserted(I, user, stop_messages = TRUE)) failure = 1 continue success = 1 @@ -332,7 +332,7 @@ cases. Override_icon_state should be a list.*/ else to_chat(user, SPAN_NOTICE("You fail to pick anything up with [S].")) - else if(S.can_be_inserted(src)) + else if(S.can_be_inserted(src, user)) S.handle_item_insertion(src, FALSE, user) return @@ -666,11 +666,11 @@ cases. Override_icon_state should be a list.*/ for(var/A in H.w_uniform.accessories) if(istype(A, /obj/item/clothing/accessory/storage)) var/obj/item/clothing/accessory/storage/S = A - if(S.hold.can_be_inserted(src, TRUE)) + if(S.hold.can_be_inserted(src, M, TRUE)) return TRUE else if(istype(A, /obj/item/storage/internal/accessory/holster)) var/obj/item/storage/internal/accessory/holster/AH = A - if(!(AH.current_gun) && AH.can_be_inserted(src)) + if(!(AH.current_gun) && AH.can_be_inserted(src, M)) return TRUE return FALSE if(WEAR_IN_JACKET) @@ -678,7 +678,7 @@ cases. Override_icon_state should be a list.*/ var/obj/item/clothing/suit/storage/S = H.wear_suit if(istype(S) && S.pockets)//not all suits have pockits var/obj/item/storage/internal/I = S.pockets - if(I.can_be_inserted(src,1)) + if(I.can_be_inserted(src, M, TRUE)) return TRUE return FALSE if(WEAR_IN_HELMET) @@ -686,12 +686,12 @@ cases. Override_icon_state should be a list.*/ var/obj/item/clothing/head/helmet/marine/HM = H.head if(istype(HM) && HM.pockets)//not all helmuts have pockits var/obj/item/storage/internal/I = HM.pockets - if(I.can_be_inserted(src,TRUE)) + if(I.can_be_inserted(src, M, TRUE)) return TRUE if(WEAR_IN_BACK) if (H.back && isstorage(H.back)) var/obj/item/storage/B = H.back - if(B.can_be_inserted(src, 1)) + if(B.can_be_inserted(src, M, TRUE)) return TRUE return FALSE if(WEAR_IN_SHOES) @@ -705,31 +705,31 @@ cases. Override_icon_state should be a list.*/ if(WEAR_IN_SCABBARD) if(H.back && istype(H.back, /obj/item/storage/large_holster)) var/obj/item/storage/large_holster/B = H.back - if(B.can_be_inserted(src, 1)) + if(B.can_be_inserted(src, M, TRUE)) return TRUE return FALSE if(WEAR_IN_BELT) if(H.belt && isstorage(H.belt)) var/obj/item/storage/B = H.belt - if(B.can_be_inserted(src, 1)) + if(B.can_be_inserted(src, M, TRUE)) return TRUE return FALSE if(WEAR_IN_J_STORE) if(H.s_store && isstorage(H.s_store)) var/obj/item/storage/B = H.s_store - if(B.can_be_inserted(src, 1)) + if(B.can_be_inserted(src, M, TRUE)) return TRUE return FALSE if(WEAR_IN_L_STORE) if(H.l_store && istype(H.l_store, /obj/item/storage/pouch)) var/obj/item/storage/pouch/P = H.l_store - if(P.can_be_inserted(src, 1)) + if(P.can_be_inserted(src, M, TRUE)) return TRUE return FALSE if(WEAR_IN_R_STORE) if(H.r_store && istype(H.r_store, /obj/item/storage/pouch)) var/obj/item/storage/pouch/P = H.r_store - if(P.can_be_inserted(src, 1)) + if(P.can_be_inserted(src, M, TRUE)) return TRUE return FALSE return FALSE //Unsupported slot diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 4887ba25d3b0..4f7ec74633b9 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -60,7 +60,6 @@ GLOBAL_LIST_INIT(plastic_recipes, list ( \ new/datum/stack_recipe("plastic fork", /obj/item/tool/kitchen/utensil/pfork, 1, on_floor = 1), \ new/datum/stack_recipe("plastic spoon", /obj/item/tool/kitchen/utensil/pspoon, 1, on_floor = 1), \ new/datum/stack_recipe("plastic knife", /obj/item/tool/kitchen/utensil/pknife, 1, on_floor = 1), \ - new/datum/stack_recipe("plastic bag", /obj/item/storage/bag/plasticbag, 3, on_floor = 1), \ )) GLOBAL_LIST_INIT(iron_recipes, list ( \ diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index e0b3a4bde9dc..c063eb20ff93 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -12,6 +12,11 @@ max_w_class = SIZE_MEDIUM storage_slots = null max_storage_space = 21 + cant_hold = list(/obj/item/storage/firstaid, /obj/item/storage/toolkit) + can_hold_skill = list( + /obj/item/storage/firstaid = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/storage/toolkit = list(SKILL_ENGINEER, SKILL_ENGINEER_ENGI), + ) var/worn_accessible = FALSE //whether you can access its content while worn on the back var/obj/item/card/id/locking_id = null var/is_id_lockable = FALSE @@ -675,6 +680,7 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r icon_state = "g8pouch" item_state = "g8pouch" has_gamemode_skin = TRUE + can_hold_skill = list() /obj/item/storage/backpack/general_belt/equipped(mob/user, slot) switch(slot) diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index c86003b251da..542b947134e8 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -128,7 +128,7 @@ /obj/item/storage/bag/sheetsnatcher/Initialize() . = ..() -/obj/item/storage/bag/sheetsnatcher/can_be_inserted(obj/item/W as obj, stop_messages = 0) +/obj/item/storage/bag/sheetsnatcher/can_be_inserted(obj/item/W, mob/user, stop_messages = FALSE) if(!istype(W,/obj/item/stack/sheet) || istype(W,/obj/item/stack/sheet/mineral/sandstone) || istype(W,/obj/item/stack/sheet/wood)) if(!stop_messages) to_chat(usr, "The snatcher does not accept [W].") diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index bf267bb23abf..7ecfcf896521 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -94,22 +94,28 @@ /obj/item/tool/weldingtool, /obj/item/tool/wirecutters, /obj/item/tool/wrench, + /obj/item/tool/extinguisher/mini, + /obj/item/tool/shovel/etool, + /obj/item/stack/cable_coil, + /obj/item/weapon/gun/smg/nailgun/compact, + /obj/item/cell, + /obj/item/circuitboard, + /obj/item/stock_parts, + /obj/item/device/demo_scanner, + /obj/item/device/reagent_scanner, + /obj/item/device/assembly, /obj/item/device/multitool, /obj/item/device/flashlight, - /obj/item/stack/cable_coil, /obj/item/device/t_scanner, /obj/item/device/analyzer, - /obj/item/weapon/gun/smg/nailgun/compact, - /obj/item/tool/shovel/etool, - /obj/item/tool/extinguisher/mini, - /obj/item/cell, + /obj/item/explosive/plastic, /obj/item/device/lightreplacer, - ) bypass_w_limit = list( /obj/item/tool/shovel/etool, /obj/item/device/lightreplacer, ) + storage_slots = 10 /obj/item/storage/belt/utility/full/fill_preset_inventory() @@ -162,9 +168,6 @@ /obj/item/clothing/mask/surgical, /obj/item/clothing/gloves/latex, /obj/item/storage/syringe_case, - /obj/item/ammo_magazine/pistol, - /obj/item/ammo_magazine/revolver, - /obj/item/ammo_magazine/handful, /obj/item/device/flashlight/flare, /obj/item/reagent_container/hypospray, /obj/item/bodybag, @@ -987,7 +990,7 @@ user.update_inv_s_store() //There are only two types here that can be inserted, and they are mutually exclusive. We only track the gun. -/obj/item/storage/belt/gun/can_be_inserted(obj/item/W, stop_messages) //We don't need to stop messages, but it can be left in. +/obj/item/storage/belt/gun/can_be_inserted(obj/item/W, mob/user, stop_messages = FALSE) //We don't need to stop messages, but it can be left in. . = ..() if(!.) return @@ -1674,28 +1677,31 @@ /obj/item/storage/belt/gun/utility name = "\improper M276 pattern combat toolbelt rig" desc = "The M276 pattern combat toolbelt rig is an alternative load-bearing equipment of the USCM for engineers conducting repairs within combat zones. It consists of a modular belt with various clips and pouches for tools along with a holster for a sidearm. Due to the bulk of the sidearm, it is unable to hold as many tools as its standard counterpart." - storage_slots = 6 + storage_slots = 9 icon_state = "combatutility" item_state= "utility" can_hold = list( /obj/item/weapon/gun/pistol, - /obj/item/weapon/gun/revolver/m44, + /obj/item/weapon/gun/revolver, /obj/item/weapon/gun/flare, /obj/item/tool/crowbar, /obj/item/tool/screwdriver, /obj/item/tool/weldingtool, /obj/item/tool/wirecutters, /obj/item/tool/wrench, + /obj/item/tool/shovel/etool, + /obj/item/tool/extinguisher/mini, /obj/item/device/multitool, /obj/item/device/flashlight, - /obj/item/stack/cable_coil, /obj/item/device/t_scanner, /obj/item/device/analyzer, + /obj/item/device/lightreplacer, /obj/item/weapon/gun/smg/nailgun/compact, - /obj/item/tool/shovel/etool, - /obj/item/tool/extinguisher/mini, + /obj/item/stack/cable_coil, /obj/item/cell, - /obj/item/device/lightreplacer, + /obj/item/ammo_magazine/pistol, + /obj/item/ammo_magazine/revolver, + /obj/item/ammo_magazine/handful, ) bypass_w_limit = list( /obj/item/tool/shovel/etool, diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 5816da7740c3..509690a8dc2a 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -8,18 +8,33 @@ //---------FIRST AID KITS--------- /obj/item/storage/firstaid name = "first-aid kit" - desc = "It's an emergency medical kit for those serious boo-boos." + desc = "It's an emergency medical kit for those serious boo-boos. With medical training you can fit this in a backpack." icon_state = "firstaid" throw_speed = SPEED_FAST throw_range = 8 use_sound = "toolbox" matter = list("plastic" = 2000) - cant_hold = list( - /obj/item/ammo_magazine, - /obj/item/explosive/grenade, - /obj/item/tool, - ) //to prevent powergaming. + can_hold = list( + /obj/item/device/healthanalyzer, + /obj/item/reagent_container/dropper, + /obj/item/reagent_container/pill, + /obj/item/reagent_container/glass/bottle, + /obj/item/reagent_container/syringe, + /obj/item/storage/pill_bottle, + /obj/item/stack/medical, + /obj/item/reagent_container/hypospray, + /obj/item/storage/syringe_case, + /obj/item/storage/surgical_case, + /obj/item/tool/surgery/surgical_line, + /obj/item/tool/surgery/synthgraft, + /obj/item/roller, + /obj/item/bodybag, + /obj/item/reagent_container/blood, + ) storage_flags = STORAGE_FLAGS_BOX + required_skill_for_nest_opening = SKILL_MEDICAL + required_skill_level_for_nest_opening = SKILL_MEDICAL_MEDIC + var/icon_full //icon state to use when kit is full var/possible_icons_full @@ -49,7 +64,7 @@ /obj/item/storage/firstaid/fire name = "fire first-aid kit" - desc = "It's an emergency medical kit for when the dropship ammo storage -spontaneously- burns down." + desc = "It's an emergency medical kit for when the dropship ammo storage -spontaneously- burns down. With medical training you can fit this in a backpack." icon_state = "ointment" item_state = "firstaid-ointment" possible_icons_full = list("ointment","firefirstaid") @@ -69,7 +84,7 @@ /obj/item/storage/firstaid/regular icon_state = "firstaid" - desc = "It's an emergency medical kit containing basic medication and equipment. No training required to use." + desc = "It's an emergency medical kit containing basic medication and equipment. No training required to use. With medical training you can fit this in a backpack." /obj/item/storage/firstaid/regular/fill_preset_inventory() new /obj/item/device/healthanalyzer(src) @@ -100,7 +115,7 @@ /obj/item/storage/firstaid/toxin name = "toxin first-aid kit" - desc = "It's an emergency medical kit containing lifesaving anti-toxic medication." + desc = "It's an emergency medical kit containing lifesaving anti-toxic medication. With medical training you can fit this in a backpack." icon_state = "antitoxin" item_state = "firstaid-toxin" possible_icons_full = list("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3") @@ -117,7 +132,7 @@ /obj/item/storage/firstaid/o2 name = "oxygen deprivation first-aid kit" - desc = "A box full of reoxygenating goodies." + desc = "A box full of reoxygenating goodies. With medical training you can fit this in a backpack." icon_state = "o2" item_state = "firstaid-o2" @@ -135,7 +150,7 @@ /obj/item/storage/firstaid/adv name = "advanced first-aid kit" - desc = "Contains more effective methods of medical treatment than a basic first-aid kit, such as burn and trauma kits." + desc = "Contains more effective methods of medical treatment than a basic first-aid kit, such as burn and trauma kits. With medical training you can fit this in a backpack." icon_state = "advfirstaid" item_state = "firstaid-advanced" @@ -151,16 +166,26 @@ /obj/item/storage/firstaid/adv/empty/fill_preset_inventory() return - - /obj/item/storage/firstaid/synth name = "synthetic repair kit" - desc = "Contains equipment to repair a damaged synthetic. A tag on the back reads: 'Does not contain a shocking tool to repair disabled synthetics, nor a scanning device to detect specific damage; pack seperately.'" + desc = "Contains equipment to repair a damaged synthetic. A tag on the back reads: 'Does not contain a shocking tool to repair disabled synthetics, nor a scanning device to detect specific damage; pack seperately.' With medical training you can fit this in a backpack." icon_state = "bezerk" item_state = "firstaid-advanced" - cant_hold = list( - /obj/item/ammo_magazine, - /obj/item/explosive/grenade, + can_hold = list( + /obj/item/device/healthanalyzer, + /obj/item/reagent_container/dropper, + /obj/item/reagent_container/pill, + /obj/item/reagent_container/glass/bottle, + /obj/item/reagent_container/syringe, + /obj/item/storage/pill_bottle, + /obj/item/stack/medical, + /obj/item/reagent_container/hypospray, + /obj/item/storage/syringe_case, + /obj/item/tool/surgery/surgical_line, + /obj/item/tool/surgery/synthgraft, + /obj/item/stack/nanopaste, + /obj/item/stack/cable_coil, + /obj/item/tool/weldingtool, ) /obj/item/storage/firstaid/synth/fill_preset_inventory() @@ -170,14 +195,14 @@ new /obj/item/stack/nanopaste(src) new /obj/item/stack/cable_coil/white(src) new /obj/item/stack/cable_coil/white(src) - new /obj/item/tool/weldingtool/largetank(src) + new /obj/item/tool/weldingtool(src) /obj/item/storage/firstaid/synth/empty/fill_preset_inventory() return /obj/item/storage/firstaid/rad name = "radiation first-aid kit" - desc = "Contains treatment for radiation exposure" + desc = "Contains treatment for radiation exposure. With medical training you can fit this in a backpack." icon_state = "purplefirstaid" /obj/item/storage/firstaid/rad/fill_preset_inventory() @@ -193,12 +218,20 @@ /obj/item/storage/firstaid/surgical name = "basic field surgery kit" - desc = "Contains a surgical line, cautery, scalpel, hemostat, retractor, drapes and an oxycodone injector for tending wounds surgically." + desc = "Contains a surgical line, cautery, scalpel, hemostat, retractor, drapes and an oxycodone injector for tending wounds surgically. With medical training you can fit this in a backpack." icon_state = "bezerk" - cant_hold = list( - /obj/item/ammo_magazine, - /obj/item/explosive/grenade, - ) // we need surgery tools buddy + can_hold = list( + /obj/item/device/healthanalyzer, + /obj/item/reagent_container/dropper, + /obj/item/reagent_container/pill, + /obj/item/reagent_container/glass/bottle, + /obj/item/reagent_container/syringe, + /obj/item/storage/pill_bottle, + /obj/item/stack/medical, + /obj/item/reagent_container/hypospray, + /obj/item/storage/syringe_case, + /obj/item/tool/surgery, + ) /obj/item/storage/firstaid/surgical/fill_preset_inventory() new /obj/item/tool/surgery/surgical_line(src) @@ -212,23 +245,6 @@ /obj/item/storage/firstaid/surgical/empty/fill_preset_inventory() return -//---------TOOLKIT--------- - -/obj/item/storage/firstaid/toolkit - name = "toolkit" - desc = "An combat engineering toolkit intended to carry electrical and mechanical supplies into combat." - icon_state = "toolkit" - item_state = "fulton" - -/obj/item/storage/firstaid/toolkit/update_icon() - if(content_watchers || !length(contents)) - icon_state = "toolkit_empty" - else - icon_state = icon_full - -/obj/item/storage/firstaid/toolkit/empty/fill_preset_inventory() - return - //---------SYRINGE CASE--------- /obj/item/storage/syringe_case @@ -420,7 +436,7 @@ return ..() -/obj/item/storage/pill_bottle/can_be_inserted(obj/item/W, stop_messages = 0) +/obj/item/storage/pill_bottle/can_be_inserted(obj/item/W, mob/user, stop_messages = FALSE) . = ..() if(.) if(skilllock && !skillcheck(usr, SKILL_MEDICAL, SKILL_MEDICAL_MEDIC)) diff --git a/code/game/objects/items/storage/internal.dm b/code/game/objects/items/storage/internal.dm index d83ca561374b..68bdda8d7e7b 100644 --- a/code/game/objects/items/storage/internal.dm +++ b/code/game/objects/items/storage/internal.dm @@ -173,7 +173,7 @@ var/list/garb_items var/slots_reserved_for_garb -/obj/item/storage/internal/headgear/can_be_inserted(obj/item/item, stop_messages) //We don't need to stop messages, but it can be left in. +/obj/item/storage/internal/headgear/can_be_inserted(obj/item/item, mob/user, stop_messages = FALSE) //We don't need to stop messages, but it can be left in. . = ..() if(!.) return diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index b43ce5c47479..01b9506f073b 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -264,7 +264,7 @@ current_gun = null update_gun_icon() -/obj/item/storage/pouch/pistol/can_be_inserted(obj/item/W, stop_messages) //A little more detailed than just 'the pouch is full'. +/obj/item/storage/pouch/pistol/can_be_inserted(obj/item/W, mob/user, stop_messages = FALSE) //A little more detailed than just 'the pouch is full'. . = ..() if(!.) return @@ -328,7 +328,7 @@ else if(AM == tablet) tablet = null -/obj/item/storage/pouch/pistol/command/can_be_inserted(obj/item/I, stop_messages) +/obj/item/storage/pouch/pistol/command/can_be_inserted(obj/item/I, mob/user, stop_messages = FALSE) . = ..() if(!.) return @@ -791,27 +791,47 @@ new /obj/item/reagent_container/syringe(src) /obj/item/storage/pouch/medkit - name = "medkit pouch" - max_w_class = SIZE_MEDIUM - storage_flags = STORAGE_FLAGS_POUCH|STORAGE_USING_DRAWING_METHOD + name = "medical kit pouch" + storage_flags = STORAGE_FLAGS_POUCH icon_state = "medkit" - desc = "It's specifically made to hold a medkit." - can_hold = list(/obj/item/storage/firstaid) - -/obj/item/storage/pouch/medkit/handle_mmb_open(mob/user) - var/obj/item/storage/firstaid/FA = locate() in contents - if(FA) - FA.open(user) - return - return ..() - + desc = "It's specifically made to hold medical items. Requires medical skills to use effectively." + storage_slots = 7 + can_hold_skill = list( + /obj/item/device/healthanalyzer = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/reagent_container/dropper = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/reagent_container/pill = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/reagent_container/glass/bottle = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/reagent_container/syringe = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/storage/pill_bottle = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/stack/medical = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/reagent_container/hypospray = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/storage/syringe_case = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/storage/surgical_case = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/tool/surgery/surgical_line = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/tool/surgery/synthgraft = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/roller = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/bodybag = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + /obj/item/reagent_container/blood = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), + ) + can_hold_skill_only = TRUE /obj/item/storage/pouch/medkit/full/fill_preset_inventory() - new /obj/item/storage/firstaid/regular(src) + new /obj/item/device/healthanalyzer(src) + new /obj/item/reagent_container/hypospray/autoinjector/skillless(src) + new /obj/item/reagent_container/hypospray/autoinjector/skillless/tramadol(src) + new /obj/item/reagent_container/hypospray/autoinjector/inaprovaline(src) + new /obj/item/stack/medical/bruise_pack(src) + new /obj/item/stack/medical/ointment(src) + new /obj/item/stack/medical/splint(src) /obj/item/storage/pouch/medkit/full_advanced/fill_preset_inventory() - new /obj/item/storage/firstaid/adv(src) - + new /obj/item/reagent_container/hypospray/autoinjector/tricord(src) + new /obj/item/stack/medical/advanced/bruise_pack(src) + new /obj/item/stack/medical/advanced/bruise_pack(src) + new /obj/item/stack/medical/advanced/bruise_pack(src) + new /obj/item/stack/medical/advanced/ointment(src) + new /obj/item/stack/medical/advanced/ointment(src) + new /obj/item/stack/medical/splint(src) /obj/item/storage/pouch/pressurized_reagent_canister name = "Pressurized Reagent Canister Pouch" @@ -1236,7 +1256,7 @@ if(slung && slung.loc != src) . += "\The [slung] is attached to the sling." -/obj/item/storage/pouch/sling/can_be_inserted(obj/item/I, stop_messages = FALSE) +/obj/item/storage/pouch/sling/can_be_inserted(obj/item/I, mob/user, stop_messages = FALSE) if(slung) if(slung != I) if(!stop_messages) diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index 5a6b7d2b9b05..b1c79274913e 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -31,6 +31,18 @@ var/storage_flags = STORAGE_FLAGS_DEFAULT var/has_gamemode_skin = FALSE ///Whether to use map-variant skins. + ///Special can_holds that require a skill to insert, it is an associated list of typepath = list(skilltype, skilllevel) + var/list/can_hold_skill = list() + + ///Dictates whether or not we only check for items in can_hold_skill rather than can_hold or free usage + var/can_hold_skill_only = FALSE + + /// The required skill for opening this storage if it is inside another storage type + var/required_skill_for_nest_opening = null + + /// The required level of a skill for opening this storage if it is inside another storage type + var/required_skill_level_for_nest_opening = null + /obj/item/storage/MouseDrop(obj/over_object as obj) if(CAN_PICKUP(usr, src)) if(over_object == usr) // this must come before the screen objects only block @@ -69,7 +81,19 @@ return ..() /obj/item/storage/proc/handle_mmb_open(mob/user) - open(user) + if(!required_skill_for_nest_opening || !required_skill_level_for_nest_opening) + open(user) + return + + if(!istype(loc, /obj/item/storage)) + open(user) + return + + if(user?.skills.get_skill_level(required_skill_for_nest_opening) >= required_skill_level_for_nest_opening) + open(user) + return + + to_chat(user, SPAN_NOTICE("You can't seem to open [src] while it is in [loc].")) /obj/item/storage/proc/return_inv() RETURN_TYPE(/list) @@ -389,20 +413,36 @@ var/list/global/item_storage_box_cache = list() if(sum_storage_cost <= max_storage_space) //Adding this item won't exceed the maximum. return TRUE -/obj/item/storage/proc/can_hold_type(type_to_hold) +#define SKILL_TYPE_INDEX 1 +#define SKILL_LEVEL_INDEX 2 + +/obj/item/storage/proc/can_hold_type(type_to_hold, mob/user) + if(length(can_hold_skill)) + for(var/can_hold_skill_typepath in can_hold_skill) + if(ispath(type_to_hold, can_hold_skill_typepath) && user?.skills.get_skill_level(can_hold_skill[can_hold_skill_typepath][SKILL_TYPE_INDEX]) >= can_hold_skill[can_hold_skill_typepath][SKILL_LEVEL_INDEX]) + return TRUE + if(can_hold_skill_only) + return FALSE + for(var/A in cant_hold) if(ispath(type_to_hold, A)) return FALSE + if(length(can_hold)) for(var/A in can_hold) if(ispath(type_to_hold, A)) return TRUE + return FALSE + return TRUE +#undef SKILL_TYPE_INDEX +#undef SKILL_LEVEL_INDEX + //This proc return 1 if the item can be picked up and 0 if it can't. //Set the stop_messages to stop it from printing messages -/obj/item/storage/proc/can_be_inserted(obj/item/W as obj, stop_messages = 0) +/obj/item/storage/proc/can_be_inserted(obj/item/W, mob/user, stop_messages = FALSE) if(!istype(W) || (W.flags_item & NODROP)) return //Not an item if(src.loc == W) @@ -418,7 +458,7 @@ var/list/global/item_storage_box_cache = list() to_chat(usr, SPAN_ALERT("[W] is ignited, you can't store it!")) return - if(!can_hold_type(W.type)) + if(!can_hold_type(W.type, user)) if(!stop_messages) to_chat(usr, SPAN_NOTICE("[src] cannot hold [W].")) return @@ -543,7 +583,7 @@ W is always an item. stop_warning prevents messaging. user may be null.**/ ..() /obj/item/storage/proc/attempt_item_insertion(obj/item/W as obj, prevent_warning = FALSE, mob/user as mob) - if(!can_be_inserted(W)) + if(!can_be_inserted(W, user)) return W.add_fingerprint(user) diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index e6ebbadd9122..db0d4e3b269b 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -56,7 +56,7 @@ var/color = pick("red","yellow","green","blue","pink","orange","cyan","white") new /obj/item/tool/screwdriver(src) new /obj/item/tool/wirecutters(src) - new /obj/item/device/t_scanner(src) + new /obj/item/circuitboard/apc(src) new /obj/item/tool/crowbar(src) new /obj/item/stack/cable_coil(src,30,color) new /obj/item/stack/cable_coil(src,30,color) diff --git a/code/game/objects/items/storage/toolkit.dm b/code/game/objects/items/storage/toolkit.dm new file mode 100644 index 000000000000..e3171eca40f6 --- /dev/null +++ b/code/game/objects/items/storage/toolkit.dm @@ -0,0 +1,45 @@ +/obj/item/storage/toolkit + name = "engineer kit" + desc = "An combat engineering toolkit intended to carry electrical and mechanical supplies into combat. With engineering training you can fit this in a backpack." + icon_state = "toolkit" + item_state = "fulton" + throw_speed = SPEED_FAST + throw_range = 8 + use_sound = "toolbox" + matter = list("plastic" = 2000) + can_hold = list( + /obj/item/circuitboard, + /obj/item/device/flashlight, + /obj/item/clothing/glasses/welding, + /obj/item/device/analyzer, + /obj/item/device/demo_scanner, + /obj/item/device/reagent_scanner, + /obj/item/device/t_scanner, + /obj/item/stack/cable_coil, + /obj/item/cell, + /obj/item/device/assembly, + /obj/item/stock_parts, + /obj/item/explosive/plastic, + ) + storage_flags = STORAGE_FLAGS_BOX + required_skill_for_nest_opening = SKILL_ENGINEER + required_skill_level_for_nest_opening = SKILL_ENGINEER_ENGI + + ///icon state to use when kit is full + var/icon_full + +/obj/item/storage/toolkit/Initialize() + . = ..() + + icon_full = initial(icon_state) + + update_icon() + +/obj/item/storage/toolkit/update_icon() + if(content_watchers || !length(contents)) + icon_state = "toolkit_empty" + else + icon_state = icon_full + +/obj/item/storage/toolkit/empty/fill_preset_inventory() + return diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm index 65e8f2986679..a326808bf491 100644 --- a/code/game/objects/items/tools/maintenance_tools.dm +++ b/code/game/objects/items/tools/maintenance_tools.dm @@ -183,7 +183,7 @@ /// Whether or not the blowtorch is off(0), on(1) or currently welding(2) var/welding = 0 /// The max amount of fuel the welder can hold - var/max_fuel = 20 + var/max_fuel = 40 /// Used to slowly deplete the fuel when the tool is left on. var/weld_tick = 0 var/has_welding_screen = FALSE @@ -413,7 +413,7 @@ /obj/item/tool/weldingtool/largetank name = "industrial blowtorch" - max_fuel = 40 + max_fuel = 60 matter = list("metal" = 70, "glass" = 60) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index d2b4114df25b..1be2bae9e8ca 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -69,9 +69,9 @@ new /obj/item/clothing/head/welding(src) new /obj/item/clothing/head/welding(src) new /obj/item/clothing/head/welding(src) - new /obj/item/tool/weldingtool/largetank(src) - new /obj/item/tool/weldingtool/largetank(src) - new /obj/item/tool/weldingtool/largetank(src) + new /obj/item/tool/weldingtool(src) + new /obj/item/tool/weldingtool(src) + new /obj/item/tool/weldingtool(src) new /obj/item/tool/weldpack(src) new /obj/item/tool/weldpack(src) new /obj/item/tool/weldpack(src) diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index a7da554a7992..cf54fa9f01a7 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -671,7 +671,6 @@ hold = /obj/item/storage/internal/accessory/drop_pouch - /obj/item/storage/internal/accessory/drop_pouch w_class = SIZE_LARGE //Allow storage containers that's medium or below storage_slots = null @@ -680,6 +679,7 @@ cant_hold = list( //Prevent inventory powergame /obj/item/storage/firstaid, /obj/item/storage/bible, + /obj/item/storage/toolkit, ) storage_flags = NONE //no verb, no quick draw, no tile gathering @@ -728,7 +728,7 @@ ..() -/obj/item/storage/internal/accessory/holster/can_be_inserted(obj/item/W, stop_messages) +/obj/item/storage/internal/accessory/holster/can_be_inserted(obj/item/W, mob/user, stop_messages = FALSE) if( ..() ) //If the parent did their thing, this should be fine. It pretty much handles all the checks. if(isgun(W)) if(current_gun) diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm index 81abf8bce550..39a7b648b999 100644 --- a/code/modules/gear_presets/clf.dm +++ b/code/modules/gear_presets/clf.dm @@ -344,7 +344,7 @@ list("Medical Pouch (Splints)", 0, /obj/item/storage/pouch/medical/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -820,7 +820,7 @@ list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("MASK", 0, null, null, null), diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm index fcfb61a7d810..1e8baa9182cf 100644 --- a/code/modules/gear_presets/pmc.dm +++ b/code/modules/gear_presets/pmc.dm @@ -412,7 +412,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -590,7 +590,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -1564,7 +1564,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -1968,7 +1968,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 39a6c98aea0f..a6aa9448d8e8 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -301,7 +301,7 @@ list("Medical Pouch (Utilities)", 0, /obj/item/storage/pouch/medical/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -863,7 +863,7 @@ list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -1015,7 +1015,7 @@ list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -1178,7 +1178,7 @@ list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -1338,7 +1338,7 @@ list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -1499,7 +1499,7 @@ list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -1660,7 +1660,7 @@ list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -1915,7 +1915,7 @@ list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("MASK", 0, null, null, null), @@ -2171,7 +2171,7 @@ list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -2304,7 +2304,7 @@ list("Medical Pouch (Splints)", 0, /obj/item/storage/pouch/medical/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -2466,7 +2466,7 @@ list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -2744,7 +2744,7 @@ list("Medical Pouch (Splints)", 0, /obj/item/storage/pouch/medical/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), diff --git a/code/modules/hydroponics/hydro_tray.dm b/code/modules/hydroponics/hydro_tray.dm index 463ce752308a..24097e1f8e92 100644 --- a/code/modules/hydroponics/hydro_tray.dm +++ b/code/modules/hydroponics/hydro_tray.dm @@ -612,7 +612,7 @@ var/obj/item/storage/bag/plants/S = O for (var/obj/item/reagent_container/food/snacks/grown/G in locate(user.x,user.y,user.z)) - if(!S.can_be_inserted(G)) + if(!S.can_be_inserted(G, user)) return S.handle_item_insertion(G, TRUE, user) diff --git a/code/modules/projectiles/gun_helpers.dm b/code/modules/projectiles/gun_helpers.dm index 6c94973997f5..ba5f8e491590 100644 --- a/code/modules/projectiles/gun_helpers.dm +++ b/code/modules/projectiles/gun_helpers.dm @@ -551,7 +551,7 @@ DEFINES in setup.dm, referenced here. var/obj/item/clothing/accessory/storage/holster/holster_ammo = accessory if(istype(holster_ammo)) var/obj/item/storage/internal/accessory/holster/storage = holster_ammo.hold - if(storage.can_be_inserted(active_hand, TRUE)) + if(storage.can_be_inserted(active_hand, src, stop_messages = TRUE)) storage.handle_item_insertion(active_hand, user = src) return diff --git a/code/modules/projectiles/guns/specialist.dm b/code/modules/projectiles/guns/specialist.dm index 78d1fca2cf24..71afd0bdd09a 100644 --- a/code/modules/projectiles/guns/specialist.dm +++ b/code/modules/projectiles/guns/specialist.dm @@ -766,7 +766,7 @@ if(length(cylinder.contents) >= internal_slots) to_chat(user, SPAN_WARNING("[src] cannot hold more grenades!")) return - if(!cylinder.can_be_inserted(I)) //Technically includes whether there's room for it, but the above gives a tailored message. + if(!cylinder.can_be_inserted(I, user)) //Technically includes whether there's room for it, but the above gives a tailored message. return user.visible_message(SPAN_NOTICE("[user] loads [I] into [src]."), diff --git a/colonialmarines.dme b/colonialmarines.dme index 79ddef81b976..be4f5743de74 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1145,6 +1145,7 @@ s// DM Environment file for colonialmarines.dme. #include "code\game\objects\items\storage\storage.dm" #include "code\game\objects\items\storage\surgical_tray.dm" #include "code\game\objects\items\storage\toolbox.dm" +#include "code\game\objects\items\storage\toolkit.dm" #include "code\game\objects\items\storage\wallets.dm" #include "code\game\objects\items\tanks\jetpack.dm" #include "code\game\objects\items\tanks\tank_types.dm" diff --git a/maps/map_files/BigRed/sprinkles/40.admin_pmc.dmm b/maps/map_files/BigRed/sprinkles/40.admin_pmc.dmm index d238af50b91a..e2b3e939a2e6 100644 --- a/maps/map_files/BigRed/sprinkles/40.admin_pmc.dmm +++ b/maps/map_files/BigRed/sprinkles/40.admin_pmc.dmm @@ -305,7 +305,7 @@ /area/bigredv2/outside/admin_building) "aW" = ( /obj/effect/decal/cleanable/blood, -/obj/item/tool/weldingtool/largetank, +/obj/item/tool/weldingtool, /turf/open/floor{ icon_state = "carpet11-12"; dir = 8 diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index 88b90c7180e0..e265184172a6 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -13348,7 +13348,7 @@ "aLr" = ( /obj/structure/surface/rack, /obj/item/tool/weldpack, -/obj/item/tool/weldingtool/largetank, +/obj/item/tool/weldingtool, /obj/item/clothing/head/welding, /turf/open/floor/corsat{ dir = 5; @@ -31256,7 +31256,7 @@ "bLH" = ( /obj/structure/surface/rack, /obj/item/tool/weldpack, -/obj/item/tool/weldingtool/largetank, +/obj/item/tool/weldingtool, /obj/item/clothing/head/welding, /turf/open/floor/corsat{ dir = 5; @@ -31963,7 +31963,7 @@ "bNV" = ( /obj/structure/surface/rack, /obj/item/tool/weldpack, -/obj/item/tool/weldingtool/largetank, +/obj/item/tool/weldingtool, /obj/item/clothing/head/welding, /obj/effect/spawner/random/toolbox, /turf/open/floor/corsat{ diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index 2c6bfb2071be..eb65ff56ff4f 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -26327,12 +26327,6 @@ icon_state = "darkyellowcorners2" }, /area/fiorina/station/telecomm/lz1_cargo) -"pYW" = ( -/obj/item/tool/weldingtool/hugetank, -/turf/open/floor/prison{ - icon_state = "darkbrownfull2" - }, -/area/fiorina/tumor/aux_engi) "pZb" = ( /turf/open/floor/prison{ dir = 8; @@ -29064,7 +29058,7 @@ }, /area/fiorina/station/research_cells) "rEm" = ( -/obj/item/tool/weldingtool/largetank, +/obj/item/tool/weldingtool, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) "rEH" = ( @@ -30807,7 +30801,7 @@ /turf/closed/wall/r_wall/prison, /area/fiorina/tumor/civres) "sLT" = ( -/obj/item/tool/weldingtool/largetank, +/obj/item/tool/weldingtool, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -31075,14 +31069,6 @@ }, /turf/open/space, /area/fiorina/oob) -"sVw" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 4; - layer = 3.5 - }, -/obj/item/storage/bag/plasticbag, -/turf/open/floor/prison, -/area/fiorina/station/disco) "sVy" = ( /obj/structure/barricade/handrail/type_b{ dir = 4; @@ -38458,7 +38444,7 @@ /turf/closed/wall/mineral/bone_resin, /area/fiorina/tumor/fiberbush) "xwD" = ( -/obj/item/tool/weldingtool/largetank, +/obj/item/tool/weldingtool, /turf/open/floor/prison, /area/fiorina/station/civres_blue) "xxd" = ( @@ -44347,7 +44333,7 @@ lHx jlk jlk sAv -pYW +sJT sAv jlk baC @@ -76719,7 +76705,7 @@ rUY vGO tMF hgu -sVw +hgu hgu hgu rox diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm index 5d54cfcffc4d..f5e2f597ef24 100644 --- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm +++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm @@ -20106,7 +20106,7 @@ pixel_x = 10; pixel_y = 11 }, -/obj/item/tool/weldingtool/largetank{ +/obj/item/tool/weldingtool{ pixel_x = -6; pixel_y = 4 }, diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index fed056caf3d4..a79ef352f94b 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -14943,7 +14943,7 @@ /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power) "uBG" = ( -/obj/item/tool/weldingtool/largetank, +/obj/item/tool/weldingtool, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/botany/east_tech) "uBO" = ( diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index 4cf6da9bd964..8612fbbbd3a9 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -17405,10 +17405,6 @@ /area/lv522/indoors/a_block/dorm_north) "hqr" = ( /obj/structure/surface/table/almayer, -/obj/item/tool/weldingtool/hugetank{ - pixel_x = 8; - pixel_y = 7 - }, /obj/item/tool/weldpack{ pixel_y = 2 }, diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index eb05927b5f18..2bd769e3a3c1 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -36486,7 +36486,6 @@ /area/almayer/medical/upper_medical) "fQF" = ( /obj/structure/surface/rack, -/obj/item/storage/bag/plasticbag, /obj/item/storage/firstaid/regular, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) @@ -58029,8 +58028,8 @@ /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/tool/weldingtool/largetank, -/obj/item/tool/weldingtool/largetank, +/obj/item/tool/weldingtool, +/obj/item/tool/weldingtool, /obj/item/clothing/head/welding, /obj/item/clothing/head/welding, /obj/item/device/reagent_scanner, @@ -61761,7 +61760,6 @@ }, /area/almayer/squads/charlie_delta_shared) "qUH" = ( -/obj/item/storage/bag/plasticbag, /obj/structure/surface/rack, /turf/open/floor/almayer{ icon_state = "plate" diff --git a/maps/templates/Chinook.dmm b/maps/templates/Chinook.dmm index f2acbe320aeb..17be7bd9b968 100644 --- a/maps/templates/Chinook.dmm +++ b/maps/templates/Chinook.dmm @@ -416,7 +416,7 @@ /area/adminlevel/chinook/offices) "bx" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/item/tool/weldingtool/largetank{ +/obj/item/tool/weldingtool{ pixel_x = -9; pixel_y = 4 }, @@ -427,7 +427,7 @@ pixel_x = 13; pixel_y = 5 }, -/obj/item/tool/weldingtool/largetank{ +/obj/item/tool/weldingtool{ pixel_x = -2; pixel_y = 6 }, @@ -700,7 +700,7 @@ /area/adminlevel/chinook/sec) "cy" = ( /obj/structure/surface/table/almayer, -/obj/item/tool/weldingtool/largetank, +/obj/item/tool/weldingtool, /turf/open/floor/almayer{ dir = 1; icon_state = "orange" @@ -9148,7 +9148,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/item/tool/weldingtool/largetank{ +/obj/item/tool/weldingtool{ pixel_x = 14; pixel_y = -14 }, @@ -10758,9 +10758,9 @@ /area/adminlevel/chinook/sec) "Od" = ( /obj/structure/surface/table/almayer, -/obj/item/tool/weldingtool/largetank, -/obj/item/tool/weldingtool/largetank, -/obj/item/tool/weldingtool/largetank, +/obj/item/tool/weldingtool, +/obj/item/tool/weldingtool, +/obj/item/tool/weldingtool, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, @@ -14056,7 +14056,7 @@ /area/adminlevel/chinook/medical) "ZH" = ( /obj/structure/machinery/power/port_gen/pacman, -/obj/item/tool/weldingtool/largetank, +/obj/item/tool/weldingtool, /obj/structure/sign/safety/high_voltage{ pixel_y = 25 }, diff --git a/maps/templates/upp_ert_station.dmm b/maps/templates/upp_ert_station.dmm index 4aff44053f78..d78a900f2c59 100644 --- a/maps/templates/upp_ert_station.dmm +++ b/maps/templates/upp_ert_station.dmm @@ -729,7 +729,7 @@ }, /area/adminlevel/ert_station/upp_station) "kN" = ( -/obj/item/tool/weldingtool/largetank, +/obj/item/tool/weldingtool, /obj/item/clothing/glasses/welding, /obj/structure/machinery/light/double/blue{ dir = 8 diff --git a/maps/templates/weyland_ert_station.dmm b/maps/templates/weyland_ert_station.dmm index ce495acd3f65..414eee0bcbc7 100644 --- a/maps/templates/weyland_ert_station.dmm +++ b/maps/templates/weyland_ert_station.dmm @@ -2546,7 +2546,7 @@ /area/adminlevel/ert_station/weyland_station) "FD" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/item/tool/weldingtool/largetank, +/obj/item/tool/weldingtool, /obj/item/clothing/glasses/welding, /turf/open/floor/corsat{ icon_state = "squares"