From b5d511e9a148b9e7c0852f25041a3346ccea24c6 Mon Sep 17 00:00:00 2001 From: Kocma-san Date: Mon, 16 Dec 2024 05:09:21 +0700 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=B5=D0=BB=D0=B0=D0=B5=D0=BC=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B4=D1=83=D0=BB=D1=8C=D0=BD=D0=BE=20(=D1=87=D0=B0?= =?UTF-8?q?=D1=81=D1=82=D1=8C)=20=D0=B8=20=D1=86=D0=B5=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=8F=D0=B5=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code/armament_datums/deforest_medical.dm | 16 ++- .../company_imports/deforest_medical.dm | 112 ++++++++++++++++++ tgstation.dme | 1 + 3 files changed, 120 insertions(+), 9 deletions(-) create mode 100644 tff_modular/modules/company_imports/deforest_medical.dm 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 ba2c2ec62c6..8981508afcf 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 @@ -114,15 +114,11 @@ subcategory = "Medical Autoinjectors" cost = PAYCHECK_LOWER * 3 -// FLUFFY FRONTIER REMOVAL BEGIN: fuck deforest #5219 -/* /datum/armament_entry/company_import/deforest/medpens/occuisate item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/occuisate /datum/armament_entry/company_import/deforest/medpens/morpital item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/morpital -*/ -// FLUFFY FRONTIER REMOVAL END /datum/armament_entry/company_import/deforest/medpens/lipital item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/lipital @@ -132,16 +128,19 @@ /datum/armament_entry/company_import/deforest/medpens/calopine item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/calopine - cost = PAYCHECK_LOWER * 6 // FLUFFY FRONTIER ADDITION: fuck deforest #5219; // FLUFFY FRONTIER REMOVAL BEGIN: fuck deforest #5219 /* /datum/armament_entry/company_import/deforest/medpens/coagulants item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/coagulants +*/ +// FLUFFY FRONTIER REMOVAL END /datum/armament_entry/company_import/deforest/medpens/lepoturi item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/lepoturi +// FLUFFY FRONTIER REMOVAL BEGIN: fuck deforest #5219 +/* /datum/armament_entry/company_import/deforest/medpens/psifinil item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/psifinil */ @@ -168,14 +167,13 @@ /datum/armament_entry/company_import/deforest/medpens_stim subcategory = "Stimulant Autoinjectors" - cost = PAYCHECK_COMMAND * 8 // FLUFFY FRONTIER EDIT: fuck deforest #5219; original: PAYCHECK_COMMAND * 2 + cost = PAYCHECK_COMMAND * 2 /datum/armament_entry/company_import/deforest/medpens_stim/adrenaline item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/adrenaline /datum/armament_entry/company_import/deforest/medpens_stim/synephrine item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/synephrine - cost = PAYCHECK_LOWER * 6 // FLUFFY FRONTIER ADDITION: fuck deforest #5219; (Он слабее калопина...) /datum/armament_entry/company_import/deforest/medpens_stim/krotozine item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/krotozine @@ -190,12 +188,12 @@ /datum/armament_entry/company_import/deforest/medpens_stim/twitch item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/twitch - cost = PAYCHECK_COMMAND * 12 // FLUFFY FRONTIER EDIT: fuck deforest #5219; original: PAYCHECK_COMMAND * 3 + cost = PAYCHECK_COMMAND * 3 contraband = TRUE /datum/armament_entry/company_import/deforest/medpens_stim/demoneye item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/demoneye - cost = PAYCHECK_COMMAND * 12 // FLUFFY FRONTIER EDIT: fuck deforest #5219; original: PAYCHECK_COMMAND * 3 + cost = PAYCHECK_COMMAND * 3 contraband = TRUE // Equipment, from defibs to scanners to surgical tools diff --git a/tff_modular/modules/company_imports/deforest_medical.dm b/tff_modular/modules/company_imports/deforest_medical.dm new file mode 100644 index 00000000000..969ff17553a --- /dev/null +++ b/tff_modular/modules/company_imports/deforest_medical.dm @@ -0,0 +1,112 @@ +// Изменение цен для импортов вот этих вот -> 'modular_nova\modules\company_imports\code\armament_datums\deforest_medical.dm' + + +// 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.5 + +/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 + + +// 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 + item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/coagulants +*/ + +/datum/armament_entry/company_import/deforest/medpens/lepoturi + cost = PAYCHECK_LOWER * 7 + +/* +/datum/armament_entry/company_import/deforest/medpens/psifinil + item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/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.5 + + +// 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.5 + +/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 + item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/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 16ac55e3fdb..9f1e2cb10c9 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8825,6 +8825,7 @@ #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" +#include "tff_modular\modules\company_imports\deforest_medical.dm" #include "tff_modular\modules\cqd_holsters\code\holster.dm" #include "tff_modular\modules\cqd_holsters\code\holster_injections.dm" #include "tff_modular\modules\cqd_holsters\code\holster_storage.dm"