Some chems reb / fix (#153)

* some chems * 1 * 2 * some twix * fix * Update code/modules/reagents/reagents/medical.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: Kirill <[email protected]> * fix --------- Signed-off-by: Kirill <[email protected]> Co-authored-by: Helg2 <[email protected]>
PMC-Unga-Marines · Aug 28, 2024 · c380e78 · c380e78
1 parent cd3f40e
commit c380e78
Showing 1 changed file with 40 additions and 5 deletions.
diff --git 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
@@ -88,8 +91,8 @@
 	scannable = TRUE
 	custom_metabolism = REAGENTS_METABOLISM * 0.125
 	purge_list = list(
-		/datum/reagent/medicine/kelotane,
 		/datum/reagent/medicine/bicaridine,
+		/datum/reagent/medicine/kelotane,
 	)
 	purge_rate = 5
 	overdose_threshold = REAGENTS_OVERDOSE*2
@@ -237,6 +240,7 @@
 	purge_list = list(
 		/datum/reagent/medicine/ryetalyn,
 		/datum/reagent/medicine/paracetamol,
+		/datum/reagent/medicine/ifosfamide,
 	)
 	purge_rate = 2.5
 	overdose_threshold = REAGENTS_OVERDOSE
@@ -255,10 +259,14 @@
 	return ..()
 
 /datum/reagent/medicine/kelotane/overdose_process(mob/living/L, metabolism)
-	L.apply_damages(effect_str, 0, 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, 0, 2*effect_str)
+	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"
@@ -285,6 +293,10 @@
 
 /datum/reagent/medicine/dermaline/overdose_crit_process(mob/living/L, metabolism)
 	L.apply_damages(3*effect_str, 0, 3*effect_str)
+	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"
@@ -800,6 +812,7 @@
 	purge_list = list(
 		/datum/reagent/medicine/ryetalyn,
 		/datum/reagent/medicine/paracetamol,
+		/datum/reagent/medicine/ifosfamide,
 	)
 	purge_rate = 2.5
 	overdose_threshold = REAGENTS_OVERDOSE
@@ -817,10 +830,14 @@
 
 
 /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)
+	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"
@@ -845,6 +862,10 @@
 
 /datum/reagent/medicine/meralyne/overdose_crit_process(mob/living/L, metabolism)
 	L.apply_damages(2*effect_str, 6*effect_str, 4*effect_str)
+	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"
@@ -871,6 +892,11 @@
 
 /datum/reagent/medicine/quickclot/overdose_crit_process(mob/living/L, metabolism)
 	L.apply_damages(0, 2*effect_str, 2*effect_str)
+	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 * effect_str)
 
 
 /datum/reagent/medicine/quickclotplus
@@ -1241,7 +1267,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"
@@ -1408,6 +1438,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)
@@ -1467,6 +1498,10 @@
 
 /datum/reagent/medicalnanites/overdose_crit_process(mob/living/L, metabolism)
 	L.adjustCloneLoss(1) //YUM!
+	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."))