Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some chems reb / fix #153

Merged
merged 8 commits into from
Aug 28, 2024
Merged

Some chems reb / fix #153

Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fa9e8c6
some chems
Tatarla Aug 27, 2024
e84b99b
1
Tatarla Aug 27, 2024
d1ea5b9
2
Tatarla Aug 27, 2024
03799c6
some twix
Tatarla Aug 28, 2024
5f4be5c
fix
Tatarla Aug 28, 2024
658842b
Update code/modules/reagents/reagents/medical.dm
Tatarla Aug 28, 2024
2eb9f5d
fix
Tatarla Aug 28, 2024
90d9804
Merge branch 'ximia' of https://github.com/Tatarla/Reborn-Work into x…
Tatarla Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 43 additions & 5 deletions code/modules/reagents/reagents/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -88,8 +91,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,
Tatarla marked this conversation as resolved.
Show resolved Hide resolved
)
purge_rate = 5
overdose_threshold = REAGENTS_OVERDOSE*2
Expand Down Expand Up @@ -237,6 +241,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
Expand All @@ -255,10 +261,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"
Expand All @@ -285,6 +295,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"
Expand Down Expand Up @@ -800,6 +814,8 @@
purge_list = list(
/datum/reagent/medicine/ryetalyn,
/datum/reagent/medicine/paracetamol,
/datum/reagent/medicalnanites,
/datum/reagent/medicine/ifosfamide,
Tatarla marked this conversation as resolved.
Show resolved Hide resolved
)
purge_rate = 2.5
overdose_threshold = REAGENTS_OVERDOSE
Expand All @@ -817,10 +833,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"
Expand All @@ -845,6 +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)
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"
Expand All @@ -871,6 +895,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
Expand Down Expand Up @@ -1241,7 +1270,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"
Expand Down Expand Up @@ -1408,6 +1441,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)
Expand Down Expand Up @@ -1467,6 +1501,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."))
Expand Down
Loading