From d431c79eda3ab360a201828ace3657bfe22e0b40 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Fri, 1 Nov 2024 03:24:39 +0300 Subject: [PATCH 01/47] modified: code/__DEFINES/colors.dm modified: code/__DEFINES/loadout.dm modified: code/game/objects/items/reagent_containers/autoinjectors.dm modified: code/game/objects/machinery/vending/marine_vending.dm modified: code/modules/reagents/reactions/other.dm modified: code/modules/reagents/reagents/medical.dm modified: code/modules/reqs/medical.dm --- code/__DEFINES/colors.dm | 1 + code/__DEFINES/loadout.dm | 1 + .../items/reagent_containers/autoinjectors.dm | 10 ++++ .../machinery/vending/marine_vending.dm | 1 + code/modules/reagents/reactions/other.dm | 5 ++ code/modules/reagents/reagents/medical.dm | 49 +++++++++++++++++++ code/modules/reqs/medical.dm | 17 +++++++ 7 files changed, 84 insertions(+) diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 8c4a76f18b5..65bb75002a9 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -169,6 +169,7 @@ #define COLOR_REAGENT_SULFASALAZINE "#266930" #define COLOR_REAGENT_DIBORANE "#1800a3" #define COLOR_REAGENT_STIMULON "#19C832" +#define COLOR_REAGENT_MASSPEED "#062c48" //Color defines used by toxin #define COLOR_TOXIN_TOXIN "#CF3600" // rgb: 207, 54, 0 diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index 589241d0108..d2c40305aa6 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -77,6 +77,7 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list( /obj/item/sidecar = list(CAT_MARINE, "Bike sidecar", 8, "blue"), /obj/item/ammo_magazine/rifle/ar21/extended = list(CAT_MARINE, "AR-21 extended magazine", 14, "blue"), /obj/item/storage/briefcase/standard_magnum = list(CAT_MARINE, "R-76 crate", 22, "blue"), + /obj/item/reagent_containers/hypospray/autoinjector/masspeed = list(CAT_MARINE, "M-S neurostimulator", 25, "black"), )) GLOBAL_LIST_INIT(robot_gear_listed_products, list( diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm index 061ca7fd61e..87ca8ffa175 100644 --- a/code/game/objects/items/reagent_containers/autoinjectors.dm +++ b/code/game/objects/items/reagent_containers/autoinjectors.dm @@ -370,3 +370,13 @@ /obj/item/reagent_containers/hypospray/autoinjector/yautja/interact(mob/user) return + +/obj/item/reagent_containers/hypospray/autoinjector/masspeed + name = "masspeed autoinjector" + desc = "An auto-injector loaded with 1 unit neurostimulant. !DO NOT USE WITH MEDICAL NANITES!" + icon_state = "RedWhite" + amount_per_transfer_from_this = 1 + volume = 1 + list_reagents = list(/datum/reagent/medicine/masspeed = 1) + free_refills = FALSE + description_overlay = "Ms" diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm index 915a3ff5f5c..d20da3ec31c 100644 --- a/code/game/objects/machinery/vending/marine_vending.dm +++ b/code/game/objects/machinery/vending/marine_vending.dm @@ -1034,6 +1034,7 @@ /obj/item/reagent_containers/hypospray/autoinjector/neuraline = -1, /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = -1, /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = -1, + /obj/item/reagent_containers/hypospray/autoinjector/masspeed = -1, )) /obj/machinery/vending/MarineMed/Blood diff --git a/code/modules/reagents/reactions/other.dm b/code/modules/reagents/reactions/other.dm index a6b5d5c74a6..fdde1526c85 100644 --- a/code/modules/reagents/reactions/other.dm +++ b/code/modules/reagents/reactions/other.dm @@ -18,6 +18,11 @@ results = list(/datum/reagent/toxin/sleeptoxin = 5) required_reagents = list(/datum/reagent/toxin/chloralhydrate = 1, /datum/reagent/consumable/sugar = 4) +/datum/chemical_reaction/antipathy + name = "Antipathy" + results = list(/datum/reagent/toxin/sleeptoxin = 2) + required_reagents = list(/datum/reagent/toxin/xeno_hemodile = 1, /datum/reagent/medicine/masspeed = 1) + /datum/chemical_reaction/mutagen name = "Unstable mutagen" results = list(/datum/reagent/toxin/mutagen = 3) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 82b46c0f1a1..d3f978ab4a3 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1679,3 +1679,52 @@ /datum/reagent/medicine/ifosfamide/overdose_crit_process(mob/living/L, metabolism) L.adjustToxLoss(4*effect_str) + +/datum/reagent/medicine/masspeed + name = "MasSpeed" + description = "This is a neurostimulating substance that causes the brain to maintain an increased heart rate." + color = COLOR_REAGENT_MASSPEED + custom_metabolism = REAGENTS_METABOLISM * 0 + scannable = TRUE + taste_description = "tastes like sour coffee" + overdose_threshold = 6 + overdose_crit_threshold = 7 + purge_rate = 10 + purge_list = list( + /datum/reagent/medicalnanites, + /datum/reagent/medicine/peridaxon, + /datum/reagent/medicine/peridaxon_plus, + /datum/reagent/medicine/paracetamol, + ) + +/datum/reagent/medicine/masspeed/on_mob_add(mob/living/L, metabolism) + L.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.3) + to_chat(L, span_userdanger("You feel like your heart will stop at any second.")) + trait_flags = TACHYCARDIC + +/datum/reagent/medicine/masspeed/on_mob_life(mob/living/L, metabolism) + . = ..() + if(volume < 5) + L.reagents.add_reagent(/datum/reagent/medicine/masspeed, 0.5) + switch(current_cycle) + if(1 to 80) + L.adjustStaminaLoss((4)*effect_str) + L.jitter(30) + if(3) + to_chat(L, span_notice("Your heart is jumping out of your chest")) + if(81) + to_chat(L, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) + if (89 to INFINITY) + if(prob(1)) + to_chat(L, span_userdanger("OUUH MY HEART")) + if(!ishuman(L)) + L.adjustOxyLoss(1.5*effect_str) + var/mob/living/carbon/human/H = L + var/datum/internal_organ/heart/E = H.get_organ_slot(ORGAN_SLOT_HEART) + if(E) + E.take_damage(1.5*effect_str, TRUE) + +/datum/reagent/medicine/masspeed/on_mob_delete(mob/living/L, metabolism) + to_chat(L, span_userdanger("It seems that something has stopped pushing your heart with force.")) + L.remove_movespeed_modifier(type) + L.Paralyze(2 SECONDS) diff --git a/code/modules/reqs/medical.dm b/code/modules/reqs/medical.dm index 002bd52361f..d9636965621 100644 --- a/code/modules/reqs/medical.dm +++ b/code/modules/reqs/medical.dm @@ -324,6 +324,23 @@ contains = list(/obj/item/reagent_containers/hypospray/autoinjector/oxycodone) cost = 20 +/datum/supply_packs/medical/Ms_neurostimulator + name = "M-S neurostimulator injector" + notes = "contains M-S neurostimulator auto injector." + contains = list(/obj/item/reagent_containers/hypospray/autoinjector/masspeed) + cost = 200 + +/datum/supply_packs/medical/Ms_neurostimulator_kit + name = "M-S neurostimulator kit" + notes = "contains 5 M-S neurostimulator auto injectors." + contains = list( + /obj/item/reagent_containers/hypospray/autoinjector/masspeed, + /obj/item/reagent_containers/hypospray/autoinjector/masspeed, + /obj/item/reagent_containers/hypospray/autoinjector/masspeed, + /obj/item/reagent_containers/hypospray/autoinjector/masspeed, + /obj/item/reagent_containers/hypospray/autoinjector/masspeed, + ) + cost = 750 /datum/supply_packs/medical/neuraline_kit name ="large neuraline kit" notes = "contains five neuraline injectors" From 1ec54b016b2a07094fe80ea9c265d3ecd705ae82 Mon Sep 17 00:00:00 2001 From: Istrelok2107 Date: Fri, 1 Nov 2024 10:25:03 +0300 Subject: [PATCH 02/47] Update code/modules/reagents/reactions/other.dm Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> Signed-off-by: Istrelok2107 --- code/modules/reagents/reactions/other.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reactions/other.dm b/code/modules/reagents/reactions/other.dm index fdde1526c85..bb4a186d903 100644 --- a/code/modules/reagents/reactions/other.dm +++ b/code/modules/reagents/reactions/other.dm @@ -18,7 +18,7 @@ results = list(/datum/reagent/toxin/sleeptoxin = 5) required_reagents = list(/datum/reagent/toxin/chloralhydrate = 1, /datum/reagent/consumable/sugar = 4) -/datum/chemical_reaction/antipathy +/datum/chemical_reaction/sleeptoxin_two name = "Antipathy" results = list(/datum/reagent/toxin/sleeptoxin = 2) required_reagents = list(/datum/reagent/toxin/xeno_hemodile = 1, /datum/reagent/medicine/masspeed = 1) From 99b7555191abffa014710c4eaf23955918c00e8c Mon Sep 17 00:00:00 2001 From: Istrelok2107 Date: Fri, 1 Nov 2024 10:25:21 +0300 Subject: [PATCH 03/47] Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> Signed-off-by: Istrelok2107 --- code/modules/reagents/reagents/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index d3f978ab4a3..c5d198296c2 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1686,7 +1686,7 @@ color = COLOR_REAGENT_MASSPEED custom_metabolism = REAGENTS_METABOLISM * 0 scannable = TRUE - taste_description = "tastes like sour coffee" + taste_description = "sour coffee" overdose_threshold = 6 overdose_crit_threshold = 7 purge_rate = 10 From aaa2ced37fbb39c3ea82f47a0724f4edfbc6eda9 Mon Sep 17 00:00:00 2001 From: Istrelok2107 Date: Fri, 1 Nov 2024 10:25:48 +0300 Subject: [PATCH 04/47] Update code/modules/reagents/reactions/other.dm Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> Signed-off-by: Istrelok2107 --- code/modules/reagents/reactions/other.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reactions/other.dm b/code/modules/reagents/reactions/other.dm index bb4a186d903..6c4a53080bc 100644 --- a/code/modules/reagents/reactions/other.dm +++ b/code/modules/reagents/reactions/other.dm @@ -19,7 +19,7 @@ required_reagents = list(/datum/reagent/toxin/chloralhydrate = 1, /datum/reagent/consumable/sugar = 4) /datum/chemical_reaction/sleeptoxin_two - name = "Antipathy" + name = "Sleeptoxin" results = list(/datum/reagent/toxin/sleeptoxin = 2) required_reagents = list(/datum/reagent/toxin/xeno_hemodile = 1, /datum/reagent/medicine/masspeed = 1) From 766f2c076eac9c3aef5bdc59d713aceb12ebdb1b Mon Sep 17 00:00:00 2001 From: Istrelok2107 Date: Fri, 1 Nov 2024 10:26:07 +0300 Subject: [PATCH 05/47] Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> Signed-off-by: Istrelok2107 --- code/modules/reagents/reagents/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index c5d198296c2..87dde407937 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1714,7 +1714,7 @@ to_chat(L, span_notice("Your heart is jumping out of your chest")) if(81) to_chat(L, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) - if (89 to INFINITY) + if(89 to INFINITY) if(prob(1)) to_chat(L, span_userdanger("OUUH MY HEART")) if(!ishuman(L)) From f53e58a8feb646c2176fa3c23f9ae1779e72a414 Mon Sep 17 00:00:00 2001 From: Istrelok2107 Date: Fri, 1 Nov 2024 10:26:54 +0300 Subject: [PATCH 06/47] Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> Signed-off-by: Istrelok2107 --- code/modules/reagents/reagents/medical.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 87dde407937..ccf81bcf62c 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1718,11 +1718,11 @@ if(prob(1)) to_chat(L, span_userdanger("OUUH MY HEART")) if(!ishuman(L)) - L.adjustOxyLoss(1.5*effect_str) + L.adjustOxyLoss(1.5 * effect_str) var/mob/living/carbon/human/H = L var/datum/internal_organ/heart/E = H.get_organ_slot(ORGAN_SLOT_HEART) if(E) - E.take_damage(1.5*effect_str, TRUE) + E.take_damage(1.5 * effect_str, TRUE) /datum/reagent/medicine/masspeed/on_mob_delete(mob/living/L, metabolism) to_chat(L, span_userdanger("It seems that something has stopped pushing your heart with force.")) From fc78a680dd4bee37564bb1344a701843523b7f70 Mon Sep 17 00:00:00 2001 From: Istrelok2107 Date: Fri, 1 Nov 2024 10:27:13 +0300 Subject: [PATCH 07/47] Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> Signed-off-by: Istrelok2107 --- code/modules/reagents/reagents/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index ccf81bcf62c..87a000ab061 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1708,7 +1708,7 @@ L.reagents.add_reagent(/datum/reagent/medicine/masspeed, 0.5) switch(current_cycle) if(1 to 80) - L.adjustStaminaLoss((4)*effect_str) + L.adjustStaminaLoss((4) * effect_str) L.jitter(30) if(3) to_chat(L, span_notice("Your heart is jumping out of your chest")) From e594f9c8d00115ac7a7b4352aca0fb48534096ec Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Fri, 1 Nov 2024 13:36:35 +0300 Subject: [PATCH 08/47] modified: code/__DEFINES/colors.dm modified: code/__DEFINES/loadout.dm modified: code/game/objects/items/reagent_containers/autoinjectors.dm modified: code/game/objects/machinery/vending/marine_vending.dm modified: code/modules/reagents/reactions/other.dm modified: code/modules/reagents/reagents/medical.dm modified: code/modules/reqs/medical.dm --- code/__DEFINES/colors.dm | 2 +- code/__DEFINES/loadout.dm | 2 +- .../items/reagent_containers/autoinjectors.dm | 8 ++++---- .../objects/machinery/vending/marine_vending.dm | 2 +- code/modules/reagents/reactions/other.dm | 2 +- code/modules/reagents/reagents/medical.dm | 14 +++++++------- code/modules/reqs/medical.dm | 16 ++++++++-------- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 65bb75002a9..c1f69ad62b2 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -169,7 +169,7 @@ #define COLOR_REAGENT_SULFASALAZINE "#266930" #define COLOR_REAGENT_DIBORANE "#1800a3" #define COLOR_REAGENT_STIMULON "#19C832" -#define COLOR_REAGENT_MASSPEED "#062c48" +#define COLOR_REAGENT_MASTAC "#062c48" //Color defines used by toxin #define COLOR_TOXIN_TOXIN "#CF3600" // rgb: 207, 54, 0 diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index d2c40305aa6..03126a0c316 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -77,7 +77,7 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list( /obj/item/sidecar = list(CAT_MARINE, "Bike sidecar", 8, "blue"), /obj/item/ammo_magazine/rifle/ar21/extended = list(CAT_MARINE, "AR-21 extended magazine", 14, "blue"), /obj/item/storage/briefcase/standard_magnum = list(CAT_MARINE, "R-76 crate", 22, "blue"), - /obj/item/reagent_containers/hypospray/autoinjector/masspeed = list(CAT_MARINE, "M-S neurostimulator", 25, "black"), + /obj/item/reagent_containers/hypospray/autoinjector/mastac = list(CAT_MARINE, "M-S neurostimulator", 25, "black"), )) GLOBAL_LIST_INIT(robot_gear_listed_products, list( diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm index 87ca8ffa175..4e316a91c39 100644 --- a/code/game/objects/items/reagent_containers/autoinjectors.dm +++ b/code/game/objects/items/reagent_containers/autoinjectors.dm @@ -371,12 +371,12 @@ /obj/item/reagent_containers/hypospray/autoinjector/yautja/interact(mob/user) return -/obj/item/reagent_containers/hypospray/autoinjector/masspeed - name = "masspeed autoinjector" +/obj/item/reagent_containers/hypospray/autoinjector/mastac + name = "mastac autoinjector" desc = "An auto-injector loaded with 1 unit neurostimulant. !DO NOT USE WITH MEDICAL NANITES!" icon_state = "RedWhite" amount_per_transfer_from_this = 1 volume = 1 - list_reagents = list(/datum/reagent/medicine/masspeed = 1) + list_reagents = list(/datum/reagent/medicine/mastac = 1) free_refills = FALSE - description_overlay = "Ms" + description_overlay = "Mt" diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm index d20da3ec31c..c0ff18d7615 100644 --- a/code/game/objects/machinery/vending/marine_vending.dm +++ b/code/game/objects/machinery/vending/marine_vending.dm @@ -1034,7 +1034,7 @@ /obj/item/reagent_containers/hypospray/autoinjector/neuraline = -1, /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = -1, /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = -1, - /obj/item/reagent_containers/hypospray/autoinjector/masspeed = -1, + /obj/item/reagent_containers/hypospray/autoinjector/mastac = -1, )) /obj/machinery/vending/MarineMed/Blood diff --git a/code/modules/reagents/reactions/other.dm b/code/modules/reagents/reactions/other.dm index fdde1526c85..622e7c49bca 100644 --- a/code/modules/reagents/reactions/other.dm +++ b/code/modules/reagents/reactions/other.dm @@ -21,7 +21,7 @@ /datum/chemical_reaction/antipathy name = "Antipathy" results = list(/datum/reagent/toxin/sleeptoxin = 2) - required_reagents = list(/datum/reagent/toxin/xeno_hemodile = 1, /datum/reagent/medicine/masspeed = 1) + required_reagents = list(/datum/reagent/toxin/xeno_hemodile = 1, /datum/reagent/medicine/mastac = 1) /datum/chemical_reaction/mutagen name = "Unstable mutagen" diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index d3f978ab4a3..e7e26c3f143 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1680,10 +1680,10 @@ /datum/reagent/medicine/ifosfamide/overdose_crit_process(mob/living/L, metabolism) L.adjustToxLoss(4*effect_str) -/datum/reagent/medicine/masspeed - name = "MasSpeed" +/datum/reagent/medicine/mastac + name = "MasTac" description = "This is a neurostimulating substance that causes the brain to maintain an increased heart rate." - color = COLOR_REAGENT_MASSPEED + color = COLOR_REAGENT_MASTAC custom_metabolism = REAGENTS_METABOLISM * 0 scannable = TRUE taste_description = "tastes like sour coffee" @@ -1697,15 +1697,15 @@ /datum/reagent/medicine/paracetamol, ) -/datum/reagent/medicine/masspeed/on_mob_add(mob/living/L, metabolism) +/datum/reagent/medicine/mastac/on_mob_add(mob/living/L, metabolism) L.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.3) to_chat(L, span_userdanger("You feel like your heart will stop at any second.")) trait_flags = TACHYCARDIC -/datum/reagent/medicine/masspeed/on_mob_life(mob/living/L, metabolism) +/datum/reagent/medicine/mastac/on_mob_life(mob/living/L, metabolism) . = ..() if(volume < 5) - L.reagents.add_reagent(/datum/reagent/medicine/masspeed, 0.5) + L.reagents.add_reagent(/datum/reagent/medicine/mastac, 0.5) switch(current_cycle) if(1 to 80) L.adjustStaminaLoss((4)*effect_str) @@ -1724,7 +1724,7 @@ if(E) E.take_damage(1.5*effect_str, TRUE) -/datum/reagent/medicine/masspeed/on_mob_delete(mob/living/L, metabolism) +/datum/reagent/medicine/mastac/on_mob_delete(mob/living/L, metabolism) to_chat(L, span_userdanger("It seems that something has stopped pushing your heart with force.")) L.remove_movespeed_modifier(type) L.Paralyze(2 SECONDS) diff --git a/code/modules/reqs/medical.dm b/code/modules/reqs/medical.dm index d9636965621..7d1539172b2 100644 --- a/code/modules/reqs/medical.dm +++ b/code/modules/reqs/medical.dm @@ -324,21 +324,21 @@ contains = list(/obj/item/reagent_containers/hypospray/autoinjector/oxycodone) cost = 20 -/datum/supply_packs/medical/Ms_neurostimulator +/datum/supply_packs/medical/Mt_neurostimulator name = "M-S neurostimulator injector" notes = "contains M-S neurostimulator auto injector." - contains = list(/obj/item/reagent_containers/hypospray/autoinjector/masspeed) + contains = list(/obj/item/reagent_containers/hypospray/autoinjector/mastac) cost = 200 -/datum/supply_packs/medical/Ms_neurostimulator_kit +/datum/supply_packs/medical/Mt_neurostimulator_kit name = "M-S neurostimulator kit" notes = "contains 5 M-S neurostimulator auto injectors." contains = list( - /obj/item/reagent_containers/hypospray/autoinjector/masspeed, - /obj/item/reagent_containers/hypospray/autoinjector/masspeed, - /obj/item/reagent_containers/hypospray/autoinjector/masspeed, - /obj/item/reagent_containers/hypospray/autoinjector/masspeed, - /obj/item/reagent_containers/hypospray/autoinjector/masspeed, + /obj/item/reagent_containers/hypospray/autoinjector/mastac, + /obj/item/reagent_containers/hypospray/autoinjector/mastac, + /obj/item/reagent_containers/hypospray/autoinjector/mastac, + /obj/item/reagent_containers/hypospray/autoinjector/mastac, + /obj/item/reagent_containers/hypospray/autoinjector/mastac, ) cost = 750 /datum/supply_packs/medical/neuraline_kit From ab2d07b664deb8df283c3ca54fee9d624c8fa67a Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Fri, 1 Nov 2024 14:38:37 +0300 Subject: [PATCH 09/47] modified: code/modules/reagents/reagents/medical.dm --- code/modules/reagents/reagents/medical.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 01e607be1a4..986787e791c 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1715,14 +1715,15 @@ if(81) to_chat(L, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) if(89 to INFINITY) - if(prob(1)) + if(prob(0.5)) to_chat(L, span_userdanger("OUUH MY HEART")) if(!ishuman(L)) - L.adjustOxyLoss(1.5 * effect_str) - var/mob/living/carbon/human/H = L - var/datum/internal_organ/heart/E = H.get_organ_slot(ORGAN_SLOT_HEART) - if(E) - E.take_damage(1.5 * effect_str, TRUE) + return + L.adjustOxyLoss(30) + var/mob/living/carbon/human/H = L + var/datum/internal_organ/heart/E = H.get_organ_slot(ORGAN_SLOT_HEART) + if(E) + E.take_damage(7, TRUE) /datum/reagent/medicine/mastac/on_mob_delete(mob/living/L, metabolism) to_chat(L, span_userdanger("It seems that something has stopped pushing your heart with force.")) From 9905a1b237d8d2fa318e98cf99165b896a9adc8f Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Fri, 1 Nov 2024 16:57:31 +0300 Subject: [PATCH 10/47] modified: code/modules/reagents/reagents/medical.dm --- code/modules/reagents/reagents/medical.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 986787e791c..1a8f6093163 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1687,8 +1687,8 @@ custom_metabolism = REAGENTS_METABOLISM * 0 scannable = TRUE taste_description = "sour coffee" - overdose_threshold = 6 - overdose_crit_threshold = 7 + overdose_threshold = 10 + overdose_crit_threshold = 10 purge_rate = 10 purge_list = list( /datum/reagent/medicalnanites, @@ -1709,7 +1709,7 @@ switch(current_cycle) if(1 to 80) L.adjustStaminaLoss((4) * effect_str) - L.jitter(30) + L.jitter(2) if(3) to_chat(L, span_notice("Your heart is jumping out of your chest")) if(81) From f75acdee1b95f6fb12007a4b193409b1653d9add Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Fri, 1 Nov 2024 17:11:01 +0300 Subject: [PATCH 11/47] modified: code/modules/reagents/reactions/other.dm --- code/modules/reagents/reactions/other.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reactions/other.dm b/code/modules/reagents/reactions/other.dm index a634299adfb..6eac4a27c25 100644 --- a/code/modules/reagents/reactions/other.dm +++ b/code/modules/reagents/reactions/other.dm @@ -20,8 +20,8 @@ /datum/chemical_reaction/sleeptoxin_two name = "Sleeptoxin" - results = list(/datum/reagent/toxin/sleeptoxin = 2) - required_reagents = list(/datum/reagent/toxin/xeno_hemodile = 1, /datum/reagent/medicine/mastac = 1) + results = list(/datum/reagent/toxin/sleeptoxin = 1) + required_reagents = list(/datum/reagent/toxin/xeno_hemodile = 2, /datum/reagent/medicine/mastac = 0.5) /datum/chemical_reaction/mutagen name = "Unstable mutagen" From 557a8d11a6d3c3bed8a7885452f612a8ed4bad39 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Fri, 1 Nov 2024 22:46:18 +0300 Subject: [PATCH 12/47] modified: code/modules/reagents/reagents/medical.dm --- code/modules/reagents/reagents/medical.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 1a8f6093163..6f31f7dba4a 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1698,9 +1698,8 @@ ) /datum/reagent/medicine/mastac/on_mob_add(mob/living/L, metabolism) - L.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.3) + L.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.5) to_chat(L, span_userdanger("You feel like your heart will stop at any second.")) - trait_flags = TACHYCARDIC /datum/reagent/medicine/mastac/on_mob_life(mob/living/L, metabolism) . = ..() @@ -1715,7 +1714,8 @@ if(81) to_chat(L, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) if(89 to INFINITY) - if(prob(0.5)) + trait_flags = TACHYCARDIC + if(prob(0.3)) to_chat(L, span_userdanger("OUUH MY HEART")) if(!ishuman(L)) return @@ -1723,7 +1723,7 @@ var/mob/living/carbon/human/H = L var/datum/internal_organ/heart/E = H.get_organ_slot(ORGAN_SLOT_HEART) if(E) - E.take_damage(7, TRUE) + E.take_damage(15, TRUE) /datum/reagent/medicine/mastac/on_mob_delete(mob/living/L, metabolism) to_chat(L, span_userdanger("It seems that something has stopped pushing your heart with force.")) From 7854d79f942ff1971b88d88c44b57f5dd193a475 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Fri, 1 Nov 2024 23:15:37 +0300 Subject: [PATCH 13/47] modified: code/modules/reqs/medical.dm --- code/modules/reqs/medical.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reqs/medical.dm b/code/modules/reqs/medical.dm index 7d1539172b2..3e347594c17 100644 --- a/code/modules/reqs/medical.dm +++ b/code/modules/reqs/medical.dm @@ -328,7 +328,7 @@ name = "M-S neurostimulator injector" notes = "contains M-S neurostimulator auto injector." contains = list(/obj/item/reagent_containers/hypospray/autoinjector/mastac) - cost = 200 + cost = 140 /datum/supply_packs/medical/Mt_neurostimulator_kit name = "M-S neurostimulator kit" @@ -340,7 +340,7 @@ /obj/item/reagent_containers/hypospray/autoinjector/mastac, /obj/item/reagent_containers/hypospray/autoinjector/mastac, ) - cost = 750 + cost = 500 /datum/supply_packs/medical/neuraline_kit name ="large neuraline kit" notes = "contains five neuraline injectors" From bf29a97f9fdae483489e25b1902fba5afde7c764 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Fri, 1 Nov 2024 23:37:12 +0300 Subject: [PATCH 14/47] modified: code/modules/reagents/reagents/medical.dm --- code/modules/reagents/reagents/medical.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 6f31f7dba4a..c3f815da7f5 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1698,7 +1698,7 @@ ) /datum/reagent/medicine/mastac/on_mob_add(mob/living/L, metabolism) - L.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.5) + L.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.4) to_chat(L, span_userdanger("You feel like your heart will stop at any second.")) /datum/reagent/medicine/mastac/on_mob_life(mob/living/L, metabolism) @@ -1706,20 +1706,20 @@ if(volume < 5) L.reagents.add_reagent(/datum/reagent/medicine/mastac, 0.5) switch(current_cycle) - if(1 to 80) + if(1 to 40) L.adjustStaminaLoss((4) * effect_str) L.jitter(2) if(3) to_chat(L, span_notice("Your heart is jumping out of your chest")) - if(81) + if(41) to_chat(L, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) - if(89 to INFINITY) + if(45 to INFINITY) trait_flags = TACHYCARDIC - if(prob(0.3)) + if(prob(2)) to_chat(L, span_userdanger("OUUH MY HEART")) + L.adjustOxyLoss(30) if(!ishuman(L)) return - L.adjustOxyLoss(30) var/mob/living/carbon/human/H = L var/datum/internal_organ/heart/E = H.get_organ_slot(ORGAN_SLOT_HEART) if(E) From 078cfea1577638d936985f2fd6ecfa7df0d6ee65 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Sat, 2 Nov 2024 02:09:44 +0300 Subject: [PATCH 15/47] modified: code/__DEFINES/loadout.dm --- code/__DEFINES/loadout.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index 03126a0c316..c56f32d6526 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -70,6 +70,7 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list( /obj/structure/closet/crate/mortar_ammo/mortar_kit = list(CAT_MARINE, "Mortar kit", 35, "orange3"), /obj/structure/closet/crate/mortar_ammo/howitzer_kit = list(CAT_MARINE, "Howitzer kit", 35, "orange3"), /obj/structure/closet/crate/mortar_ammo/mlrs_kit = list(CAT_MARINE, "MLRS kit", 35, "orange3"), + /obj/item/reagent_containers/hypospray/autoinjector/mastac = list(CAT_MARINE, "M-S neurostimulator", 25, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = list(CAT_MARINE, "Oxycodone autoinjector", 5, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/russian_red = list(CAT_MARINE, "Emergency autoinjecto", 10, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"), @@ -77,7 +78,6 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list( /obj/item/sidecar = list(CAT_MARINE, "Bike sidecar", 8, "blue"), /obj/item/ammo_magazine/rifle/ar21/extended = list(CAT_MARINE, "AR-21 extended magazine", 14, "blue"), /obj/item/storage/briefcase/standard_magnum = list(CAT_MARINE, "R-76 crate", 22, "blue"), - /obj/item/reagent_containers/hypospray/autoinjector/mastac = list(CAT_MARINE, "M-S neurostimulator", 25, "black"), )) GLOBAL_LIST_INIT(robot_gear_listed_products, list( From ac521436d915ce7e2e93d633eeffb6cd16455025 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Sun, 3 Nov 2024 01:20:12 +0300 Subject: [PATCH 16/47] helg fetish --- code/modules/reagents/reagents/medical.dm | 44 +++++++++++------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index c3f815da7f5..41b9ecece45 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1689,6 +1689,7 @@ taste_description = "sour coffee" overdose_threshold = 10 overdose_crit_threshold = 10 + trait_flags = TACHYCARDIC purge_rate = 10 purge_list = list( /datum/reagent/medicalnanites, @@ -1697,35 +1698,34 @@ /datum/reagent/medicine/paracetamol, ) -/datum/reagent/medicine/mastac/on_mob_add(mob/living/L, metabolism) - L.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.4) - to_chat(L, span_userdanger("You feel like your heart will stop at any second.")) +/datum/reagent/medicine/mastac/on_mob_add(mob/living/live, metabolism) + live.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.4) + to_chat(live, span_userdanger("You feel like your heart will stop at any second.")) -/datum/reagent/medicine/mastac/on_mob_life(mob/living/L, metabolism) +/datum/reagent/medicine/mastac/on_mob_life(mob/living/live, metabolism) . = ..() if(volume < 5) - L.reagents.add_reagent(/datum/reagent/medicine/mastac, 0.5) + live.reagents.add_reagent(/datum/reagent/medicine/mastac, 0.5) switch(current_cycle) if(1 to 40) - L.adjustStaminaLoss((4) * effect_str) - L.jitter(2) + live.adjustStaminaLoss((4) * effect_str) + live.jitter(2) if(3) - to_chat(L, span_notice("Your heart is jumping out of your chest")) + to_chat(live, span_notice("Your heart is jumping out of your chest")) if(41) - to_chat(L, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) + to_chat(live, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) if(45 to INFINITY) - trait_flags = TACHYCARDIC if(prob(2)) - to_chat(L, span_userdanger("OUUH MY HEART")) - L.adjustOxyLoss(30) - if(!ishuman(L)) + to_chat(live, span_userdanger("OUUH MY HEART")) + live.adjustOxyLoss(30) + if(!ishuman(live)) return - var/mob/living/carbon/human/H = L - var/datum/internal_organ/heart/E = H.get_organ_slot(ORGAN_SLOT_HEART) - if(E) - E.take_damage(15, TRUE) - -/datum/reagent/medicine/mastac/on_mob_delete(mob/living/L, metabolism) - to_chat(L, span_userdanger("It seems that something has stopped pushing your heart with force.")) - L.remove_movespeed_modifier(type) - L.Paralyze(2 SECONDS) + var/mob/living/carbon/human/damage = live + var/datum/internal_organ/heart/heart_damage = damage.get_organ_slot(ORGAN_SLOT_HEART) + if(heart_damage) + heart_damage.take_damage(15, TRUE) + +/datum/reagent/medicine/mastac/on_mob_delete(mob/living/delete, metabolism) + to_chat(delete, span_userdanger("It seems that something has stopped pushing your heart with force.")) + delete.remove_movespeed_modifier(type) + delete.Paralyze(2 SECONDS) From 97c60fa69d842a69910acdc8c01ed64c2302463a Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Sun, 3 Nov 2024 02:42:45 +0300 Subject: [PATCH 17/47] xenohud+fix --- code/game/data_huds/human.dm | 5 +++++ code/modules/reagents/reagents/medical.dm | 2 +- icons/mob/hud/reagent.dmi | Bin 1084 -> 1250 bytes 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/data_huds/human.dm b/code/game/data_huds/human.dm index e9727291307..88aeea54824 100644 --- a/code/game/data_huds/human.dm +++ b/code/game/data_huds/human.dm @@ -218,6 +218,7 @@ var/static/image/ifosfamide_image = image('icons/mob/hud/reagent.dmi', icon_state = "ifosfamide") var/static/image/jellyjuice_image = image('icons/mob/hud/reagent.dmi', icon_state = "jellyjuice") var/static/image/russianred_image = image('icons/mob/hud/reagent.dmi', icon_state = "russian_red") + var/static/image/mastac_image = image('icons/mob/hud/reagent.dmi', icon_state = "mastac") var/neurotox_amount = reagents.get_reagent_amount(/datum/reagent/toxin/xeno_neurotoxin) var/hemodile_amount = reagents.get_reagent_amount(/datum/reagent/toxin/xeno_hemodile) @@ -228,6 +229,7 @@ var/medicalnanites_amount = reagents.get_reagent_amount(/datum/reagent/medicalnanites) var/russianred_amount = reagents.get_reagent_amount(/datum/reagent/medicine/russian_red) var/ifosfamide_amount = reagents.get_reagent_amount(/datum/reagent/medicine/ifosfamide) + var/mastac_amount = reagents.get_reagent_amount(/datum/reagent/medicine/mastac) if(neurotox_amount > 10) //Blinking image for particularly high concentrations xeno_reagent.overlays += neurotox_high_image @@ -270,6 +272,9 @@ if(jellyjuice_amount > 0) xeno_reagent.overlays += jellyjuice_image + if(mastac_amount > 0) + xeno_reagent.overlays += mastac_image + hud_list[XENO_REAGENT_HUD] = xeno_reagent ///Displays active xeno specific debuffs diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 41b9ecece45..35e43f2d350 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1715,7 +1715,7 @@ if(41) to_chat(live, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) if(45 to INFINITY) - if(prob(2)) + if(prob(0.3)) to_chat(live, span_userdanger("OUUH MY HEART")) live.adjustOxyLoss(30) if(!ishuman(live)) diff --git a/icons/mob/hud/reagent.dmi b/icons/mob/hud/reagent.dmi index e89b1e9efe0b3a8d35f2efcc9039ae97699c81c3..ff0dfb9c8c091e52ae341e2c79fc4e13f7ce333b 100644 GIT binary patch delta 1167 zcmV;A1aSMj2;vDPiBL{Q4GJ0x0000DNk~Le0002s0002s2m=5B04?*H(*OVf#*rmt zf6Q$F|C}=b5+ndBQUFJa7$g8TQUF|v003>wi_8Esod3K3Gguv3X(VitDwnezy3PpK zBme+X004>r0HP?O;Gy8^uT|OGKVZOygo*gFgJB3D_b5Sz`($* z8}noU0004WQchCy=W7i38{yY=tq{Q>V&7r*Z#;qU+e0;@?x zK~#90?cLc@6HydK;Z9C>1I=`j(2NQw$e;oWGN=K3|EIEt+@8I=vMU}F)+cw16xkG& zi~N-`Nff<)qZg|?m!?@3?oAaQuj=RdQl961p)V_aMd?K$_gs3sQ@X03f3Gertx8W| zZFzZ3>gy{j>r&q+iVdl6Zf=SP%3am-1Mdfe@Sm6;dOsWredPUU6z)ageNhOH-}2Sh z)LqpZ)CUSbU|1h0^ih4F(DehisuQN}s=VCZ+1W1haNphA+m-tM!NI=N>pxMczbmUR zt-DZHA<>62i9FW zaJKuNX0opZ4{&V{9*`>gUDj>i3wE=~z9t;l5Dt|0yR6&3H@gGdeJ=bmt?hTt$-Un8 zq~5N7;SK-*000000QhGIb(_Y5+-52kK*d-rJSn)`<*Q#ZSN z{Auc%ho@hr4gdfE000000000006_P<`nSk^Tz$iMfqU}&^7`_;z&&}begm%y+>__= zpRxEGn)4q2MZhKU|KV-z0000000000%$eA4-M{&L&?U~&VWaPN@%O>%Hx#wA4{H0M zwy(v0k+60E000000002y%>Vw;9P3AStovK+{ZJKqzccTDn%JN3Gw*+z*!!J*|I@_Y h@7VtU001!0{sLcuj_%r?nmzyk002ovPDHLkV1l)ZI-vjn delta 1000 zcmV2m=5B0B!b@ZvX%Qw2>ub ze*h9B04h=dM~cjC003>w|C}>3oc|ak05(zpT#5jT%mBOpGb8{2QUCyo007JY0RI3p zSRGnvBy5r@m%zZlvmLt52-l)0qTr$6>agnZ#PR>k|MsNGlmGw#0d!JMQvg8b*k%9# z0SbClSad{Xb7OL8aCB*JZU6vyoSl=we`>=p42I9~Q-t;!#*&Whw99B2J*=+~%&gQZ zwlyrfUH0^ITbA_D;ShY0#ApA%B)lx&Ht*YAx&GLSBX~w~n8wGIFPe*z#$L_t(|obB0NQ`$fjfMLQW3&al=Fe1`QMcaz4 z*vi<7{r~@~Y&I9Y*>f0oI+?-u8SY*%duB3Tob7ZJS+|z8)s4yXqKJ1@*V>-7wk!0$ z(g#W}OSxO=_o}Wv>h+GK2ORhN$5KBT3{IqeT9&6$9}b5p17vRG+-MYke+Aswx$#)& z6XzzAcrQ!m%2N3KncIEd{t9IyKS2BsWMe;o&?kNXq3Z*j?M8U}0Jb`xPR}bF?-#S# zh14(S^Gm7wS4ip~s@*5rRko_CX(c_Ns%A=`%e^d>-&aCcx$s}WwbzRx&yCst!~g&Q z0001Z7wYZ1u%EAM^8P=*f0)YZn&Jzu>a(Dv^pbZG$Jr2%}G1`waG z-VZeU_vite9zCE5J$k@g+3y!hSMLX!{kt$gO&Fji3?T3K3#F^~e*=C$?>F#L_ur6v ze7|pu-2Luf>fv@E-T?pr0001he|@}KB=tRfx?U!A+127Esqf)>d7IQ_i<{3$eGkjq zFG(E$00000003~HzTT~pdh701_es5VtNU+B{os9nSSR(?J**#-dh6DYKax5C00000 z0DyPt=hLR`BcyrSIy|?1gfyGyU;p<3zhAaVy>&0!*QDOM?dzYU4gdfE0002sK>Y;= WAT7EAq6P^70000 Date: Tue, 5 Nov 2024 16:45:40 +0300 Subject: [PATCH 18/47] modified: code/game/data_huds/human.dm modified: code/game/objects/items/reagent_containers/autoinjectors.dm modified: code/modules/reagents/reactions/other.dm modified: code/modules/reagents/reagents/medical.dm --- code/game/data_huds/human.dm | 2 +- .../objects/items/reagent_containers/autoinjectors.dm | 2 +- code/modules/reagents/reactions/other.dm | 2 +- code/modules/reagents/reagents/medical.dm | 11 +++++------ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/code/game/data_huds/human.dm b/code/game/data_huds/human.dm index 88aeea54824..7324d8ae685 100644 --- a/code/game/data_huds/human.dm +++ b/code/game/data_huds/human.dm @@ -229,7 +229,7 @@ var/medicalnanites_amount = reagents.get_reagent_amount(/datum/reagent/medicalnanites) var/russianred_amount = reagents.get_reagent_amount(/datum/reagent/medicine/russian_red) var/ifosfamide_amount = reagents.get_reagent_amount(/datum/reagent/medicine/ifosfamide) - var/mastac_amount = reagents.get_reagent_amount(/datum/reagent/medicine/mastac) + var/mastac_amount = reagents.get_reagent_amount(/datum/reagent/mastac) if(neurotox_amount > 10) //Blinking image for particularly high concentrations xeno_reagent.overlays += neurotox_high_image diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm index 4e316a91c39..0f3d00a18af 100644 --- a/code/game/objects/items/reagent_containers/autoinjectors.dm +++ b/code/game/objects/items/reagent_containers/autoinjectors.dm @@ -377,6 +377,6 @@ icon_state = "RedWhite" amount_per_transfer_from_this = 1 volume = 1 - list_reagents = list(/datum/reagent/medicine/mastac = 1) + list_reagents = list(/datum/reagent/mastac = 1) free_refills = FALSE description_overlay = "Mt" diff --git a/code/modules/reagents/reactions/other.dm b/code/modules/reagents/reactions/other.dm index 6eac4a27c25..075541515cf 100644 --- a/code/modules/reagents/reactions/other.dm +++ b/code/modules/reagents/reactions/other.dm @@ -21,7 +21,7 @@ /datum/chemical_reaction/sleeptoxin_two name = "Sleeptoxin" results = list(/datum/reagent/toxin/sleeptoxin = 1) - required_reagents = list(/datum/reagent/toxin/xeno_hemodile = 2, /datum/reagent/medicine/mastac = 0.5) + required_reagents = list(/datum/reagent/toxin/xeno_hemodile = 2, /datum/reagent/mastac = 0.5) /datum/chemical_reaction/mutagen name = "Unstable mutagen" diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 35e43f2d350..a27a57b623c 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1680,7 +1680,7 @@ /datum/reagent/medicine/ifosfamide/overdose_crit_process(mob/living/L, metabolism) L.adjustToxLoss(4*effect_str) -/datum/reagent/medicine/mastac +/datum/reagent/mastac name = "MasTac" description = "This is a neurostimulating substance that causes the brain to maintain an increased heart rate." color = COLOR_REAGENT_MASTAC @@ -1695,17 +1695,16 @@ /datum/reagent/medicalnanites, /datum/reagent/medicine/peridaxon, /datum/reagent/medicine/peridaxon_plus, - /datum/reagent/medicine/paracetamol, ) -/datum/reagent/medicine/mastac/on_mob_add(mob/living/live, metabolism) +/datum/reagent/mastac/on_mob_add(mob/living/live, metabolism) live.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.4) to_chat(live, span_userdanger("You feel like your heart will stop at any second.")) -/datum/reagent/medicine/mastac/on_mob_life(mob/living/live, metabolism) +/datum/reagent/mastac/on_mob_life(mob/living/live, metabolism) . = ..() if(volume < 5) - live.reagents.add_reagent(/datum/reagent/medicine/mastac, 0.5) + live.reagents.add_reagent(/datum/reagent/mastac, 0.5) switch(current_cycle) if(1 to 40) live.adjustStaminaLoss((4) * effect_str) @@ -1725,7 +1724,7 @@ if(heart_damage) heart_damage.take_damage(15, TRUE) -/datum/reagent/medicine/mastac/on_mob_delete(mob/living/delete, metabolism) +/datum/reagent/mastac/on_mob_delete(mob/living/delete, metabolism) to_chat(delete, span_userdanger("It seems that something has stopped pushing your heart with force.")) delete.remove_movespeed_modifier(type) delete.Paralyze(2 SECONDS) From dfa1f2ca69c89514be6f0b0cfc65301dfa75a894 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Tue, 5 Nov 2024 23:22:13 +0300 Subject: [PATCH 19/47] =?UTF-8?q?=D0=BF=D0=BE=D1=82=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B2=20=D0=B2=D0=B0=D0=BB=D1=8C=D0=B3=D0=B3?= =?UTF-8?q?=D0=B0=D0=BB=D0=B5,=20=D0=BD=D0=B0=D0=B4=D0=BE=20=D1=87=D1=82?= =?UTF-8?q?=D0=BE=D0=B1=D1=8B=20=D1=80=D0=B5=D0=B6=D0=B5=20=D1=81=D0=B5?= =?UTF-8?q?=D1=80=D0=B4=D1=86=D0=B5=20=D0=B1=D0=B8=D0=BB=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/reagents/reagents/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index a27a57b623c..ba0500f0234 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1714,7 +1714,7 @@ if(41) to_chat(live, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) if(45 to INFINITY) - if(prob(0.3)) + if(prob(0.1)) to_chat(live, span_userdanger("OUUH MY HEART")) live.adjustOxyLoss(30) if(!ishuman(live)) From ee1908bdca209b37b9ea9a0d4d0b3d3fee020e0c Mon Sep 17 00:00:00 2001 From: Istrelok2107 Date: Fri, 8 Nov 2024 10:03:13 +0300 Subject: [PATCH 20/47] Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> Signed-off-by: Istrelok2107 --- code/modules/reagents/reagents/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index ba0500f0234..5ca0918a21c 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1684,7 +1684,7 @@ name = "MasTac" description = "This is a neurostimulating substance that causes the brain to maintain an increased heart rate." color = COLOR_REAGENT_MASTAC - custom_metabolism = REAGENTS_METABOLISM * 0 + custom_metabolism = 0 scannable = TRUE taste_description = "sour coffee" overdose_threshold = 10 From 908d40a2c2f3c6c1102a3acd9ccee39d1d54a2b5 Mon Sep 17 00:00:00 2001 From: Istrelok2107 Date: Fri, 8 Nov 2024 15:16:42 +0300 Subject: [PATCH 21/47] =?UTF-8?q?=D0=94=D0=B5=D1=88=D0=B5=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=20=D0=BD=D0=B0=205=20=D0=BE=D1=87=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Istrelok2107 --- code/__DEFINES/loadout.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index c56f32d6526..2b95b6f32a2 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -70,7 +70,7 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list( /obj/structure/closet/crate/mortar_ammo/mortar_kit = list(CAT_MARINE, "Mortar kit", 35, "orange3"), /obj/structure/closet/crate/mortar_ammo/howitzer_kit = list(CAT_MARINE, "Howitzer kit", 35, "orange3"), /obj/structure/closet/crate/mortar_ammo/mlrs_kit = list(CAT_MARINE, "MLRS kit", 35, "orange3"), - /obj/item/reagent_containers/hypospray/autoinjector/mastac = list(CAT_MARINE, "M-S neurostimulator", 25, "cyan"), + /obj/item/reagent_containers/hypospray/autoinjector/mastac = list(CAT_MARINE, "M-S neurostimulator", 20, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = list(CAT_MARINE, "Oxycodone autoinjector", 5, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/russian_red = list(CAT_MARINE, "Emergency autoinjecto", 10, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"), From ec06e662122d1584a293798163cb3c00a0d3b2bd Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Sat, 9 Nov 2024 23:01:29 +0300 Subject: [PATCH 22/47] =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=BD=D0=B8=D0=B9=20?= =?UTF-8?q?=D1=80=D0=B5=D1=82=D1=83=D1=80=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/reagents/reagents/medical.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 5ca0918a21c..b20456941d0 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1714,11 +1714,11 @@ if(41) to_chat(live, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) if(45 to INFINITY) + if(prob(99.9)) + return if(prob(0.1)) to_chat(live, span_userdanger("OUUH MY HEART")) live.adjustOxyLoss(30) - if(!ishuman(live)) - return var/mob/living/carbon/human/damage = live var/datum/internal_organ/heart/heart_damage = damage.get_organ_slot(ORGAN_SLOT_HEART) if(heart_damage) From 4ac798a90a7a04f3e0ac4792bdd0e67406131e3a Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Sat, 9 Nov 2024 23:47:08 +0300 Subject: [PATCH 23/47] =?UTF-8?q?=D1=83=D1=8D=D1=8D=D1=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/reagents/reagents/medical.dm | 29 +++++++++++------------ 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index b20456941d0..d96fb1b78a4 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1697,32 +1697,31 @@ /datum/reagent/medicine/peridaxon_plus, ) -/datum/reagent/mastac/on_mob_add(mob/living/live, metabolism) - live.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.4) - to_chat(live, span_userdanger("You feel like your heart will stop at any second.")) +/datum/reagent/mastac/on_mob_add(mob/living/our_living, metabolism) + our_living.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.4) + to_chat(our_living, span_userdanger("You feel like your heart will stop at any second.")) -/datum/reagent/mastac/on_mob_life(mob/living/live, metabolism) +/datum/reagent/mastac/on_mob_life(mob/living/our_living, metabolism) . = ..() if(volume < 5) - live.reagents.add_reagent(/datum/reagent/mastac, 0.5) + our_living.reagents.add_reagent(/datum/reagent/mastac, 0.5) switch(current_cycle) if(1 to 40) - live.adjustStaminaLoss((4) * effect_str) - live.jitter(2) + our_living.adjustStaminaLoss((4) * effect_str) + our_living.jitter(2) if(3) - to_chat(live, span_notice("Your heart is jumping out of your chest")) + to_chat(our_living, span_notice("Your heart is jumping out of your chest")) if(41) - to_chat(live, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) + to_chat(our_living, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) if(45 to INFINITY) if(prob(99.9)) return if(prob(0.1)) - to_chat(live, span_userdanger("OUUH MY HEART")) - live.adjustOxyLoss(30) - var/mob/living/carbon/human/damage = live - var/datum/internal_organ/heart/heart_damage = damage.get_organ_slot(ORGAN_SLOT_HEART) - if(heart_damage) - heart_damage.take_damage(15, TRUE) + to_chat(our_living, span_userdanger("OUUH MY HEART")) + our_living.adjustOxyLoss(30) + var/mob/living/carbon/human/damage = our_living + var/datum/internal_organ/heart/our_heart = damage.get_organ_slot(ORGAN_SLOT_HEART) + our_heart?.take_damage(15, TRUE) /datum/reagent/mastac/on_mob_delete(mob/living/delete, metabolism) to_chat(delete, span_userdanger("It seems that something has stopped pushing your heart with force.")) From 95308cae671750447a2e1abf437cee27183dc512 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Sun, 10 Nov 2024 00:34:53 +0300 Subject: [PATCH 24/47] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D1=80=D0=B5=D1=82=D1=83=D1=80=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/reagents/reagents/medical.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index d96fb1b78a4..4d3ae05fd70 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1715,7 +1715,6 @@ to_chat(our_living, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) if(45 to INFINITY) if(prob(99.9)) - return if(prob(0.1)) to_chat(our_living, span_userdanger("OUUH MY HEART")) our_living.adjustOxyLoss(30) From 76db905abf076e7677c0af8342efb2e8010aec73 Mon Sep 17 00:00:00 2001 From: Istrelok2107 Date: Sun, 10 Nov 2024 01:07:01 +0300 Subject: [PATCH 25/47] Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> Signed-off-by: Istrelok2107 --- code/modules/reagents/reagents/medical.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 4d3ae05fd70..f369c8be4aa 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1715,12 +1715,12 @@ to_chat(our_living, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) if(45 to INFINITY) if(prob(99.9)) - if(prob(0.1)) - to_chat(our_living, span_userdanger("OUUH MY HEART")) - our_living.adjustOxyLoss(30) - var/mob/living/carbon/human/damage = our_living - var/datum/internal_organ/heart/our_heart = damage.get_organ_slot(ORGAN_SLOT_HEART) - our_heart?.take_damage(15, TRUE) + return + to_chat(our_living, span_userdanger("OUUH MY HEART")) + our_living.adjustOxyLoss(30) + var/mob/living/carbon/human/damage = our_living + var/datum/internal_organ/heart/our_heart = damage.get_organ_slot(ORGAN_SLOT_HEART) + our_heart?.take_damage(15, TRUE) /datum/reagent/mastac/on_mob_delete(mob/living/delete, metabolism) to_chat(delete, span_userdanger("It seems that something has stopped pushing your heart with force.")) From b6837544e6f659adc354b4a9adfbc6687f47b0cd Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Wed, 13 Nov 2024 17:59:00 +0300 Subject: [PATCH 26/47] nerf --- code/modules/reagents/reagents/medical.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index f369c8be4aa..5d47d8d80aa 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1714,13 +1714,12 @@ if(41) to_chat(our_living, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) if(45 to INFINITY) - if(prob(99.9)) + if(prob(99)) return - to_chat(our_living, span_userdanger("OUUH MY HEART")) - our_living.adjustOxyLoss(30) + our_living.adjustOxyLoss(3) var/mob/living/carbon/human/damage = our_living var/datum/internal_organ/heart/our_heart = damage.get_organ_slot(ORGAN_SLOT_HEART) - our_heart?.take_damage(15, TRUE) + our_heart?.take_damage(1.5, TRUE) /datum/reagent/mastac/on_mob_delete(mob/living/delete, metabolism) to_chat(delete, span_userdanger("It seems that something has stopped pushing your heart with force.")) From 359a83bfe2792d2d01c9d2833707ead8e6b9d7ef Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Wed, 13 Nov 2024 19:22:14 +0300 Subject: [PATCH 27/47] antidupe --- code/modules/reagents/reactions/other.dm | 4 ++-- code/modules/reagents/reagents/medical.dm | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reactions/other.dm b/code/modules/reagents/reactions/other.dm index 075541515cf..c505c4256a3 100644 --- a/code/modules/reagents/reactions/other.dm +++ b/code/modules/reagents/reactions/other.dm @@ -20,8 +20,8 @@ /datum/chemical_reaction/sleeptoxin_two name = "Sleeptoxin" - results = list(/datum/reagent/toxin/sleeptoxin = 1) - required_reagents = list(/datum/reagent/toxin/xeno_hemodile = 2, /datum/reagent/mastac = 0.5) + results = list(/datum/reagent/toxin/sleeptoxin = 0.5) + required_reagents = list(/datum/reagent/toxin/xeno_hemodile = 0.5, /datum/reagent/mastac = 0.1) /datum/chemical_reaction/mutagen name = "Unstable mutagen" diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 5d47d8d80aa..178f52a309e 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1703,6 +1703,10 @@ /datum/reagent/mastac/on_mob_life(mob/living/our_living, metabolism) . = ..() + if(volume < 1) + our_living.reagents.add_reagent(/datum/reagent/toxin/xeno_hemodile, 10) + return //antiduplicate + if(volume < 5) our_living.reagents.add_reagent(/datum/reagent/mastac, 0.5) switch(current_cycle) From f85660387be834a5e679fbae178c2fafe099601d Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Wed, 13 Nov 2024 19:44:04 +0300 Subject: [PATCH 28/47] fix --- code/modules/reagents/reagents/medical.dm | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 178f52a309e..78f3aa1b9d6 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1697,33 +1697,33 @@ /datum/reagent/medicine/peridaxon_plus, ) -/datum/reagent/mastac/on_mob_add(mob/living/our_living, metabolism) - our_living.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.4) - to_chat(our_living, span_userdanger("You feel like your heart will stop at any second.")) +/datum/reagent/mastac/on_mob_add(mob/living/our_human, metabolism) + our_human.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.4) + to_chat(our_human, span_userdanger("You feel like your heart will stop at any second.")) -/datum/reagent/mastac/on_mob_life(mob/living/our_living, metabolism) +/datum/reagent/mastac/on_mob_life(mob/living/our_human, metabolism) . = ..() if(volume < 1) - our_living.reagents.add_reagent(/datum/reagent/toxin/xeno_hemodile, 10) + our_human.reagents.add_reagent(/datum/reagent/toxin/xeno_hemodile, 10) return //antiduplicate if(volume < 5) - our_living.reagents.add_reagent(/datum/reagent/mastac, 0.5) + our_human.reagents.add_reagent(/datum/reagent/mastac, 0.5) switch(current_cycle) if(1 to 40) - our_living.adjustStaminaLoss((4) * effect_str) - our_living.jitter(2) + our_human.adjustStaminaLoss((4) * effect_str) + our_human.jitter(2) if(3) - to_chat(our_living, span_notice("Your heart is jumping out of your chest")) + to_chat(our_human, span_notice("Your heart is jumping out of your chest")) if(41) - to_chat(our_living, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) + to_chat(our_human, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) if(45 to INFINITY) if(prob(99)) return - our_living.adjustOxyLoss(3) - var/mob/living/carbon/human/damage = our_living - var/datum/internal_organ/heart/our_heart = damage.get_organ_slot(ORGAN_SLOT_HEART) - our_heart?.take_damage(1.5, TRUE) + our_human.adjustOxyLoss(3) + var/mob/living/carbon/human/damage = our_human + var/datum/internal_organ/heart/our_living = damage.get_organ_slot(ORGAN_SLOT_HEART) + our_living?.take_damage(1.5, TRUE) /datum/reagent/mastac/on_mob_delete(mob/living/delete, metabolism) to_chat(delete, span_userdanger("It seems that something has stopped pushing your heart with force.")) From 03c68306cfc1f9740eb508c9fbc440caee1c98c8 Mon Sep 17 00:00:00 2001 From: Istrelok2107 Date: Wed, 20 Nov 2024 09:45:41 +0300 Subject: [PATCH 29/47] Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> Signed-off-by: Istrelok2107 --- code/modules/reagents/reagents/medical.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 78f3aa1b9d6..944fd17825b 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1714,9 +1714,9 @@ our_human.adjustStaminaLoss((4) * effect_str) our_human.jitter(2) if(3) - to_chat(our_human, span_notice("Your heart is jumping out of your chest")) + to_chat(our_human, span_notice("Your heart is jumping out of your chest.")) if(41) - to_chat(our_human, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard")) + to_chat(our_human, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard.")) if(45 to INFINITY) if(prob(99)) return From dddec16b64a1257b0f52ca2b66284f8d4016cf6b Mon Sep 17 00:00:00 2001 From: Istrelok2107 Date: Wed, 20 Nov 2024 09:45:57 +0300 Subject: [PATCH 30/47] Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> Signed-off-by: Istrelok2107 --- code/modules/reagents/reagents/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 944fd17825b..6f9dfc8c347 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1699,7 +1699,7 @@ /datum/reagent/mastac/on_mob_add(mob/living/our_human, metabolism) our_human.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.4) - to_chat(our_human, span_userdanger("You feel like your heart will stop at any second.")) + to_chat(our_human, span_userdanger("You feel like your heart could stop at any moment.")) /datum/reagent/mastac/on_mob_life(mob/living/our_human, metabolism) . = ..() From c539b3522237542eae61a2197349481514ac45ed Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Thu, 21 Nov 2024 00:47:22 +0300 Subject: [PATCH 31/47] grammar --- code/modules/reagents/reagents/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 78f3aa1b9d6..137fb644951 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1699,7 +1699,7 @@ /datum/reagent/mastac/on_mob_add(mob/living/our_human, metabolism) our_human.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.4) - to_chat(our_human, span_userdanger("You feel like your heart will stop at any second.")) + to_chat(our_human, span_userdanger("You feel like your heart could stop at any moment.")) /datum/reagent/mastac/on_mob_life(mob/living/our_human, metabolism) . = ..() From b361ab0dd35e099eb00baa7fe3c37db41c374177 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Thu, 21 Nov 2024 00:49:59 +0300 Subject: [PATCH 32/47] grammar2 --- code/modules/reagents/reagents/medical.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 6f9dfc8c347..d2aedcacc5c 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1725,7 +1725,7 @@ var/datum/internal_organ/heart/our_living = damage.get_organ_slot(ORGAN_SLOT_HEART) our_living?.take_damage(1.5, TRUE) -/datum/reagent/mastac/on_mob_delete(mob/living/delete, metabolism) - to_chat(delete, span_userdanger("It seems that something has stopped pushing your heart with force.")) - delete.remove_movespeed_modifier(type) - delete.Paralyze(2 SECONDS) +/datum/reagent/mastac/on_mob_delete(mob/living/our_living, metabolism) + to_chat(our_living, span_userdanger("It seems that something has stopped pushing your heart with force.")) + our_living.remove_movespeed_modifier(type) + our_living.Paralyze(2 SECONDS) From bf62cc9f8dea1b6bf5ccf39cc00adedd04a91b8f Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Thu, 21 Nov 2024 01:05:58 +0300 Subject: [PATCH 33/47] readability --- code/modules/reagents/reagents/medical.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index d2aedcacc5c..bb9a9e1747d 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1721,11 +1721,11 @@ if(prob(99)) return our_human.adjustOxyLoss(3) - var/mob/living/carbon/human/damage = our_human - var/datum/internal_organ/heart/our_living = damage.get_organ_slot(ORGAN_SLOT_HEART) - our_living?.take_damage(1.5, TRUE) - -/datum/reagent/mastac/on_mob_delete(mob/living/our_living, metabolism) - to_chat(our_living, span_userdanger("It seems that something has stopped pushing your heart with force.")) - our_living.remove_movespeed_modifier(type) - our_living.Paralyze(2 SECONDS) + var/mob/living/carbon/human/heart_damage = our_human + var/datum/internal_organ/heart/our_marine = heart_damage.get_organ_slot(ORGAN_SLOT_HEART) + our_marine.take_damage(1.5, TRUE) + +/datum/reagent/mastac/on_mob_delete(mob/living/our_marine, metabolism) + to_chat(our_marine, span_userdanger("It seems that something has stopped pushing your heart with force.")) + our_marine.remove_movespeed_modifier(type) + our_marine.Paralyze(2 SECONDS) From b3b4c7cf6bb275ac1f22d89af082411354bb9a87 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Thu, 21 Nov 2024 01:13:46 +0300 Subject: [PATCH 34/47] helgshiza --- code/modules/reagents/reagents/medical.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index bb9a9e1747d..2f3ea702f60 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1722,8 +1722,8 @@ return our_human.adjustOxyLoss(3) var/mob/living/carbon/human/heart_damage = our_human - var/datum/internal_organ/heart/our_marine = heart_damage.get_organ_slot(ORGAN_SLOT_HEART) - our_marine.take_damage(1.5, TRUE) + var/datum/internal_organ/heart/our_marine_heart = heart_damage.get_organ_slot(ORGAN_SLOT_HEART) + our_marine_heart.take_damage(1.5, TRUE) /datum/reagent/mastac/on_mob_delete(mob/living/our_marine, metabolism) to_chat(our_marine, span_userdanger("It seems that something has stopped pushing your heart with force.")) From 03f570c73f6f4d82dbb7b4cbf9a107318888d92e Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Thu, 21 Nov 2024 01:15:42 +0300 Subject: [PATCH 35/47] Revert "helgshiza" This reverts commit b3b4c7cf6bb275ac1f22d89af082411354bb9a87. --- code/modules/reagents/reagents/medical.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 2f3ea702f60..bb9a9e1747d 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1722,8 +1722,8 @@ return our_human.adjustOxyLoss(3) var/mob/living/carbon/human/heart_damage = our_human - var/datum/internal_organ/heart/our_marine_heart = heart_damage.get_organ_slot(ORGAN_SLOT_HEART) - our_marine_heart.take_damage(1.5, TRUE) + var/datum/internal_organ/heart/our_marine = heart_damage.get_organ_slot(ORGAN_SLOT_HEART) + our_marine.take_damage(1.5, TRUE) /datum/reagent/mastac/on_mob_delete(mob/living/our_marine, metabolism) to_chat(our_marine, span_userdanger("It seems that something has stopped pushing your heart with force.")) From 6a931aadd4f713c5bf04e6f3ecd9d44207f1637c Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Thu, 21 Nov 2024 01:16:19 +0300 Subject: [PATCH 36/47] Revert "readability" This reverts commit bf62cc9f8dea1b6bf5ccf39cc00adedd04a91b8f. --- code/modules/reagents/reagents/medical.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index bb9a9e1747d..d2aedcacc5c 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1721,11 +1721,11 @@ if(prob(99)) return our_human.adjustOxyLoss(3) - var/mob/living/carbon/human/heart_damage = our_human - var/datum/internal_organ/heart/our_marine = heart_damage.get_organ_slot(ORGAN_SLOT_HEART) - our_marine.take_damage(1.5, TRUE) - -/datum/reagent/mastac/on_mob_delete(mob/living/our_marine, metabolism) - to_chat(our_marine, span_userdanger("It seems that something has stopped pushing your heart with force.")) - our_marine.remove_movespeed_modifier(type) - our_marine.Paralyze(2 SECONDS) + var/mob/living/carbon/human/damage = our_human + var/datum/internal_organ/heart/our_living = damage.get_organ_slot(ORGAN_SLOT_HEART) + our_living?.take_damage(1.5, TRUE) + +/datum/reagent/mastac/on_mob_delete(mob/living/our_living, metabolism) + to_chat(our_living, span_userdanger("It seems that something has stopped pushing your heart with force.")) + our_living.remove_movespeed_modifier(type) + our_living.Paralyze(2 SECONDS) From e727211b55baee195e2bd95c6221fe31275bc748 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Thu, 21 Nov 2024 01:17:48 +0300 Subject: [PATCH 37/47] SHIZA --- code/modules/reagents/reagents/medical.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index d2aedcacc5c..0cf61ad3326 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1722,8 +1722,8 @@ return our_human.adjustOxyLoss(3) var/mob/living/carbon/human/damage = our_human - var/datum/internal_organ/heart/our_living = damage.get_organ_slot(ORGAN_SLOT_HEART) - our_living?.take_damage(1.5, TRUE) + var/datum/internal_organ/heart/our_heart = damage.get_organ_slot(ORGAN_SLOT_HEART) + our_heart?.take_damage(1.5, TRUE) /datum/reagent/mastac/on_mob_delete(mob/living/our_living, metabolism) to_chat(our_living, span_userdanger("It seems that something has stopped pushing your heart with force.")) From 90d9940f591e57a1e276cae0f413523c7a7b0b77 Mon Sep 17 00:00:00 2001 From: Helg2 <93882977+Helg2@users.noreply.github.com> Date: Thu, 21 Nov 2024 00:49:34 +0200 Subject: [PATCH 38/47] Update medical.dm Signed-off-by: Helg2 <93882977+Helg2@users.noreply.github.com> --- code/modules/reagents/reagents/medical.dm | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 0cf61ad3326..9a7e404b38c 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1697,32 +1697,32 @@ /datum/reagent/medicine/peridaxon_plus, ) -/datum/reagent/mastac/on_mob_add(mob/living/our_human, metabolism) - our_human.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.4) - to_chat(our_human, span_userdanger("You feel like your heart could stop at any moment.")) +/datum/reagent/mastac/on_mob_add(mob/living/our_living, metabolism) + our_living.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.4) + to_chat(our_living, span_userdanger("You feel like your heart could stop at any moment.")) -/datum/reagent/mastac/on_mob_life(mob/living/our_human, metabolism) +/datum/reagent/mastac/on_mob_life(mob/living/our_living, metabolism) . = ..() if(volume < 1) - our_human.reagents.add_reagent(/datum/reagent/toxin/xeno_hemodile, 10) + our_living.reagents.add_reagent(/datum/reagent/toxin/xeno_hemodile, 10) return //antiduplicate if(volume < 5) - our_human.reagents.add_reagent(/datum/reagent/mastac, 0.5) + our_living.reagents.add_reagent(/datum/reagent/mastac, 0.5) switch(current_cycle) if(1 to 40) - our_human.adjustStaminaLoss((4) * effect_str) - our_human.jitter(2) + our_living.adjustStaminaLoss((4) * effect_str) + our_living.jitter(2) if(3) - to_chat(our_human, span_notice("Your heart is jumping out of your chest.")) + to_chat(our_living, span_notice("Your heart is jumping out of your chest.")) if(41) - to_chat(our_human, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard.")) + to_chat(our_living, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard.")) if(45 to INFINITY) if(prob(99)) return - our_human.adjustOxyLoss(3) - var/mob/living/carbon/human/damage = our_human - var/datum/internal_organ/heart/our_heart = damage.get_organ_slot(ORGAN_SLOT_HEART) + our_living.adjustOxyLoss(3) + var/mob/living/carbon/human/our_human = our_living + var/datum/internal_organ/heart/our_heart = our_human.get_organ_slot(ORGAN_SLOT_HEART) our_heart?.take_damage(1.5, TRUE) /datum/reagent/mastac/on_mob_delete(mob/living/our_living, metabolism) From d62dc525b2c2c472df57e9df3303daa5f5159fd9 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Fri, 29 Nov 2024 02:15:59 +0300 Subject: [PATCH 39/47] shiza nerf --- code/modules/reagents/reagents/medical.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 9a7e404b38c..5aa7dfc9470 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1718,12 +1718,13 @@ if(41) to_chat(our_living, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard.")) if(45 to INFINITY) - if(prob(99)) + if(prob(99.880)) return - our_living.adjustOxyLoss(3) + to_chat(our_living, span_userdanger("OUUH MY HEART")) + our_living.adjustOxyLoss(30) var/mob/living/carbon/human/our_human = our_living var/datum/internal_organ/heart/our_heart = our_human.get_organ_slot(ORGAN_SLOT_HEART) - our_heart?.take_damage(1.5, TRUE) + our_heart?.take_damage(15, TRUE) /datum/reagent/mastac/on_mob_delete(mob/living/our_living, metabolism) to_chat(our_living, span_userdanger("It seems that something has stopped pushing your heart with force.")) From 8ff9aab533584f304b3c452537c8f4a58929b180 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Fri, 29 Nov 2024 02:19:06 +0300 Subject: [PATCH 40/47] =?UTF-8?q?=D0=BD=D0=BE=D0=BB=D0=B8=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/reagents/reagents/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 5aa7dfc9470..f4e232ebfb0 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1718,7 +1718,7 @@ if(41) to_chat(our_living, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard.")) if(45 to INFINITY) - if(prob(99.880)) + if(prob(99.88)) return to_chat(our_living, span_userdanger("OUUH MY HEART")) our_living.adjustOxyLoss(30) From 507f9892705b8f77891e15763cece16a699b73d7 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Tue, 3 Dec 2024 12:04:55 +0300 Subject: [PATCH 41/47] no fun allowed antidupe --- code/modules/reagents/reagents/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index f4e232ebfb0..e5d43964384 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1704,7 +1704,7 @@ /datum/reagent/mastac/on_mob_life(mob/living/our_living, metabolism) . = ..() if(volume < 1) - our_living.reagents.add_reagent(/datum/reagent/toxin/xeno_hemodile, 10) + our_living.reagents.remove_reagent(/datum/reagent/mastac, 3) return //antiduplicate if(volume < 5) From 9ff8f80ff852479eec032636aaee5204853ac116 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Tue, 3 Dec 2024 12:17:00 +0300 Subject: [PATCH 42/47] conflict --- code/modules/reqs/supplypacks/medical.dm | 387 +++++++++++++++++++++++ 1 file changed, 387 insertions(+) create mode 100644 code/modules/reqs/supplypacks/medical.dm diff --git a/code/modules/reqs/supplypacks/medical.dm b/code/modules/reqs/supplypacks/medical.dm new file mode 100644 index 00000000000..3031334142f --- /dev/null +++ b/code/modules/reqs/supplypacks/medical.dm @@ -0,0 +1,387 @@ +/datum/supply_packs/medical + group = "Medical" + containertype = /obj/structure/closet/crate/medical + +/datum/supply_packs/medical/advanced_medical + name = "Emergency medical supplies" + contains = list( + /obj/item/storage/pouch/medical_injectors/medic, + /obj/item/storage/pouch/medical_injectors/medic, + /obj/item/storage/pouch/medical_injectors/medic, + /obj/item/storage/pouch/medical_injectors/medic, + /obj/item/reagent_containers/hypospray/autoinjector/neuraline, + /obj/item/stack/nanopaste, + ) + cost = 300 + +/datum/supply_packs/medical/biomass + name = "biomass crate" + contains = list( + /obj/item/reagent_containers/glass/beaker/biomass, + ) + cost = 150 + +/datum/supply_packs/medical/Medical_hud + name = "Medical Hud Crate" + contains = list( + /obj/item/clothing/glasses/hud/health, + ) + cost = 20 + +/datum/supply_packs/medical/medical + name = "Pills and Chemicals" + contains = list( + /obj/item/storage/box/autoinjectors, + /obj/item/storage/box/syringes, + /obj/item/reagent_containers/glass/bottle/inaprovaline, + /obj/item/reagent_containers/glass/bottle/dylovene, + /obj/item/reagent_containers/glass/bottle/bicaridine, + /obj/item/reagent_containers/glass/bottle/dexalin, + /obj/item/reagent_containers/glass/bottle/spaceacillin, + /obj/item/reagent_containers/glass/bottle/kelotane, + /obj/item/reagent_containers/glass/bottle/tramadol, + /obj/item/storage/pill_bottle/inaprovaline, + /obj/item/storage/pill_bottle/dylovene, + /obj/item/storage/pill_bottle/bicaridine, + /obj/item/storage/pill_bottle/dexalin, + /obj/item/storage/pill_bottle/spaceacillin, + /obj/item/storage/pill_bottle/kelotane, + /obj/item/storage/pill_bottle/tramadol, + /obj/item/storage/pill_bottle/quickclot, + /obj/item/storage/box/pillbottles, + ) + cost = 100 + +/datum/supply_packs/medical/firstaid + name = "advanced first aid kit" + contains = list(/obj/item/storage/firstaid/adv) + cost = 50 + +/datum/supply_packs/medical/bodybag + name = "body bags" + notes = "Contains 7 bodybags" + contains = list(/obj/item/storage/box/bodybags) + cost = 50 + +/datum/supply_packs/medical/cryobag + name = "stasis bag" + contains = list(/obj/item/bodybag/cryobag) + cost = 50 + +/datum/supply_packs/medical/surgery + name = "surgical equipment" + contains = list( + /obj/item/storage/surgical_tray, + /obj/item/clothing/mask/breath/medical, + /obj/item/tank/anesthetic, + /obj/item/reagent_containers/hypospray/autoinjector/sleeptoxin, + /obj/item/reagent_containers/hypospray/autoinjector/sleeptoxin, + ) + cost = 100 + access = ACCESS_MARINE_MEDBAY + containertype = /obj/structure/closet/crate/secure/surgery + +/datum/supply_packs/medical/hypospray + name = "advanced hypospray" + contains = list(/obj/item/reagent_containers/hypospray/advanced) + cost = 50 + containertype = /obj/structure/closet/crate/secure/surgery + access = ACCESS_MARINE_MEDBAY + +/datum/supply_packs/medical/hypospray + name = "advanced big hypospray" + contains = list(/obj/item/reagent_containers/hypospray/advanced/big) + cost = 120 //just a little over the regular hypo. + containertype = /obj/structure/closet/crate/secure/surgery + access = ACCESS_MARINE_MEDBAY + +/datum/supply_packs/medical/medvac + name = "MEDEVAC system" + contains = list( + /obj/item/roller/medevac, + /obj/item/medevac_beacon, + ) + cost = 500 + containertype = /obj/structure/closet/crate/secure/surgery + access = ACCESS_MARINE_MEDBAY + +/datum/supply_packs/medical/lemolime + name = "lemoline" + notes = "Contains 1 bottle of lemoline with 30 units each." + contains = list( + /obj/item/reagent_containers/glass/bottle/lemoline/doctor, + ) + cost = 80 + +/datum/supply_packs/medical/advancedKits + name = "Advanced medical packs" + notes = "Contains 5 advanced packs of each type and 5 splints." + contains = list( + /obj/item/stack/medical/heal_pack/advanced/bruise_pack, + /obj/item/stack/medical/heal_pack/advanced/bruise_pack, + /obj/item/stack/medical/heal_pack/advanced/bruise_pack, + /obj/item/stack/medical/heal_pack/advanced/bruise_pack, + /obj/item/stack/medical/heal_pack/advanced/bruise_pack, + /obj/item/stack/medical/heal_pack/advanced/burn_pack, + /obj/item/stack/medical/heal_pack/advanced/burn_pack, + /obj/item/stack/medical/heal_pack/advanced/burn_pack, + /obj/item/stack/medical/heal_pack/advanced/burn_pack, + /obj/item/stack/medical/heal_pack/advanced/burn_pack, + /obj/item/stack/medical/splint, + /obj/item/stack/medical/splint, + /obj/item/stack/medical/splint, + /obj/item/stack/medical/splint, + /obj/item/stack/medical/splint, + ) + cost = 100 //you have ALMOST infinite ones in medbay if you need this crate you fucked up. but no reason to make the price too high either + containertype = /obj/structure/closet/crate/secure/surgery + access = ACCESS_MARINE_MEDBAY + +/datum/supply_packs/medical/tweezers + name = "tweezers" + notes = "contains a pair of tweezers." + contains = list(/obj/item/tweezers) + cost = 125 + containertype = /obj/structure/closet/crate/secure/surgery + access = ACCESS_MARINE_MEDBAY + +/datum/supply_packs/medical/tweezers_advanced + name = "Advanced Tweezers" + notes = "contains advanced tweezers." + contains = list(/obj/item/tweezers_advanced) + cost = 250 + containertype = /obj/structure/closet/crate/secure/surgery + access = ACCESS_MARINE_MEDBAY + +/datum/supply_packs/medical/defibrillator_gloves + name = "Advanced defibrillator medical gloves" + notes = "contains advanced defibrillator medical gloves." + contains = list(/obj/item/defibrillator/gloves) + cost = 120 + containertype = /obj/structure/closet/crate/secure/surgery + access = ACCESS_MARINE_MEDBAY + +/datum/supply_packs/medical/healthanalyzer_gloves + name = "Health scanner gloves" + notes = "contains health scanner gloves." + contains = list(/obj/item/healthanalyzer/gloves) + cost = 60 + containertype = /obj/structure/closet/crate/secure/surgery + access = ACCESS_MARINE_MEDBAY + +/datum/supply_packs/medical/deployable_optable + name = "Deployable operating table" + notes = "Contains an operating table that can be transported and deployed for medical procedures." + contains = list(/obj/item/deployable_optable) + cost = 200 + containertype = /obj/structure/closet/crate/secure/surgery + +/datum/supply_packs/medical/advanced_medical_kits + name = "Advanced medical kits" + notes = "contains pair advanced medical kits from medical vendors." + contains = list(/obj/item/stack/medical/heal_pack/advanced/bruise_combat_pack, /obj/item/stack/medical/heal_pack/advanced/burn_combat_pack) + cost = 120 + containertype = /obj/structure/closet/crate/secure/surgery + access = ACCESS_MARINE_MEDBAY + +/datum/supply_packs/medical/combat_medicine + name = "Battleground medicine" + notes = "contains 4 hypospray with MD, many injectors peri and quick, neuraline, nanopaste." + contains = list( + /obj/item/reagent_containers/hypospray/advanced/meraderm, + /obj/item/reagent_containers/hypospray/advanced/meraderm, + /obj/item/reagent_containers/hypospray/advanced/meraderm, + /obj/item/reagent_containers/hypospray/advanced/meraderm, + /obj/item/reagent_containers/hypospray/advanced/oxycodone, + /obj/item/reagent_containers/hypospray/advanced/oxycodone, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot, + /obj/item/reagent_containers/hypospray/autoinjector/quickclot, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, + /obj/item/reagent_containers/hypospray/autoinjector/dexalinplus, + /obj/item/reagent_containers/hypospray/autoinjector/dexalinplus, + /obj/item/reagent_containers/hypospray/autoinjector/dexalinplus, + /obj/item/reagent_containers/hypospray/autoinjector/dexalinplus, + /obj/item/reagent_containers/hypospray/autoinjector/neuraline, + /obj/item/stack/nanopaste, + ) // Кто-то скажет, что это имба, а я вам скажу, что этот набор уже есть в игре буквально самой первой строчкой в медкарго, я просто перепаковал его выставив на общее обозрение. + cost = 300 + +/datum/supply_packs/medical/combat_robot_medicine + name = "Combat repairing for robots" + notes = "contains 5 nanopaste for robots or technic." + contains = list( + /obj/item/stack/nanopaste, + /obj/item/stack/nanopaste, + /obj/item/stack/nanopaste, + /obj/item/stack/nanopaste, + /obj/item/stack/nanopaste, + ) + cost = 230 + +/datum/supply_packs/medical/soldering_tool + name = "Soldering tool" + notes = "contains 1 soldering tool for repair robots." + contains = list(/obj/item/tool/surgery/solderingtool) + cost = 30 + +/datum/supply_packs/medical/nanoblood_hypo + name = "Nanoblood hypospray" + notes = "contains 2 hypo with nanoblood." + contains = list( + /obj/item/reagent_containers/hypospray/advanced/nanoblood, + /obj/item/reagent_containers/hypospray/advanced/nanoblood, + ) + cost = 100 + containertype = /obj/structure/closet/crate/secure/surgery + access = ACCESS_MARINE_MEDBAY + +/datum/supply_packs/medical/meraderm_pills + name = "Meraderm pills" + notes = "contains meralyne and dermaline pill bottle." + contains = list( + /obj/item/storage/pill_bottle/dermaline, + /obj/item/storage/pill_bottle/meralyne, + ) + cost = 250 + +/datum/supply_packs/medical/bs_beakers + name = "Bluespace beakers" + notes = "contains two BS beakers." + contains = list( + /obj/item/reagent_containers/glass/beaker/bluespace, + /obj/item/reagent_containers/glass/beaker/bluespace, + ) + cost = 50 + +/datum/supply_packs/medical/bkkt_dispenser + name = "BKKT Dispenser" + notes = "contains one BKKT dispenser." + contains = list(/obj/item/storage/reagent_tank/bktt) + cost = 120 + +/datum/supply_packs/medical/antitox_kit + name = "Anti-tox kit" + notes = "contains some things against toxins." + contains = list( + /obj/item/storage/pill_bottle/hypervene, + /obj/item/storage/pill_bottle/dylovene, + /obj/item/storage/pill_bottle/tricordrazine, + ) + cost = 20 + +/datum/supply_packs/medical/imialky_kit + name = "ImiAlky kit" + notes = "contains pill bottles imidazoline and alkysine." + contains = list( + /obj/item/storage/pill_bottle/imidazoline, + /obj/item/storage/pill_bottle/alkysine, + ) + cost = 30 + +/datum/supply_packs/medical/quick_peri_kit + name = "QuickPeri kit" + notes = "contains quick-clot and peri injectors." + contains = list( + /obj/item/reagent_containers/hypospray/autoinjector/quickclot, + /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, + ) + cost = 30 + +/datum/supply_packs/medical/russian_red_bottle + name = "Russian Red pill bottle" + notes = "contains one pill bottle red russian." + contains = list(/obj/item/storage/pill_bottle/russian_red) + cost = 250 + +/datum/supply_packs/medical/russian_red_injector + name = "Russian Red autoinjector" + notes = "contains emergency autoinjector." + contains = list(/obj/item/reagent_containers/hypospray/autoinjector/russian_red) + cost = 40 + +/datum/supply_packs/medical/synaptizine_injector + name = "synaptizine auto injector" + notes = "contains synaptizine auto injector." + contains = list(/obj/item/reagent_containers/hypospray/autoinjector/synaptizine) + cost = 30 + +/datum/supply_packs/medical/oxycodone_injector + name = "Oxycodone auto injector" + notes = "contains oxycodone auto injector." + contains = list(/obj/item/reagent_containers/hypospray/autoinjector/oxycodone) + cost = 20 + +/datum/supply_packs/medical/Mt_neurostimulator + name = "M-S neurostimulator injector" + notes = "contains M-S neurostimulator auto injector." + contains = list(/obj/item/reagent_containers/hypospray/autoinjector/mastac) + cost = 140 + +/datum/supply_packs/medical/Mt_neurostimulator_kit + name = "M-S neurostimulator kit" + notes = "contains 5 M-S neurostimulator auto injectors." + contains = list( + /obj/item/reagent_containers/hypospray/autoinjector/mastac, + /obj/item/reagent_containers/hypospray/autoinjector/mastac, + /obj/item/reagent_containers/hypospray/autoinjector/mastac, + /obj/item/reagent_containers/hypospray/autoinjector/mastac, + /obj/item/reagent_containers/hypospray/autoinjector/mastac, + ) + cost = 500 + +/datum/supply_packs/medical/neuraline_kit + name ="large neuraline kit" + notes = "contains five neuraline injectors" + contains = list( + /obj/item/reagent_containers/hypospray/autoinjector/neuraline, + /obj/item/reagent_containers/hypospray/autoinjector/neuraline, + /obj/item/reagent_containers/hypospray/autoinjector/neuraline, + /obj/item/reagent_containers/hypospray/autoinjector/neuraline, + /obj/item/reagent_containers/hypospray/autoinjector/neuraline, + ) + cost = 250 + +/datum/supply_packs/medical/neuraline_kit_injector + name ="Neuraline autoinjector" + notes = "contains one neuraline injector" + contains = list(/obj/item/reagent_containers/hypospray/autoinjector/neuraline) + cost = 70 + +/datum/supply_packs/medical/bkkt_kit + name = "BKKT kit" + notes = "contains pill bottles BKKT." + contains = list( + /obj/item/storage/pill_bottle/bicaridine, + /obj/item/storage/pill_bottle/kelotane, + /obj/item/storage/pill_bottle/tricordrazine, + /obj/item/storage/pill_bottle/tramadol, + ) + cost = 20 + +/datum/supply_packs/medical/medicine_defibrillator + name = "Medical defibrillator" + notes = "contains medical defibrillator." + contains = list(/obj/item/defibrillator) + cost = 50 + containertype = /obj/structure/closet/crate/secure/surgery + access = ACCESS_MARINE_MEDBAY + +/datum/supply_packs/medical/surgery + contains = list( + /obj/item/storage/surgical_tray, + /obj/item/clothing/mask/breath/medical, + /obj/item/tank/anesthetic, + ) From e05a5be356770e1c7d669b7bc1d193ea278eb72c Mon Sep 17 00:00:00 2001 From: Istrelok2107 Date: Tue, 3 Dec 2024 12:20:37 +0300 Subject: [PATCH 43/47] Delete code/modules/reqs/medical.dm Signed-off-by: Istrelok2107 --- code/modules/reqs/medical.dm | 386 ----------------------------------- 1 file changed, 386 deletions(-) delete mode 100644 code/modules/reqs/medical.dm diff --git a/code/modules/reqs/medical.dm b/code/modules/reqs/medical.dm deleted file mode 100644 index 3e347594c17..00000000000 --- a/code/modules/reqs/medical.dm +++ /dev/null @@ -1,386 +0,0 @@ -/datum/supply_packs/medical - group = "Medical" - containertype = /obj/structure/closet/crate/medical - -/datum/supply_packs/medical/advanced_medical - name = "Emergency medical supplies" - contains = list( - /obj/item/storage/pouch/medical_injectors/medic, - /obj/item/storage/pouch/medical_injectors/medic, - /obj/item/storage/pouch/medical_injectors/medic, - /obj/item/storage/pouch/medical_injectors/medic, - /obj/item/reagent_containers/hypospray/autoinjector/neuraline, - /obj/item/stack/nanopaste, - ) - cost = 300 - -/datum/supply_packs/medical/biomass - name = "biomass crate" - contains = list( - /obj/item/reagent_containers/glass/beaker/biomass, - ) - cost = 150 - -/datum/supply_packs/medical/Medical_hud - name = "Medical Hud Crate" - contains = list( - /obj/item/clothing/glasses/hud/health, - ) - cost = 20 - -/datum/supply_packs/medical/medical - name = "Pills and Chemicals" - contains = list( - /obj/item/storage/box/autoinjectors, - /obj/item/storage/box/syringes, - /obj/item/reagent_containers/glass/bottle/inaprovaline, - /obj/item/reagent_containers/glass/bottle/dylovene, - /obj/item/reagent_containers/glass/bottle/bicaridine, - /obj/item/reagent_containers/glass/bottle/dexalin, - /obj/item/reagent_containers/glass/bottle/spaceacillin, - /obj/item/reagent_containers/glass/bottle/kelotane, - /obj/item/reagent_containers/glass/bottle/tramadol, - /obj/item/storage/pill_bottle/inaprovaline, - /obj/item/storage/pill_bottle/dylovene, - /obj/item/storage/pill_bottle/bicaridine, - /obj/item/storage/pill_bottle/dexalin, - /obj/item/storage/pill_bottle/spaceacillin, - /obj/item/storage/pill_bottle/kelotane, - /obj/item/storage/pill_bottle/tramadol, - /obj/item/storage/pill_bottle/quickclot, - /obj/item/storage/box/pillbottles, - ) - cost = 100 - -/datum/supply_packs/medical/firstaid - name = "advanced first aid kit" - contains = list(/obj/item/storage/firstaid/adv) - cost = 50 - -/datum/supply_packs/medical/bodybag - name = "body bags" - notes = "Contains 7 bodybags" - contains = list(/obj/item/storage/box/bodybags) - cost = 50 - -/datum/supply_packs/medical/cryobag - name = "stasis bag" - contains = list(/obj/item/bodybag/cryobag) - cost = 50 - -/datum/supply_packs/medical/surgery - name = "surgical equipment" - contains = list( - /obj/item/storage/surgical_tray, - /obj/item/clothing/mask/breath/medical, - /obj/item/tank/anesthetic, - /obj/item/reagent_containers/hypospray/autoinjector/sleeptoxin, - /obj/item/reagent_containers/hypospray/autoinjector/sleeptoxin, - ) - cost = 100 - access = ACCESS_MARINE_MEDBAY - containertype = /obj/structure/closet/crate/secure/surgery - -/datum/supply_packs/medical/hypospray - name = "advanced hypospray" - contains = list(/obj/item/reagent_containers/hypospray/advanced) - cost = 50 - containertype = /obj/structure/closet/crate/secure/surgery - access = ACCESS_MARINE_MEDBAY - -/datum/supply_packs/medical/hypospray - name = "advanced big hypospray" - contains = list(/obj/item/reagent_containers/hypospray/advanced/big) - cost = 120 //just a little over the regular hypo. - containertype = /obj/structure/closet/crate/secure/surgery - access = ACCESS_MARINE_MEDBAY - -/datum/supply_packs/medical/medvac - name = "MEDEVAC system" - contains = list( - /obj/item/roller/medevac, - /obj/item/medevac_beacon, - ) - cost = 500 - containertype = /obj/structure/closet/crate/secure/surgery - access = ACCESS_MARINE_MEDBAY - -/datum/supply_packs/medical/lemolime - name = "lemoline" - notes = "Contains 1 bottle of lemoline with 30 units each." - contains = list( - /obj/item/reagent_containers/glass/bottle/lemoline/doctor, - ) - cost = 80 - -/datum/supply_packs/medical/advancedKits - name = "Advanced medical packs" - notes = "Contains 5 advanced packs of each type and 5 splints." - contains = list( - /obj/item/stack/medical/heal_pack/advanced/bruise_pack, - /obj/item/stack/medical/heal_pack/advanced/bruise_pack, - /obj/item/stack/medical/heal_pack/advanced/bruise_pack, - /obj/item/stack/medical/heal_pack/advanced/bruise_pack, - /obj/item/stack/medical/heal_pack/advanced/bruise_pack, - /obj/item/stack/medical/heal_pack/advanced/burn_pack, - /obj/item/stack/medical/heal_pack/advanced/burn_pack, - /obj/item/stack/medical/heal_pack/advanced/burn_pack, - /obj/item/stack/medical/heal_pack/advanced/burn_pack, - /obj/item/stack/medical/heal_pack/advanced/burn_pack, - /obj/item/stack/medical/splint, - /obj/item/stack/medical/splint, - /obj/item/stack/medical/splint, - /obj/item/stack/medical/splint, - /obj/item/stack/medical/splint, - ) - cost = 100 //you have ALMOST infinite ones in medbay if you need this crate you fucked up. but no reason to make the price too high either - containertype = /obj/structure/closet/crate/secure/surgery - access = ACCESS_MARINE_MEDBAY - -/datum/supply_packs/medical/tweezers - name = "tweezers" - notes = "contains a pair of tweezers." - contains = list(/obj/item/tweezers) - cost = 125 - containertype = /obj/structure/closet/crate/secure/surgery - access = ACCESS_MARINE_MEDBAY - -/datum/supply_packs/medical/tweezers_advanced - name = "Advanced Tweezers" - notes = "contains advanced tweezers." - contains = list(/obj/item/tweezers_advanced) - cost = 250 - containertype = /obj/structure/closet/crate/secure/surgery - access = ACCESS_MARINE_MEDBAY - -/datum/supply_packs/medical/defibrillator_gloves - name = "Advanced defibrillator medical gloves" - notes = "contains advanced defibrillator medical gloves." - contains = list(/obj/item/defibrillator/gloves) - cost = 120 - containertype = /obj/structure/closet/crate/secure/surgery - access = ACCESS_MARINE_MEDBAY - -/datum/supply_packs/medical/healthanalyzer_gloves - name = "Health scanner gloves" - notes = "contains health scanner gloves." - contains = list(/obj/item/healthanalyzer/gloves) - cost = 60 - containertype = /obj/structure/closet/crate/secure/surgery - access = ACCESS_MARINE_MEDBAY - -/datum/supply_packs/medical/deployable_optable - name = "Deployable operating table" - notes = "Contains an operating table that can be transported and deployed for medical procedures." - contains = list(/obj/item/deployable_optable) - cost = 200 - containertype = /obj/structure/closet/crate/secure/surgery - -/datum/supply_packs/medical/advanced_medical_kits - name = "Advanced medical kits" - notes = "contains pair advanced medical kits from medical vendors." - contains = list(/obj/item/stack/medical/heal_pack/advanced/bruise_combat_pack, /obj/item/stack/medical/heal_pack/advanced/burn_combat_pack) - cost = 120 - containertype = /obj/structure/closet/crate/secure/surgery - access = ACCESS_MARINE_MEDBAY - -/datum/supply_packs/medical/combat_medicine - name = "Battleground medicine" - notes = "contains 4 hypospray with MD, many injectors peri and quick, neuraline, nanopaste." - contains = list( - /obj/item/reagent_containers/hypospray/advanced/meraderm, - /obj/item/reagent_containers/hypospray/advanced/meraderm, - /obj/item/reagent_containers/hypospray/advanced/meraderm, - /obj/item/reagent_containers/hypospray/advanced/meraderm, - /obj/item/reagent_containers/hypospray/advanced/oxycodone, - /obj/item/reagent_containers/hypospray/advanced/oxycodone, - /obj/item/reagent_containers/hypospray/autoinjector/quickclot, - /obj/item/reagent_containers/hypospray/autoinjector/quickclot, - /obj/item/reagent_containers/hypospray/autoinjector/quickclot, - /obj/item/reagent_containers/hypospray/autoinjector/quickclot, - /obj/item/reagent_containers/hypospray/autoinjector/quickclot, - /obj/item/reagent_containers/hypospray/autoinjector/quickclot, - /obj/item/reagent_containers/hypospray/autoinjector/quickclot, - /obj/item/reagent_containers/hypospray/autoinjector/quickclot, - /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, - /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, - /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, - /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, - /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, - /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, - /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, - /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, - /obj/item/reagent_containers/hypospray/autoinjector/dexalinplus, - /obj/item/reagent_containers/hypospray/autoinjector/dexalinplus, - /obj/item/reagent_containers/hypospray/autoinjector/dexalinplus, - /obj/item/reagent_containers/hypospray/autoinjector/dexalinplus, - /obj/item/reagent_containers/hypospray/autoinjector/neuraline, - /obj/item/stack/nanopaste, - ) // Кто-то скажет, что это имба, а я вам скажу, что этот набор уже есть в игре буквально самой первой строчкой в медкарго, я просто перепаковал его выставив на общее обозрение. - cost = 300 - -/datum/supply_packs/medical/combat_robot_medicine - name = "Combat repairing for robots" - notes = "contains 5 nanopaste for robots or technic." - contains = list( - /obj/item/stack/nanopaste, - /obj/item/stack/nanopaste, - /obj/item/stack/nanopaste, - /obj/item/stack/nanopaste, - /obj/item/stack/nanopaste, - ) - cost = 230 - -/datum/supply_packs/medical/soldering_tool - name = "Soldering tool" - notes = "contains 1 soldering tool for repair robots." - contains = list(/obj/item/tool/surgery/solderingtool) - cost = 30 - -/datum/supply_packs/medical/nanoblood_hypo - name = "Nanoblood hypospray" - notes = "contains 2 hypo with nanoblood." - contains = list( - /obj/item/reagent_containers/hypospray/advanced/nanoblood, - /obj/item/reagent_containers/hypospray/advanced/nanoblood, - ) - cost = 100 - containertype = /obj/structure/closet/crate/secure/surgery - access = ACCESS_MARINE_MEDBAY - -/datum/supply_packs/medical/meraderm_pills - name = "Meraderm pills" - notes = "contains meralyne and dermaline pill bottle." - contains = list( - /obj/item/storage/pill_bottle/dermaline, - /obj/item/storage/pill_bottle/meralyne, - ) - cost = 250 - -/datum/supply_packs/medical/bs_beakers - name = "Bluespace beakers" - notes = "contains two BS beakers." - contains = list( - /obj/item/reagent_containers/glass/beaker/bluespace, - /obj/item/reagent_containers/glass/beaker/bluespace, - ) - cost = 50 - -/datum/supply_packs/medical/bkkt_dispenser - name = "BKKT Dispenser" - notes = "contains one BKKT dispenser." - contains = list(/obj/item/storage/reagent_tank/bktt) - cost = 120 - -/datum/supply_packs/medical/antitox_kit - name = "Anti-tox kit" - notes = "contains some things against toxins." - contains = list( - /obj/item/storage/pill_bottle/hypervene, - /obj/item/storage/pill_bottle/dylovene, - /obj/item/storage/pill_bottle/tricordrazine, - ) - cost = 20 - -/datum/supply_packs/medical/imialky_kit - name = "ImiAlky kit" - notes = "contains pill bottles imidazoline and alkysine." - contains = list( - /obj/item/storage/pill_bottle/imidazoline, - /obj/item/storage/pill_bottle/alkysine, - ) - cost = 30 - -/datum/supply_packs/medical/quick_peri_kit - name = "QuickPeri kit" - notes = "contains quick-clot and peri injectors." - contains = list( - /obj/item/reagent_containers/hypospray/autoinjector/quickclot, - /obj/item/reagent_containers/hypospray/autoinjector/peridaxon, - ) - cost = 30 - -/datum/supply_packs/medical/russian_red_bottle - name = "Russian Red pill bottle" - notes = "contains one pill bottle red russian." - contains = list(/obj/item/storage/pill_bottle/russian_red) - cost = 250 - -/datum/supply_packs/medical/russian_red_injector - name = "Russian Red autoinjector" - notes = "contains emergency autoinjector." - contains = list(/obj/item/reagent_containers/hypospray/autoinjector/russian_red) - cost = 40 - -/datum/supply_packs/medical/synaptizine_injector - name = "synaptizine auto injector" - notes = "contains synaptizine auto injector." - contains = list(/obj/item/reagent_containers/hypospray/autoinjector/synaptizine) - cost = 30 - -/datum/supply_packs/medical/oxycodone_injector - name = "Oxycodone auto injector" - notes = "contains oxycodone auto injector." - contains = list(/obj/item/reagent_containers/hypospray/autoinjector/oxycodone) - cost = 20 - -/datum/supply_packs/medical/Mt_neurostimulator - name = "M-S neurostimulator injector" - notes = "contains M-S neurostimulator auto injector." - contains = list(/obj/item/reagent_containers/hypospray/autoinjector/mastac) - cost = 140 - -/datum/supply_packs/medical/Mt_neurostimulator_kit - name = "M-S neurostimulator kit" - notes = "contains 5 M-S neurostimulator auto injectors." - contains = list( - /obj/item/reagent_containers/hypospray/autoinjector/mastac, - /obj/item/reagent_containers/hypospray/autoinjector/mastac, - /obj/item/reagent_containers/hypospray/autoinjector/mastac, - /obj/item/reagent_containers/hypospray/autoinjector/mastac, - /obj/item/reagent_containers/hypospray/autoinjector/mastac, - ) - cost = 500 -/datum/supply_packs/medical/neuraline_kit - name ="large neuraline kit" - notes = "contains five neuraline injectors" - contains = list( - /obj/item/reagent_containers/hypospray/autoinjector/neuraline, - /obj/item/reagent_containers/hypospray/autoinjector/neuraline, - /obj/item/reagent_containers/hypospray/autoinjector/neuraline, - /obj/item/reagent_containers/hypospray/autoinjector/neuraline, - /obj/item/reagent_containers/hypospray/autoinjector/neuraline, - ) - cost = 250 - -/datum/supply_packs/medical/neuraline_kit_injector - name ="Neuraline autoinjector" - notes = "contains one neuraline injector" - contains = list(/obj/item/reagent_containers/hypospray/autoinjector/neuraline) - cost = 70 - -/datum/supply_packs/medical/bkkt_kit - name = "BKKT kit" - notes = "contains pill bottles BKKT." - contains = list( - /obj/item/storage/pill_bottle/bicaridine, - /obj/item/storage/pill_bottle/kelotane, - /obj/item/storage/pill_bottle/tricordrazine, - /obj/item/storage/pill_bottle/tramadol, - ) - cost = 20 - -/datum/supply_packs/medical/medicine_defibrillator - name = "Medical defibrillator" - notes = "contains medical defibrillator." - contains = list(/obj/item/defibrillator) - cost = 50 - containertype = /obj/structure/closet/crate/secure/surgery - access = ACCESS_MARINE_MEDBAY - -/datum/supply_packs/medical/surgery - contains = list( - /obj/item/storage/surgical_tray, - /obj/item/clothing/mask/breath/medical, - /obj/item/tank/anesthetic, - ) From ae25af3d70cfc6b2bc42a70a8cab55fd2e0ca16b Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Tue, 3 Dec 2024 23:15:54 +0300 Subject: [PATCH 44/47] mikola shiza --- code/modules/reagents/reagents/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index ce3f089d5fe..f48143597bd 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1717,7 +1717,7 @@ if(41) to_chat(our_living, span_warning("It seems that your body has become accustomed to new conditions. But the heart is working hard.")) if(45 to INFINITY) - if(prob(99.88)) + if(prob(99.775)) return to_chat(our_living, span_userdanger("OUUH MY HEART")) our_living.adjustOxyLoss(30) From 2ac0b73312af5efe2dbc3eff700c0671419e8628 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Thu, 12 Dec 2024 18:14:32 +0300 Subject: [PATCH 45/47] rename --- code/__DEFINES/colors.dm | 2 +- code/__DEFINES/loadout.dm | 2 +- code/game/data_huds/human.dm | 8 ++++---- .../items/reagent_containers/autoinjectors.dm | 6 +++--- .../objects/machinery/vending/marine_vending.dm | 2 +- code/modules/reagents/reactions/other.dm | 2 +- code/modules/reagents/reagents/medical.dm | 16 ++++++++-------- code/modules/reqs/supplypacks/medical.dm | 12 ++++++------ 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index c1f69ad62b2..e96ab06c7f3 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -169,7 +169,7 @@ #define COLOR_REAGENT_SULFASALAZINE "#266930" #define COLOR_REAGENT_DIBORANE "#1800a3" #define COLOR_REAGENT_STIMULON "#19C832" -#define COLOR_REAGENT_MASTAC "#062c48" +#define COLOR_REAGENT_NEUROFRENZY "#062c48" //Color defines used by toxin #define COLOR_TOXIN_TOXIN "#CF3600" // rgb: 207, 54, 0 diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index 7c9c97cbb10..be7e5e1137a 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -102,7 +102,7 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list( /obj/structure/closet/crate/mortar_ammo/mortar_kit = list(CAT_MARINE, "Mortar kit", 35, "orange3"), /obj/structure/closet/crate/mortar_ammo/howitzer_kit = list(CAT_MARINE, "Howitzer kit", 35, "orange3"), /obj/structure/closet/crate/mortar_ammo/mlrs_kit = list(CAT_MARINE, "MLRS kit", 35, "orange3"), - /obj/item/reagent_containers/hypospray/autoinjector/mastac = list(CAT_MARINE, "M-S neurostimulator", 20, "cyan"), + /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy = list(CAT_MARINE, "M-S neurostimulator", 20, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = list(CAT_MARINE, "Oxycodone autoinjector", 5, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/russian_red = list(CAT_MARINE, "Emergency autoinjector", 10, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"), diff --git a/code/game/data_huds/human.dm b/code/game/data_huds/human.dm index 7324d8ae685..37c0c1a8be7 100644 --- a/code/game/data_huds/human.dm +++ b/code/game/data_huds/human.dm @@ -218,7 +218,7 @@ var/static/image/ifosfamide_image = image('icons/mob/hud/reagent.dmi', icon_state = "ifosfamide") var/static/image/jellyjuice_image = image('icons/mob/hud/reagent.dmi', icon_state = "jellyjuice") var/static/image/russianred_image = image('icons/mob/hud/reagent.dmi', icon_state = "russian_red") - var/static/image/mastac_image = image('icons/mob/hud/reagent.dmi', icon_state = "mastac") + var/static/image/neurofrenzy_image = image('icons/mob/hud/reagent.dmi', icon_state = "neurofrenzy") var/neurotox_amount = reagents.get_reagent_amount(/datum/reagent/toxin/xeno_neurotoxin) var/hemodile_amount = reagents.get_reagent_amount(/datum/reagent/toxin/xeno_hemodile) @@ -229,7 +229,7 @@ var/medicalnanites_amount = reagents.get_reagent_amount(/datum/reagent/medicalnanites) var/russianred_amount = reagents.get_reagent_amount(/datum/reagent/medicine/russian_red) var/ifosfamide_amount = reagents.get_reagent_amount(/datum/reagent/medicine/ifosfamide) - var/mastac_amount = reagents.get_reagent_amount(/datum/reagent/mastac) + var/neurofrenzy_amount = reagents.get_reagent_amount(/datum/reagent/neurofrenzy) if(neurotox_amount > 10) //Blinking image for particularly high concentrations xeno_reagent.overlays += neurotox_high_image @@ -272,8 +272,8 @@ if(jellyjuice_amount > 0) xeno_reagent.overlays += jellyjuice_image - if(mastac_amount > 0) - xeno_reagent.overlays += mastac_image + if(neurofrenzy_amount > 0) + xeno_reagent.overlays += neurofrenzy_image hud_list[XENO_REAGENT_HUD] = xeno_reagent diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm index 0f3d00a18af..f629581acb5 100644 --- a/code/game/objects/items/reagent_containers/autoinjectors.dm +++ b/code/game/objects/items/reagent_containers/autoinjectors.dm @@ -371,12 +371,12 @@ /obj/item/reagent_containers/hypospray/autoinjector/yautja/interact(mob/user) return -/obj/item/reagent_containers/hypospray/autoinjector/mastac - name = "mastac autoinjector" +/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy + name = "neurofrenzy autoinjector" desc = "An auto-injector loaded with 1 unit neurostimulant. !DO NOT USE WITH MEDICAL NANITES!" icon_state = "RedWhite" amount_per_transfer_from_this = 1 volume = 1 - list_reagents = list(/datum/reagent/mastac = 1) + list_reagents = list(/datum/reagent/neurofrenzy = 1) free_refills = FALSE description_overlay = "Mt" diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm index 25021851145..58cf06fce48 100644 --- a/code/game/objects/machinery/vending/marine_vending.dm +++ b/code/game/objects/machinery/vending/marine_vending.dm @@ -1058,7 +1058,7 @@ /obj/item/reagent_containers/hypospray/autoinjector/neuraline = -1, /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus = -1, /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus = -1, - /obj/item/reagent_containers/hypospray/autoinjector/mastac = -1, + /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy = -1, )) /obj/machinery/vending/MarineMed/Blood diff --git a/code/modules/reagents/reactions/other.dm b/code/modules/reagents/reactions/other.dm index c505c4256a3..bf487f4cf34 100644 --- a/code/modules/reagents/reactions/other.dm +++ b/code/modules/reagents/reactions/other.dm @@ -21,7 +21,7 @@ /datum/chemical_reaction/sleeptoxin_two name = "Sleeptoxin" results = list(/datum/reagent/toxin/sleeptoxin = 0.5) - required_reagents = list(/datum/reagent/toxin/xeno_hemodile = 0.5, /datum/reagent/mastac = 0.1) + required_reagents = list(/datum/reagent/toxin/xeno_hemodile = 0.5, /datum/reagent/neurofrenzy = 0.1) /datum/chemical_reaction/mutagen name = "Unstable mutagen" diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index f48143597bd..f719f74be84 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1679,10 +1679,10 @@ /datum/reagent/medicine/ifosfamide/overdose_crit_process(mob/living/L, metabolism) L.adjustToxLoss(4*effect_str) -/datum/reagent/mastac - name = "MasTac" +/datum/reagent/neurofrenzy + name = "NeuroFrenzy" description = "This is a neurostimulating substance that causes the brain to maintain an increased heart rate." - color = COLOR_REAGENT_MASTAC + color = COLOR_REAGENT_NEUROFRENZY custom_metabolism = 0 scannable = TRUE taste_description = "sour coffee" @@ -1696,18 +1696,18 @@ /datum/reagent/medicine/peridaxon_plus, ) -/datum/reagent/mastac/on_mob_add(mob/living/our_living, metabolism) +/datum/reagent/neurofrenzy/on_mob_add(mob/living/our_living, metabolism) our_living.add_movespeed_modifier(type, TRUE, 0, NONE, TRUE, -0.4) to_chat(our_living, span_userdanger("You feel like your heart could stop at any moment.")) -/datum/reagent/mastac/on_mob_life(mob/living/our_living, metabolism) +/datum/reagent/neurofrenzy/on_mob_life(mob/living/our_living, metabolism) . = ..() if(volume < 1) - our_living.reagents.remove_reagent(/datum/reagent/mastac, 3) + our_living.reagents.remove_reagent(/datum/reagent/neurofrenzy, 3) return //antiduplicate if(volume < 5) - our_living.reagents.add_reagent(/datum/reagent/mastac, 0.5) + our_living.reagents.add_reagent(/datum/reagent/neurofrenzy, 0.5) switch(current_cycle) if(1 to 40) our_living.adjustStaminaLoss((4) * effect_str) @@ -1725,7 +1725,7 @@ var/datum/internal_organ/heart/our_heart = our_human.get_organ_slot(ORGAN_SLOT_HEART) our_heart?.take_damage(15, TRUE) -/datum/reagent/mastac/on_mob_delete(mob/living/our_living, metabolism) +/datum/reagent/neurofrenzy/on_mob_delete(mob/living/our_living, metabolism) to_chat(our_living, span_userdanger("It seems that something has stopped pushing your heart with force.")) our_living.remove_movespeed_modifier(type) our_living.Paralyze(2 SECONDS) diff --git a/code/modules/reqs/supplypacks/medical.dm b/code/modules/reqs/supplypacks/medical.dm index 3031334142f..11b6dae2984 100644 --- a/code/modules/reqs/supplypacks/medical.dm +++ b/code/modules/reqs/supplypacks/medical.dm @@ -327,18 +327,18 @@ /datum/supply_packs/medical/Mt_neurostimulator name = "M-S neurostimulator injector" notes = "contains M-S neurostimulator auto injector." - contains = list(/obj/item/reagent_containers/hypospray/autoinjector/mastac) + contains = list(/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy) cost = 140 /datum/supply_packs/medical/Mt_neurostimulator_kit name = "M-S neurostimulator kit" notes = "contains 5 M-S neurostimulator auto injectors." contains = list( - /obj/item/reagent_containers/hypospray/autoinjector/mastac, - /obj/item/reagent_containers/hypospray/autoinjector/mastac, - /obj/item/reagent_containers/hypospray/autoinjector/mastac, - /obj/item/reagent_containers/hypospray/autoinjector/mastac, - /obj/item/reagent_containers/hypospray/autoinjector/mastac, + /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy, + /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy, + /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy, + /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy, + /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy, ) cost = 500 From d8612c8fc9923e71fc29f513331c5d5c484f84a4 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Thu, 12 Dec 2024 23:33:30 +0300 Subject: [PATCH 46/47] modified: code/__DEFINES/loadout.dm modified: code/modules/reqs/supplypacks/medical.dm --- code/__DEFINES/loadout.dm | 2 +- code/modules/reqs/supplypacks/medical.dm | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index be7e5e1137a..7085b173c53 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -102,7 +102,7 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list( /obj/structure/closet/crate/mortar_ammo/mortar_kit = list(CAT_MARINE, "Mortar kit", 35, "orange3"), /obj/structure/closet/crate/mortar_ammo/howitzer_kit = list(CAT_MARINE, "Howitzer kit", 35, "orange3"), /obj/structure/closet/crate/mortar_ammo/mlrs_kit = list(CAT_MARINE, "MLRS kit", 35, "orange3"), - /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy = list(CAT_MARINE, "M-S neurostimulator", 20, "cyan"), + /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy = list(CAT_MARINE, "N-F neurostimulator", 20, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = list(CAT_MARINE, "Oxycodone autoinjector", 5, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/russian_red = list(CAT_MARINE, "Emergency autoinjector", 10, "cyan"), /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"), diff --git a/code/modules/reqs/supplypacks/medical.dm b/code/modules/reqs/supplypacks/medical.dm index 11b6dae2984..e047d97a555 100644 --- a/code/modules/reqs/supplypacks/medical.dm +++ b/code/modules/reqs/supplypacks/medical.dm @@ -324,15 +324,15 @@ contains = list(/obj/item/reagent_containers/hypospray/autoinjector/oxycodone) cost = 20 -/datum/supply_packs/medical/Mt_neurostimulator - name = "M-S neurostimulator injector" +/datum/supply_packs/medical/nf_neurostimulator + name = "N-F neurostimulator injector" notes = "contains M-S neurostimulator auto injector." contains = list(/obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy) cost = 140 -/datum/supply_packs/medical/Mt_neurostimulator_kit - name = "M-S neurostimulator kit" - notes = "contains 5 M-S neurostimulator auto injectors." +/datum/supply_packs/medical/nf_neurostimulator_kit + name = "N-F neurostimulator kit" + notes = "contains 5 N-F neurostimulator auto injectors." contains = list( /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy, /obj/item/reagent_containers/hypospray/autoinjector/neurofrenzy, From efea1f3a6d8e2c3f147c69db5e4894c9b6efc2bf Mon Sep 17 00:00:00 2001 From: Helg2 <93882977+Helg2@users.noreply.github.com> Date: Fri, 13 Dec 2024 09:38:24 +0200 Subject: [PATCH 47/47] Update code/game/objects/items/reagent_containers/autoinjectors.dm Signed-off-by: Helg2 <93882977+Helg2@users.noreply.github.com> --- code/game/objects/items/reagent_containers/autoinjectors.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm index f629581acb5..a35312ed065 100644 --- a/code/game/objects/items/reagent_containers/autoinjectors.dm +++ b/code/game/objects/items/reagent_containers/autoinjectors.dm @@ -379,4 +379,4 @@ volume = 1 list_reagents = list(/datum/reagent/neurofrenzy = 1) free_refills = FALSE - description_overlay = "Mt" + description_overlay = "Nf"