diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm index 1c37341e06d..67e42619707 100644 --- a/code/datums/id_trim/jobs.dm +++ b/code/datums/id_trim/jobs.dm @@ -763,7 +763,7 @@ ACCESS_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, - ACCESS_PHARMACY, + // ACCESS_PHARMACY, // FLUFFY FRONTIER REMOVAL ACCESS_SURGERY, ACCESS_VIROLOGY, ) diff --git a/modular_nova/master_files/code/datums/id_trim/jobs.dm b/modular_nova/master_files/code/datums/id_trim/jobs.dm index 215fc6c20ca..a414e0e9c4c 100644 --- a/modular_nova/master_files/code/datums/id_trim/jobs.dm +++ b/modular_nova/master_files/code/datums/id_trim/jobs.dm @@ -25,10 +25,12 @@ minimal_access |= ACCESS_WEAPONS -/datum/id_trim/job/atmospheric_technician/New() +// FLUFFY FRONTIER EDIT START - REMOVAL +/* /datum/id_trim/job/atmospheric_technician/New() . = ..() - minimal_access |= ACCESS_ENGINE_EQUIP + minimal_access |= ACCESS_ENGINE_EQUIP */ +// FLUFFY FRONTIER EDIT END /datum/id_trim/job/chief_medical_officer/New() . = ..() 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 bc6d28aea04..c09ccd4b730 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 @@ -31,6 +31,8 @@ item_type = /obj/item/storage/medkit/robotic_repair/preemo/stocked cost = PAYCHECK_COMMAND * 8 +// FLUFFY FRONTIER REMOVAL BEGIN: nova vending rebalance #5219 +/* /datum/armament_entry/company_import/deforest/first_aid_kit/first_responder item_type = /obj/item/storage/backpack/duffelbag/deforest_surgical/stocked cost = PAYCHECK_COMMAND * 10.5 @@ -42,6 +44,8 @@ /datum/armament_entry/company_import/deforest/first_aid_kit/technician_satchel item_type = /obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked cost = PAYCHECK_COMMAND * 11.75 +*/ +// FLUFFY FRONTIER REMOVAL END // Basic first aid supplies like gauze, sutures, mesh, so on @@ -56,9 +60,13 @@ item_type = /obj/item/stack/medical/suture cost = PAYCHECK_LOWER +// FLUFFY FRONTIER REMOVAL BEGIN: nova vending rebalance #5219 +/* /datum/armament_entry/company_import/deforest/first_aid/medicated_sutures item_type = /obj/item/stack/medical/suture/medicated cost = PAYCHECK_LOWER * 1.6 +*/ +// FLUFFY FRONTIER REMOVAL END /datum/armament_entry/company_import/deforest/first_aid/red_sun item_type = /obj/item/stack/medical/ointment/red_sun @@ -72,9 +80,13 @@ item_type = /obj/item/stack/medical/mesh cost = PAYCHECK_LOWER +// FLUFFY FRONTIER REMOVAL BEGIN: nova vending rebalance #5219 +/* /datum/armament_entry/company_import/deforest/first_aid/advanced_mesh item_type = /obj/item/stack/medical/mesh/advanced cost = PAYCHECK_LOWER * 1.6 +*/ +// FLUFFY FRONTIER REMOVAL END /datum/armament_entry/company_import/deforest/first_aid/sterile_gauze item_type = /obj/item/stack/medical/gauze/sterilized @@ -139,8 +151,12 @@ /datum/armament_entry/company_import/deforest/medpens/lepoturi item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/lepoturi +// FLUFFY FRONTIER REMOVAL BEGIN: nova vending rebalance #5219 +/* /datum/armament_entry/company_import/deforest/medpens/psifinil item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/psifinil +*/ +// FLUFFY FRONTIER REMOVAL END /datum/armament_entry/company_import/deforest/medpens/halobinin item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/halobinin diff --git a/modular_nova/modules/imported_vendors/code/vendors.dm b/modular_nova/modules/imported_vendors/code/vendors.dm index f2802875a80..abec3cf5ff8 100644 --- a/modular_nova/modules/imported_vendors/code/vendors.dm +++ b/modular_nova/modules/imported_vendors/code/vendors.dm @@ -4,7 +4,7 @@ /obj/machinery/vending/imported/yangyu, /obj/machinery/vending/imported/mothic, /obj/machinery/vending/imported/tiziran, - /obj/machinery/vending/deforest_medvend, + // /obj/machinery/vending/deforest_medvend, //FLUFFY FRONTIER REMOVAL: nova vending rebalance #5219 ) /obj/effect/spawner/random/vending/colavend //These can serve both snacks AND drinks so it's kinda both of them? @@ -13,7 +13,7 @@ /obj/machinery/vending/imported/yangyu, /obj/machinery/vending/imported/mothic, /obj/machinery/vending/imported/tiziran, - /obj/machinery/vending/deforest_medvend, + // /obj/machinery/vending/deforest_medvend, //FLUFFY FRONTIER REMOVAL: nova vending rebalance #5219 ) /datum/supply_pack/vending/imported/fill(obj/structure/closet/crate/target_crate) diff --git a/modular_nova/modules/loadouts/loadout_items/loadout_datum_pocket.dm b/modular_nova/modules/loadouts/loadout_items/loadout_datum_pocket.dm index 7fc5e1749d8..4fc5f357d2b 100644 --- a/modular_nova/modules/loadouts/loadout_items/loadout_datum_pocket.dm +++ b/modular_nova/modules/loadouts/loadout_items/loadout_datum_pocket.dm @@ -235,6 +235,8 @@ name = "Empty Colonial First Aid Pouch" item_path = /obj/item/storage/pouch/cin_medkit +// FLUFFY FRONTIER REMOVAL BEGIN: nova vending rebalance #5219 +/* /datum/loadout_item/pocket_items/deforest_cheesekit name = "Civil Defense Medical Kit" item_path = /obj/item/storage/medkit/civil_defense/stocked @@ -242,6 +244,8 @@ /datum/loadout_item/pocket_items/deforest_frontiermedkit name = "Frontier Medical Kit" item_path = /obj/item/storage/medkit/frontier/stocked +*/ +// FLUFFY FRONTIER REMOVAL END /datum/loadout_item/pocket_items/synthetic_medkit name = "Robotic Repair Equipment Kit" diff --git a/modular_nova/modules/modular_vending/code/tool.dm b/modular_nova/modules/modular_vending/code/tool.dm index 3be1b582c7b..c4ffe702ad8 100644 --- a/modular_nova/modules/modular_vending/code/tool.dm +++ b/modular_nova/modules/modular_vending/code/tool.dm @@ -1,10 +1,14 @@ /obj/machinery/vending/tool premium_nova = list( - /obj/item/multitool/fock = 2, + // /obj/item/multitool/fock = 2, // FLUFFY FRONTIER REMOVAL /obj/item/screwdriver/omni_drill = 1, /obj/item/weldingtool/electric/arc_welder = 1, /obj/item/pickaxe/drill/compact = 1, ) +// FLUFFY FRONTIER REMOVAL BEGIN: nova vending rebalance #5219 +/* contraband_nova = list( /obj/item/crowbar/large/doorforcer = 2, ) +*/ +// FLUFFY FRONTIER REMOVAL END diff --git a/tff_modular/modules/cargo/goodies.dm b/tff_modular/modules/cargo/goodies.dm new file mode 100644 index 00000000000..c1ad5ca7d9e --- /dev/null +++ b/tff_modular/modules/cargo/goodies.dm @@ -0,0 +1,27 @@ +// Изменение цен для заказов карго вот этих вот -> 'code\modules\cargo\goodies.dm' + +/datum/supply_pack/goody/firstaidbruises_single + cost = PAYCHECK_CREW * 6 + +/datum/supply_pack/goody/firstaidburns_single + cost = PAYCHECK_CREW * 6 + +/datum/supply_pack/goody/firstaid_single + cost = PAYCHECK_CREW * 4 + +/datum/supply_pack/goody/firstaidoxygen_single + cost = PAYCHECK_CREW * 6 + +/datum/supply_pack/goody/firstaidtoxins_single + cost = PAYCHECK_CREW * 6 + +/datum/supply_pack/goody/bandagebox_singlepack + +/datum/supply_pack/goody/medipen_twopak + + +// Изменение цен для заказов карго вот этих вот -> 'modular_nova\modules\cargo\code\goodies.dm' + +/datum/supply_pack/goody/firstaid_pouch + +/datum/supply_pack/goody/stabilizer_pouch diff --git a/tff_modular/modules/cargo/packs/medical.dm b/tff_modular/modules/cargo/packs/medical.dm new file mode 100644 index 00000000000..30c67a7d3be --- /dev/null +++ b/tff_modular/modules/cargo/packs/medical.dm @@ -0,0 +1,11 @@ +/datum/supply_pack/medical/advanced_packs + name = "Advanced Mesh and Sutures Crate" + desc = "Contains some advanced regenerative mesh and medicated sutures." + cost = CARGO_CRATE_VALUE * 4 + access = ACCESS_MEDICAL + contains = list( + /obj/item/stack/medical/suture/medicated = 3, + /obj/item/stack/medical/mesh/advanced = 3, + ) + crate_name = "medical crate" + crate_type = /obj/structure/closet/crate/deforest diff --git a/tff_modular/modules/deforest_medical_items/deforest_cargo_packs.dm b/tff_modular/modules/deforest_medical_items/deforest_cargo_packs.dm new file mode 100644 index 00000000000..a5640323ce0 --- /dev/null +++ b/tff_modular/modules/deforest_medical_items/deforest_cargo_packs.dm @@ -0,0 +1,17 @@ +// Изменение цен для заказов карго вот этих вот -> 'modular_nova\modules\deforest_medical_items\code\cargo_packs.dm' + +/datum/supply_pack/medical/civil_defense + +/datum/supply_pack/medical/civil_defense/comfort + +/datum/supply_pack/medical/frontier_first_aid + +/datum/supply_pack/medical/kit_technician + cost = CARGO_CRATE_VALUE * 8 + +/datum/supply_pack/medical/kit_surgical + +/datum/supply_pack/medical/kit_medical + cost = CARGO_CRATE_VALUE * 5.5 + +/datum/supply_pack/medical/deforest_vendor_refill diff --git a/tff_modular/modules/deforest_medical_items/deforest_medical.dm b/tff_modular/modules/deforest_medical_items/deforest_medical.dm new file mode 100644 index 00000000000..cc8d56cd0b0 --- /dev/null +++ b/tff_modular/modules/deforest_medical_items/deforest_medical.dm @@ -0,0 +1,141 @@ +// Изменение цен для импортов вот этих вот -> 'modular_nova\modules\company_imports\code\armament_datums\deforest_medical.dm' + +/datum/armament_entry/company_import/deforest/first_aid_kit + +/datum/armament_entry/company_import/deforest/first_aid_kit/comfort + +/datum/armament_entry/company_import/deforest/first_aid_kit/civil_defense + cost = PAYCHECK_COMMAND * 4 + +/datum/armament_entry/company_import/deforest/first_aid_kit/frontier + cost = PAYCHECK_COMMAND * 4 + +/datum/armament_entry/company_import/deforest/first_aid_kit/combat_surgeon + cost = PAYCHECK_COMMAND * 4 + +/datum/armament_entry/company_import/deforest/first_aid_kit/robo_repair + cost = PAYCHECK_COMMAND * 4 + +/datum/armament_entry/company_import/deforest/first_aid_kit/robo_repair_super + +/* +/datum/armament_entry/company_import/deforest/first_aid_kit/first_responder + +/datum/armament_entry/company_import/deforest/first_aid_kit/orange_satchel + cost = PAYCHECK_COMMAND * 10.5 + +/datum/armament_entry/company_import/deforest/first_aid_kit/technician_satchel + cost = PAYCHECK_COMMAND * 15.5 +*/ + + +// Basic first aid supplies like gauze, sutures, mesh, so on + +/datum/armament_entry/company_import/deforest/first_aid + cost = PAYCHECK_LOWER * 2 + +/datum/armament_entry/company_import/deforest/first_aid/coagulant + cost = PAYCHECK_LOWER * 2 + +/datum/armament_entry/company_import/deforest/first_aid/suture + cost = PAYCHECK_LOWER * 3 + +/* +/datum/armament_entry/company_import/deforest/first_aid/medicated_sutures + cost = PAYCHECK_LOWER * 7 +*/ + +/datum/armament_entry/company_import/deforest/first_aid/red_sun + cost = PAYCHECK_LOWER * 2 + +/datum/armament_entry/company_import/deforest/first_aid/ointment + cost = PAYCHECK_LOWER * 2 + +/datum/armament_entry/company_import/deforest/first_aid/mesh + cost = PAYCHECK_LOWER * 3 + +/* +/datum/armament_entry/company_import/deforest/first_aid/advanced_mesh + cost = PAYCHECK_LOWER * 7 +*/ + +/datum/armament_entry/company_import/deforest/first_aid/sterile_gauze + cost = PAYCHECK_LOWER * 2 + +/datum/armament_entry/company_import/deforest/first_aid/amollin + +/datum/armament_entry/company_import/deforest/first_aid/robo_patch + +/datum/armament_entry/company_import/deforest/first_aid/bandaid + cost = PAYCHECK_CREW * 3 + +/datum/armament_entry/company_import/deforest/first_aid/subdermal_splint + +/datum/armament_entry/company_import/deforest/first_aid/rapid_coagulant + +/datum/armament_entry/company_import/deforest/first_aid/robofoam + +/datum/armament_entry/company_import/deforest/first_aid/super_robofoam + +/datum/armament_entry/company_import/deforest/first_aid/mannitol + +// Autoinjectors for healing + +/datum/armament_entry/company_import/deforest/medpens + cost = PAYCHECK_LOWER * 5 + +/datum/armament_entry/company_import/deforest/medpens/occuisate + +/datum/armament_entry/company_import/deforest/medpens/morpital + +/datum/armament_entry/company_import/deforest/medpens/lipital + cost = PAYCHECK_LOWER * 7 + +/datum/armament_entry/company_import/deforest/medpens/meridine + +/datum/armament_entry/company_import/deforest/medpens/calopine + cost = PAYCHECK_LOWER * 6 + +/datum/armament_entry/company_import/deforest/medpens/coagulants + cost = PAYCHECK_LOWER * 7 + +/datum/armament_entry/company_import/deforest/medpens/lepoturi + cost = PAYCHECK_LOWER * 7 + +/* +/datum/armament_entry/company_import/deforest/medpens/psifinil +*/ + +/datum/armament_entry/company_import/deforest/medpens/halobinin + +/datum/armament_entry/company_import/deforest/medpens/robo_solder + +/datum/armament_entry/company_import/deforest/medpens/robo_cleaner + +/datum/armament_entry/company_import/deforest/medpens/pentibinin + cost = PAYCHECK_COMMAND * 2 + + +// Autoinjectors for fighting + +/datum/armament_entry/company_import/deforest/medpens_stim + cost = PAYCHECK_COMMAND * 4 + +/datum/armament_entry/company_import/deforest/medpens_stim/adrenaline + +/datum/armament_entry/company_import/deforest/medpens_stim/synephrine + cost = PAYCHECK_COMMAND * 2 + +/datum/armament_entry/company_import/deforest/medpens_stim/krotozine + +/datum/armament_entry/company_import/deforest/medpens_stim/aranepaine + cost = PAYCHECK_COMMAND * 6 + +/datum/armament_entry/company_import/deforest/medpens_stim/synalvipitol + cost = PAYCHECK_COMMAND * 6 + +/datum/armament_entry/company_import/deforest/medpens_stim/twitch + cost = PAYCHECK_COMMAND * 6 + +/datum/armament_entry/company_import/deforest/medpens_stim/demoneye + cost = PAYCHECK_COMMAND * 6 diff --git a/tgstation.dme b/tgstation.dme index 14f3ecd3edc..ca0f964e0c9 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8838,6 +8838,8 @@ #include "tff_modular\modules\bunny\code\clothing\neck.dm" #include "tff_modular\modules\bunny\code\clothing\suit.dm" #include "tff_modular\modules\bunny\code\clothing\under.dm" +#include "tff_modular\modules\cargo\goodies.dm" +#include "tff_modular\modules\cargo\packs\medical.dm" #include "tff_modular\modules\character_directory\character_directory.dm" #include "tff_modular\modules\clothing\backpack\backpack.dm" #include "tff_modular\modules\clothing\suit\suit.dm" @@ -8857,6 +8859,8 @@ #include "tff_modular\modules\custom_smites\floor_gay_vulpes.dm" #include "tff_modular\modules\custom_smites\rapture.dm" #include "tff_modular\modules\deforest_implants\code.dm" +#include "tff_modular\modules\deforest_medical_items\deforest_cargo_packs.dm" +#include "tff_modular\modules\deforest_medical_items\deforest_medical.dm" #include "tff_modular\modules\discord\discord.dm" #include "tff_modular\modules\drinks\skrelluq\glass.dm" #include "tff_modular\modules\drinks\skrelluq\reaction.dm"