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..6d82ae017e6 100644 --- a/modular_nova/modules/loadouts/loadout_items/loadout_datum_pocket.dm +++ b/modular_nova/modules/loadouts/loadout_items/loadout_datum_pocket.dm @@ -223,9 +223,12 @@ name = "Random Pizza Box" item_path = /obj/item/pizzabox/random +// FLUFFY FRONTIER REMOVAL BEGIN: fuck deforest #5219 +/* /datum/loadout_item/pocket_items/medkit name = "First-Aid Kit" item_path = /obj/item/storage/medkit/regular +*/ /datum/loadout_item/pocket_items/medipen_pouch name = "Empty Colonial Medipen Pouch" @@ -235,6 +238,8 @@ name = "Empty Colonial First Aid Pouch" item_path = /obj/item/storage/pouch/cin_medkit +// FLUFFY FRONTIER REMOVAL BEGIN: fuck deforest #5219 +/* /datum/loadout_item/pocket_items/deforest_cheesekit name = "Civil Defense Medical Kit" item_path = /obj/item/storage/medkit/civil_defense/stocked @@ -246,6 +251,7 @@ /datum/loadout_item/pocket_items/synthetic_medkit name = "Robotic Repair Equipment Kit" item_path = /obj/item/storage/medkit/robotic_repair/stocked +*/ /datum/loadout_item/pocket_items/ingredients name = "Wildcard Ingredient Box" 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/company_imports/deforest_cargo_packs.dm b/tff_modular/modules/deforest_medical_items/deforest_cargo_packs.dm similarity index 100% rename from tff_modular/modules/company_imports/deforest_cargo_packs.dm rename to tff_modular/modules/deforest_medical_items/deforest_cargo_packs.dm diff --git a/tff_modular/modules/company_imports/deforest_medical.dm b/tff_modular/modules/deforest_medical_items/deforest_medical.dm similarity index 100% rename from tff_modular/modules/company_imports/deforest_medical.dm rename to tff_modular/modules/deforest_medical_items/deforest_medical.dm diff --git a/tff_modular/modules/loadout/code/medkits/medkits.dm b/tff_modular/modules/loadout/code/medkits/medkits.dm deleted file mode 100644 index 06cdb61fe12..00000000000 --- a/tff_modular/modules/loadout/code/medkits/medkits.dm +++ /dev/null @@ -1,18 +0,0 @@ -#define JOB_GROUP_MEDICAL list(JOB_CORONER, \ - JOB_MEDICAL_DOCTOR, \ - JOB_PARAMEDIC, \ - JOB_CHEMIST, \ - JOB_VIROLOGIST, \ - JOB_ORDERLY, \ - JOB_CHIEF_MEDICAL_OFFICER, \ -) - - -/datum/loadout_item/pocket_items/medkit - restricted_roles = JOB_GROUP_MEDICAL - -/datum/loadout_item/pocket_items/deforest_cheesekit - restricted_roles = JOB_GROUP_MEDICAL - - -#undef JOB_GROUP_MEDICAL diff --git a/tgstation.dme b/tgstation.dme index ab41ad5eab2..1b9fb8fa088 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8838,6 +8838,7 @@ #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\character_directory\character_directory.dm" #include "tff_modular\modules\clothing\backpack\backpack.dm" #include "tff_modular\modules\clothing\suit\suit.dm" @@ -8875,7 +8876,6 @@ #include "tff_modular\modules\loadout\code\clothing\grayscale.dm" #include "tff_modular\modules\loadout\code\clothing\neck.dm" #include "tff_modular\modules\loadout\code\loadout\neck.dm" -#include "tff_modular\modules\loadout\code\medkits\medkits.dm" #include "tff_modular\modules\martial\sleeping_carp.dm" #include "tff_modular\modules\modular_automapper\automapper.dm" #include "tff_modular\modules\modular_automapper\replacer.dm"