diff --git a/code/modules/organs/internal/heart.dm b/code/modules/organs/internal/heart.dm index 9e81dc0f73f..08c8d364c38 100644 --- a/code/modules/organs/internal/heart.dm +++ b/code/modules/organs/internal/heart.dm @@ -56,7 +56,7 @@ if(oxy < BLOOD_VOLUME_BAD) //MOAR pulse_mod++ - if(owner.status_flags & FAKEDEATH || owner.chem_effects[CE_NOPULSE]) + if(owner.status_flags & FAKEDEATH) pulse = Clamp(PULSE_NONE + pulse_mod, PULSE_NONE, PULSE_2FAST) //pretend that we're dead. unlike actual death, can be inflienced by meds return @@ -67,6 +67,7 @@ var/should_stop = prob(80) && owner.get_blood_circulation() < BLOOD_VOLUME_SURVIVE //cardiovascular shock, not enough liquid to pump should_stop = should_stop || prob(max(0, owner.getBrainLoss() - owner.maxHealth * 0.75)) //brain failing to work heart properly should_stop = should_stop || (prob(5) && pulse == PULSE_THREADY) //erratic heart patterns, usually caused by oxyloss + should_stop = should_stop || owner.chem_effects[CE_NOPULSE] if(should_stop) // The heart has stopped due to going into traumatic or cardiovascular shock. to_chat(owner, "Your heart has stopped!") pulse = PULSE_NONE diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm index 7a6f5a9d405..1ed62e8b428 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm @@ -229,12 +229,12 @@ reagent_state = SOLID color = "#FFFFFF" strength = 0 - overdose = 5 - od_minimum_dose = 20 + metabolism = REM * 0.5 + overdose = 15 + od_minimum_dose = 5 taste_description = "salt" -/singleton/reagent/toxin/potassium_chloride/overdose(var/mob/living/carbon/M, var/alien, var/datum/reagents/holder) - ..() +/singleton/reagent/toxin/potassium_chloride/overdose(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) var/mob/living/carbon/human/H = M if(!istype(H) || (H.species.flags & NO_BLOOD)) return @@ -250,13 +250,12 @@ description = "Potassium Chlorophoride is an expensive, vastly improved variant of Potassium Chloride. Potassium Chlorophoride, unlike the original drug, acts immediately to block neuromuscular junctions, causing general paralysis." reagent_state = SOLID color = "#FFFFFF" - strength = 10 + strength = 0 overdose = 5 od_minimum_dose = 20 taste_description = "salt" /singleton/reagent/toxin/potassium_chlorophoride/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) - ..() var/mob/living/carbon/human/H = M if(!istype(H) || (H.species.flags & NO_BLOOD)) return diff --git a/html/changelogs/doxxmedearly-Pchloride_changes.yml b/html/changelogs/doxxmedearly-Pchloride_changes.yml new file mode 100644 index 00000000000..ba0a87f53db --- /dev/null +++ b/html/changelogs/doxxmedearly-Pchloride_changes.yml @@ -0,0 +1,6 @@ +author: Doxxmedearly +delete-after: True +changes: + - bugfix: "Potassium Chloride/Chlorophoride now properly stop the heart as intended." + - tweak: "Potassium Chloride takes time to kick in, and metabolizes a little faster. It still requires 20u minimum to stop the heart." + - tweak: "Potassium Chloride/Chlorophoride no longer cause toxins damage. Stopping the heart is enough."