From eb18c27bd9d1eae3251febd714c87edf9a6799e7 Mon Sep 17 00:00:00 2001 From: Hookie Date: Tue, 17 Dec 2024 03:43:41 -0600 Subject: [PATCH 1/2] Add Mannitol and Other Items to Imports (#4668) * Adds items to various import tabs * Update vitezstvi_ammo.dm no longer require broadbanding for ammo carriers --- .../code/armament_datums/deforest_medical.dm | 4 ++++ .../code/armament_datums/sol_defense.dm | 5 +++++ .../code/armament_datums/vitezstvi_ammo.dm | 12 ++++++++++++ 3 files changed, 21 insertions(+) diff --git a/modular_nova/modules/company_imports/code/armament_datums/deforest_medical.dm b/modular_nova/modules/company_imports/code/armament_datums/deforest_medical.dm index 3e37d99bb2f..9373b32c2bb 100644 --- a/modular_nova/modules/company_imports/code/armament_datums/deforest_medical.dm +++ b/modular_nova/modules/company_imports/code/armament_datums/deforest_medical.dm @@ -108,6 +108,10 @@ item_type = /obj/item/stack/medical/wound_recovery/robofoam_super cost = PAYCHECK_COMMAND * 4 +/datum/armament_entry/company_import/deforest/first_aid/mannitol // Bitrunners and Degenerative players should not be out of a job if med is slow, gone or bad + item_type = /obj/item/storage/pill_bottle/mannitol + cost = PAYCHECK_COMMAND * 4 // pricey to not obsolete med if they ARE here + // Autoinjectors for healing /datum/armament_entry/company_import/deforest/medpens diff --git a/modular_nova/modules/company_imports/code/armament_datums/sol_defense.dm b/modular_nova/modules/company_imports/code/armament_datums/sol_defense.dm index 8a8deddfe47..d9c18d4f95d 100644 --- a/modular_nova/modules/company_imports/code/armament_datums/sol_defense.dm +++ b/modular_nova/modules/company_imports/code/armament_datums/sol_defense.dm @@ -39,6 +39,11 @@ name = "type I vest" item_type = /obj/item/clothing/suit/armor/vest +/datum/armament_entry/company_import/sol_defense/armor/combat_boots // boots + name = "Combat Boots" + cost = PAYCHECK_CREW * 4 + item_type = /obj/item/clothing/shoes/combat + /datum/armament_entry/company_import/sol_defense/armor_hardened subcategory = "Hardened Armor" cost = PAYCHECK_CREW * 3 diff --git a/modular_nova/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm b/modular_nova/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm index 71cbf7d7697..43755100cad 100644 --- a/modular_nova/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm +++ b/modular_nova/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm @@ -28,6 +28,10 @@ item_type = /obj/item/suppressor/standard cost = PAYCHECK_COMMAND +/datum/armament_entry/company_import/vitezstvi/accessory/seclight + item_type = /obj/item/flashlight/seclite + cost = PAYCHECK_COMMAND * 1.5 // now get yo shotgun with the flashlight modification + /datum/armament_entry/company_import/vitezstvi/accessory/small_case item_type = /obj/item/storage/toolbox/guncase/nova/pistol/empty cost = PAYCHECK_COMMAND @@ -36,6 +40,14 @@ item_type = /obj/item/storage/toolbox/guncase/nova/empty cost = PAYCHECK_COMMAND * 2 +/datum/armament_entry/company_import/vitezstvi/accessory/bandolier + item_type = /obj/item/storage/belt/bandolier + cost = PAYCHECK_COMMAND * 2 + +/datum/armament_entry/company_import/vitezstvi/accessory/pouch + item_type = /obj/item/storage/pouch/ammo + cost = PAYCHECK_COMMAND * 3 + // Boxes of non-shotgun ammo /datum/armament_entry/company_import/vitezstvi/ammo_boxes From 5b3dd0e5e854cc5f5f86cb8e89ea78a77e5c20cf Mon Sep 17 00:00:00 2001 From: StealsThePRs Date: Tue, 17 Dec 2024 12:44:12 +0300 Subject: [PATCH 2/2] [MIRROR] Add Mannitol and Other Items to Imports