diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm index dcef3ca1dc0..ec84ee42329 100644 --- a/code/game/verbs/suicide.dm +++ b/code/game/verbs/suicide.dm @@ -51,10 +51,6 @@ else //This should not happen, but if it does, everything should still work damage_mod = 1 - if(isSynthetic()) - var/obj/item/organ/internal/cell/C = internal_organs_by_name["cell"] - C.take_damage(10, 1) - //Do 175 damage divided by the number of damage types applied. if(damagetype & BRUTELOSS) adjustBruteLoss(30/damage_mod) //hack to prevent gibbing diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index 70ab02ff661..820543f082f 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -157,7 +157,7 @@ list("antibiotics", "spaceacillin", 0, 20), list("antitoxins", "anti_toxin", 0, 20), list("nutrients", "glucose", 0, 80), - list("clotting agent", "carthatoline", 0, 80), + list("clotting agent", "myelamine", 0, 80), list("hyronalin", "hyronalin", 0, 20), list("radium", "radium", 0, 20) ) @@ -247,7 +247,7 @@ list("hyperzine", "hyperzine", 0, 30), list("oxycodone", "oxycodone", 0, 30), list("nutrients", "glucose", 0, 80), - list("clotting agent", "carthatoline", 0, 80) + list("clotting agent", "myelamine", 0, 80) ) interface_name = "combat chem dispenser" @@ -276,7 +276,7 @@ list("nutrients", "glucose", 0, 80), list("hyronalin", "hyronalin", 0, 80), list("radium", "radium", 0, 80), - list("clotting agent", "carthatoline", 0, 80) + list("clotting agent", "myelamine", 0, 80) ) /obj/item/rig_module/voice diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index c7d69d21cff..29048560bc2 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -329,13 +329,9 @@ return if(suiciding) - if(isSynthetic()) - var/obj/item/organ/internal/cell/C = internal_organs_by_name["cell"] - C.take_damage(6, 1) - else - failed_last_breath = 1 - adjustOxyLoss(2)//If you are suiciding, you should die a little bit faster - oxygen_alert = max(oxygen_alert, 1) + failed_last_breath = 1 + adjustOxyLoss(2)//If you are suiciding, you should die a little bit faster + oxygen_alert = max(oxygen_alert, 1) suiciding -- return 0 diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index 85d0932e576..ddb03b9a4f1 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -73,17 +73,19 @@ var/const/CE_STABLE_THRESHOLD = 0.5 blood_volume *= 0.3 else if(heart.is_bruised()) blood_volume *= 0.7 - else if(heart.damage > 1) - blood_volume *= 0.9 + else if(heart.damage) + blood_volume *= 0.8 //Effects of bloodloss var/dmg_coef = 1 //Lower means less damage taken - var/threshold_coef = 1 //Higher means the damage caps off lower + var/threshold_coef = 1 //Lower means the damage caps off lower if(CE_STABLE in chem_effects) - dmg_coef = min(1, 10/chem_effects[CE_STABLE]) //TODO: add effect for increased damage - threshold_coef = min(dmg_coef / CE_STABLE_THRESHOLD, 1) + dmg_coef = 0.5 + threshold_coef = 0.75 +// dmg_coef = min(1, 10/chem_effects[CE_STABLE]) //TODO: add effect for increased damage +// threshold_coef = min(dmg_coef / CE_STABLE_THRESHOLD, 1) if(blood_volume >= BLOOD_VOLUME_SAFE) if(pale) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 6f1442f0c5c..480bea3370e 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -350,7 +350,7 @@ overdose = REAGENTS_OVERDOSE * 0.5 scannable = 1 -/datum/reagent/plategen/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/myelamine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(alien == IS_DIONA) return M.eye_blurry += (3 * removed) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 20d18d6af30..8f0e3f4d7bf 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -366,7 +366,7 @@ inhibitors = list("sugar" = 1) // Messes up with inaprovaline result_amount = 2 -/datum/chemical_reaction/escharamine +/datum/chemical_reaction/myelamine name = "Myelamine" id = "myelamine" result = "myelamine" diff --git a/html/changelogs/Anewbe - Medical.yml b/html/changelogs/Anewbe - Medical.yml new file mode 100644 index 00000000000..758042ae691 --- /dev/null +++ b/html/changelogs/Anewbe - Medical.yml @@ -0,0 +1,49 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Anewbe + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a changelog editing system that should cause fewer conflicts and more accurate timestamps." + - rscadd: "Added Myelamine, a blood clotting chemical. This is available to antags, and can be ordered from cargo or mixed." + - rscadd: "Added Osteodaxon, a bone fixing medicine. This is available to antags, and can be mixed." + - rscadd: "Added Carthatoline, a stronger anti-toxin." + - rscadd: "Added Spidertoxin, which comes from spiders (duh), and is used in making Myelamine." + - rscadd: "Death Alarms can now be ordered from cargo." + - rscdel: "Dexalin Plus is half as strong (still pretty strong, though). + - rscadd: "Ninja, Merc, and ERT-M Hardsuits can now inject myelamine." + - tweak: "Inaprovaline now decreases the effects of bloodloss, and lessens brain damage taken from OxyLoss." + - tweak: "Prosthetic organs now take randomised damage when emp'd, this should roughly average out to the old values." + - tweak: "The effects of heart damage have been tweaked, should be slightly easier to survive now." + - tweak: "Some of the stronger chems have side effects, like confusion or blurry vision. These should be fairly minor, and we may be tweaking them in the future." + - tweak: "The suiciding var now wears off, making it possible to save suicide victims if quick action is taken." + - tweak: "Death Alarms now announce on General comms again." \ No newline at end of file