From fa9e8c6cad0dd2470f999a8a27324fba39efb0d1 Mon Sep 17 00:00:00 2001 From: Kirill Date: Tue, 27 Aug 2024 21:41:36 +0500 Subject: [PATCH 1/7] some chems --- code/modules/reagents/reagents/medical.dm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 93376108ef4..be211222a14 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -88,8 +88,9 @@ scannable = TRUE custom_metabolism = REAGENTS_METABOLISM * 0.125 purge_list = list( - /datum/reagent/medicine/kelotane, /datum/reagent/medicine/bicaridine, + /datum/reagent/medicine/kelotane, + /datum/reagent/medicalnanites ) purge_rate = 5 overdose_threshold = REAGENTS_OVERDOSE*2 @@ -237,6 +238,8 @@ purge_list = list( /datum/reagent/medicine/ryetalyn, /datum/reagent/medicine/paracetamol, + /datum/reagent/medicalnanites, + /datum/reagent/medicine/ifosfamide, ) purge_rate = 2.5 overdose_threshold = REAGENTS_OVERDOSE @@ -255,10 +258,10 @@ return ..() /datum/reagent/medicine/kelotane/overdose_process(mob/living/L, metabolism) - L.apply_damages(effect_str, 0, effect_str) + L.apply_damages(effect_str, TOX, effect_str) /datum/reagent/medicine/kelotane/overdose_crit_process(mob/living/L, metabolism) - L.apply_damages(2*effect_str, 0, 2*effect_str) + L.apply_damages(2*effect_str, TOX, 2*effect_str) /datum/reagent/medicine/dermaline name = "Dermaline" @@ -281,10 +284,10 @@ return ..() /datum/reagent/medicine/dermaline/overdose_process(mob/living/L, metabolism) - L.apply_damages(effect_str, 0, effect_str) + L.apply_damages(effect_str, TOX, effect_str) /datum/reagent/medicine/dermaline/overdose_crit_process(mob/living/L, metabolism) - L.apply_damages(3*effect_str, 0, 3*effect_str) + L.apply_damages(3*effect_str, TOX, 3*effect_str) /datum/reagent/medicine/saline_glucose name = "Saline-Glucose" @@ -800,6 +803,8 @@ purge_list = list( /datum/reagent/medicine/ryetalyn, /datum/reagent/medicine/paracetamol, + /datum/reagent/medicalnanites, + /datum/reagent/medicine/ifosfamide, ) purge_rate = 2.5 overdose_threshold = REAGENTS_OVERDOSE @@ -817,7 +822,7 @@ /datum/reagent/medicine/bicaridine/overdose_process(mob/living/L, metabolism) - L.apply_damage(effect_str, BURN) + L.apply_damage(effect_str, TOX) /datum/reagent/medicine/bicaridine/overdose_crit_process(mob/living/L, metabolism) L.apply_damages(effect_str, 3*effect_str, 2*effect_str) @@ -1408,6 +1413,7 @@ /datum/reagent/medicine/tricordrazine, /datum/reagent/medicine/paracetamol, /datum/reagent/medicine/oxycodone, + /datum/reagent/medicine/ifosfamide ) /datum/reagent/medicalnanites/on_mob_add(mob/living/L, metabolism) From e84b99bf644cd648f492b397e03cdab155bc44b8 Mon Sep 17 00:00:00 2001 From: Kirill Date: Tue, 27 Aug 2024 21:47:58 +0500 Subject: [PATCH 2/7] 1 --- code/modules/reagents/reagents/medical.dm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index be211222a14..d6c56bc3fc4 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -54,7 +54,10 @@ color = COLOR_REAGENT_RYETALYN scannable = TRUE custom_metabolism = REAGENTS_METABOLISM * 0.125 - purge_list = list(/datum/reagent/toxin, /datum/reagent/zombium) + purge_list = list( + /datum/reagent/toxin, + /datum/reagent/zombium + ) purge_rate = 3 overdose_threshold = REAGENTS_OVERDOSE overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL @@ -90,7 +93,7 @@ purge_list = list( /datum/reagent/medicine/bicaridine, /datum/reagent/medicine/kelotane, - /datum/reagent/medicalnanites + /datum/reagent/medicalnanites, ) purge_rate = 5 overdose_threshold = REAGENTS_OVERDOSE*2 @@ -1246,7 +1249,11 @@ overdose_threshold = REAGENTS_OVERDOSE * 0.5 overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL * 0.5 custom_metabolism = REAGENTS_METABOLISM * 5 - purge_list = list(/datum/reagent/medicine, /datum/reagent/toxin, /datum/reagent/zombium) + purge_list = list( + /datum/reagent/medicine, + /datum/reagent/toxin, + /datum/reagent/zombium, + ) purge_rate = 5 scannable = TRUE taste_description = "punishment" @@ -1413,7 +1420,7 @@ /datum/reagent/medicine/tricordrazine, /datum/reagent/medicine/paracetamol, /datum/reagent/medicine/oxycodone, - /datum/reagent/medicine/ifosfamide + /datum/reagent/medicine/ifosfamide, ) /datum/reagent/medicalnanites/on_mob_add(mob/living/L, metabolism) From d1ea5b97cd5da80ef045d7fc5d0211dc4641ded3 Mon Sep 17 00:00:00 2001 From: Kirill Date: Tue, 27 Aug 2024 21:51:22 +0500 Subject: [PATCH 3/7] 2 --- 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 d6c56bc3fc4..c54f65a79ab 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -56,7 +56,7 @@ custom_metabolism = REAGENTS_METABOLISM * 0.125 purge_list = list( /datum/reagent/toxin, - /datum/reagent/zombium + /datum/reagent/zombium, ) purge_rate = 3 overdose_threshold = REAGENTS_OVERDOSE From 03799c6152c5938c58d44c2776b6035c34c574db Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 28 Aug 2024 18:54:46 +0500 Subject: [PATCH 4/7] some twix --- code/modules/reagents/reagents/medical.dm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index c54f65a79ab..84433c42a76 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -261,10 +261,11 @@ return ..() /datum/reagent/medicine/kelotane/overdose_process(mob/living/L, metabolism) - L.apply_damages(effect_str, TOX, effect_str) + L.apply_damage(effect_str, TOX) /datum/reagent/medicine/kelotane/overdose_crit_process(mob/living/L, metabolism) - L.apply_damages(2*effect_str, TOX, 2*effect_str) + L.apply_damages(2*effect_str, 0, 2*effect_str) + lungs.take_damage(0.7) /datum/reagent/medicine/dermaline name = "Dermaline" @@ -287,10 +288,11 @@ return ..() /datum/reagent/medicine/dermaline/overdose_process(mob/living/L, metabolism) - L.apply_damages(effect_str, TOX, effect_str) + L.apply_damages(effect_str, 0, effect_str) /datum/reagent/medicine/dermaline/overdose_crit_process(mob/living/L, metabolism) - L.apply_damages(3*effect_str, TOX, 3*effect_str) + L.apply_damages(3*effect_str, 0, 3*effect_str) + lungs.take_damage(0.35) /datum/reagent/medicine/saline_glucose name = "Saline-Glucose" @@ -829,6 +831,7 @@ /datum/reagent/medicine/bicaridine/overdose_crit_process(mob/living/L, metabolism) L.apply_damages(effect_str, 3*effect_str, 2*effect_str) + liver.take_damage(0.7) /datum/reagent/medicine/meralyne name = "Meralyne" @@ -853,6 +856,7 @@ /datum/reagent/medicine/meralyne/overdose_crit_process(mob/living/L, metabolism) L.apply_damages(2*effect_str, 6*effect_str, 4*effect_str) + lungs.take_damage(0.35) /datum/reagent/medicine/quickclot name = "Quick Clot" @@ -879,6 +883,8 @@ /datum/reagent/medicine/quickclot/overdose_crit_process(mob/living/L, metabolism) L.apply_damages(0, 2*effect_str, 2*effect_str) + eyes.take_damage(0.2) + brain.take_damage(0.2) /datum/reagent/medicine/quickclotplus @@ -1480,6 +1486,7 @@ /datum/reagent/medicalnanites/overdose_crit_process(mob/living/L, metabolism) L.adjustCloneLoss(1) //YUM! + stomach.take_damage(0.7) /datum/reagent/medicalnanites/on_mob_delete(mob/living/L, metabolism) to_chat(L, span_userdanger("Your nanites have been fully purged! They no longer affect you.")) From 5f4be5c9bbef792ef0b4f57609a7c57a1fc6c0b4 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 28 Aug 2024 19:52:07 +0500 Subject: [PATCH 5/7] fix --- code/modules/reagents/reagents/medical.dm | 32 ++++++++++++++++++----- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 84433c42a76..979f058a7b7 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -265,7 +265,10 @@ /datum/reagent/medicine/kelotane/overdose_crit_process(mob/living/L, metabolism) L.apply_damages(2*effect_str, 0, 2*effect_str) - lungs.take_damage(0.7) + if(ishuman(L)) + var/mob/living/carbon/human/H = L + var/datum/internal_organ/lung = H.get_organ_slot(ORGAN_SLOT_LUNGS) + lung.take_damage(0.7 * effect_str) /datum/reagent/medicine/dermaline name = "Dermaline" @@ -292,7 +295,10 @@ /datum/reagent/medicine/dermaline/overdose_crit_process(mob/living/L, metabolism) L.apply_damages(3*effect_str, 0, 3*effect_str) - lungs.take_damage(0.35) + if(ishuman(L)) + var/mob/living/carbon/human/H = L + var/datum/internal_organ/lung = H.get_organ_slot(ORGAN_SLOT_LUNGS) + lung.take_damage(0.35 * effect_str) /datum/reagent/medicine/saline_glucose name = "Saline-Glucose" @@ -831,7 +837,10 @@ /datum/reagent/medicine/bicaridine/overdose_crit_process(mob/living/L, metabolism) L.apply_damages(effect_str, 3*effect_str, 2*effect_str) - liver.take_damage(0.7) + if(ishuman(L)) + var/mob/living/carbon/human/H = L + var/datum/internal_organ/liver = H.get_organ_slot(ORGAN_SLOT_LIVER) + liver.take_damage(0.7 * effect_str) /datum/reagent/medicine/meralyne name = "Meralyne" @@ -856,7 +865,10 @@ /datum/reagent/medicine/meralyne/overdose_crit_process(mob/living/L, metabolism) L.apply_damages(2*effect_str, 6*effect_str, 4*effect_str) - lungs.take_damage(0.35) + if(ishuman(L)) + var/mob/living/carbon/human/H = L + var/datum/internal_organ/liver = H.get_organ_slot(ORGAN_SLOT_LIVER) + liver.take_damage(0.35 * effect_str) /datum/reagent/medicine/quickclot name = "Quick Clot" @@ -883,8 +895,11 @@ /datum/reagent/medicine/quickclot/overdose_crit_process(mob/living/L, metabolism) L.apply_damages(0, 2*effect_str, 2*effect_str) - eyes.take_damage(0.2) - brain.take_damage(0.2) + if(ishuman(L)) + var/mob/living/carbon/human/H = L + var/affected_organ = pick(ORGAN_SLOT_HEART, ORGAN_SLOT_LUNGS, ORGAN_SLOT_LIVER, ORGAN_SLOT_KIDNEYS, ORGAN_SLOT_STOMACH) + var/datum/internal_organ/Organrand = H.get_organ_slot(affected_organ) + Organrand.take_damage(1.0 * effect_str) /datum/reagent/medicine/quickclotplus @@ -1486,7 +1501,10 @@ /datum/reagent/medicalnanites/overdose_crit_process(mob/living/L, metabolism) L.adjustCloneLoss(1) //YUM! - stomach.take_damage(0.7) + if(ishuman(L)) + var/mob/living/carbon/human/H = L + var/datum/internal_organ/stom = H.get_organ_slot(ORGAN_SLOT_STOMACH) + stom.take_damage(0.7 * effect_str) /datum/reagent/medicalnanites/on_mob_delete(mob/living/L, metabolism) to_chat(L, span_userdanger("Your nanites have been fully purged! They no longer affect you.")) From 658842b60deb398200375ec3ba150e484908833b Mon Sep 17 00:00:00 2001 From: Kirill <83533775+Tatarla@users.noreply.github.com> Date: Wed, 28 Aug 2024 19:06:24 +0400 Subject: [PATCH 6/7] Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> Signed-off-by: Kirill <83533775+Tatarla@users.noreply.github.com> --- 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 979f058a7b7..efed52610a2 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -899,7 +899,7 @@ var/mob/living/carbon/human/H = L var/affected_organ = pick(ORGAN_SLOT_HEART, ORGAN_SLOT_LUNGS, ORGAN_SLOT_LIVER, ORGAN_SLOT_KIDNEYS, ORGAN_SLOT_STOMACH) var/datum/internal_organ/Organrand = H.get_organ_slot(affected_organ) - Organrand.take_damage(1.0 * effect_str) + Organrand.take_damage(1 * effect_str) /datum/reagent/medicine/quickclotplus From 2eb9f5dd444acee18e883383d100e57a3598e416 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 28 Aug 2024 20:18:37 +0500 Subject: [PATCH 7/7] fix --- code/modules/reagents/reagents/medical.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 979f058a7b7..04fb470e208 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -93,7 +93,6 @@ purge_list = list( /datum/reagent/medicine/bicaridine, /datum/reagent/medicine/kelotane, - /datum/reagent/medicalnanites, ) purge_rate = 5 overdose_threshold = REAGENTS_OVERDOSE*2 @@ -241,7 +240,6 @@ purge_list = list( /datum/reagent/medicine/ryetalyn, /datum/reagent/medicine/paracetamol, - /datum/reagent/medicalnanites, /datum/reagent/medicine/ifosfamide, ) purge_rate = 2.5 @@ -814,7 +812,6 @@ purge_list = list( /datum/reagent/medicine/ryetalyn, /datum/reagent/medicine/paracetamol, - /datum/reagent/medicalnanites, /datum/reagent/medicine/ifosfamide, ) purge_rate = 2.5 @@ -899,7 +896,7 @@ var/mob/living/carbon/human/H = L var/affected_organ = pick(ORGAN_SLOT_HEART, ORGAN_SLOT_LUNGS, ORGAN_SLOT_LIVER, ORGAN_SLOT_KIDNEYS, ORGAN_SLOT_STOMACH) var/datum/internal_organ/Organrand = H.get_organ_slot(affected_organ) - Organrand.take_damage(1.0 * effect_str) + Organrand.take_damage(1 * effect_str) /datum/reagent/medicine/quickclotplus