From d9e8db8a6cfc628b9f78fb63e164a83fd9a88b79 Mon Sep 17 00:00:00 2001 From: kiwedespars <47008095+kiwedespars@users.noreply.github.com> Date: Wed, 1 Apr 2020 23:31:51 -0700 Subject: [PATCH 1/3] Update _status_effects.dm --- .../xenobiology/crossbreeding/_status_effects.dm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index b9897db303..2916894bd3 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -505,13 +505,13 @@ datum/status_effect/rebreathing/tick() /datum/status_effect/stabilized/purple/tick() var/is_healing = FALSE if(owner.getBruteLoss() > 0) - owner.adjustBruteLoss(-0.2) + owner.adjustBruteLoss(-1) is_healing = TRUE if(owner.getFireLoss() > 0) - owner.adjustFireLoss(-0.2) + owner.adjustFireLoss(-1) is_healing = TRUE if(owner.getToxLoss() > 0) - owner.adjustToxLoss(-0.2, forced = TRUE) //Slimepeople should also get healed. + owner.adjustToxLoss(-1, forced = TRUE) //Slimepeople should also get healed. is_healing = TRUE if(is_healing) examine_text = "SUBJECTPRONOUN is regenerating slowly, purplish goo filling in small injuries!" @@ -932,14 +932,6 @@ datum/status_effect/stabilized/blue/on_remove() ADD_TRAIT(owner, TRAIT_FREESPRINT, "stabilized_slime") return ..() -/datum/status_effect/stabilized/lightpink/tick() - owner.adjustStaminaLoss(-4.5) - for(var/mob/living/carbon/human/H in range(1, get_turf(owner))) - if(H != owner && H.stat != DEAD && H.health <= 0 && !H.reagents.has_reagent(/datum/reagent/medicine/epinephrine)) - to_chat(owner, "[linked_extract] pulses in sync with [H]'s heartbeat, trying to keep [H.p_them()] alive.") - H.reagents.add_reagent(/datum/reagent/medicine/epinephrine,5) - return ..() - /datum/status_effect/stabilized/lightpink/on_remove() REMOVE_TRAIT(owner, TRAIT_FREESPRINT, "stabilized_slime") return ..() From eeccea989c34366dbd3e17753dd6b048126b8551 Mon Sep 17 00:00:00 2001 From: kiwedespars <47008095+kiwedespars@users.noreply.github.com> Date: Thu, 2 Apr 2020 00:34:44 -0700 Subject: [PATCH 2/3] purple nerf - light pink gets epi back --- .../xenobiology/crossbreeding/_status_effects.dm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index 2916894bd3..828a11c396 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -505,13 +505,13 @@ datum/status_effect/rebreathing/tick() /datum/status_effect/stabilized/purple/tick() var/is_healing = FALSE if(owner.getBruteLoss() > 0) - owner.adjustBruteLoss(-1) + owner.adjustBruteLoss(-0.4) is_healing = TRUE if(owner.getFireLoss() > 0) - owner.adjustFireLoss(-1) + owner.adjustFireLoss(-0.4) is_healing = TRUE if(owner.getToxLoss() > 0) - owner.adjustToxLoss(-1, forced = TRUE) //Slimepeople should also get healed. + owner.adjustToxLoss(-0.4, forced = TRUE) //Slimepeople should also get healed. is_healing = TRUE if(is_healing) examine_text = "SUBJECTPRONOUN is regenerating slowly, purplish goo filling in small injuries!" @@ -931,6 +931,13 @@ datum/status_effect/stabilized/blue/on_remove() /datum/status_effect/stabilized/lightpink/on_apply() ADD_TRAIT(owner, TRAIT_FREESPRINT, "stabilized_slime") return ..() + +/datum/status_effect/stabilized/lightpink/tick() + for(var/mob/living/carbon/human/H in range(1, get_turf(owner))) + if(H != owner && H.stat != DEAD && H.health <= 0 && !H.reagents.has_reagent(/datum/reagent/medicine/epinephrine)) + to_chat(owner, "[linked_extract] pulses in sync with [H]'s heartbeat, trying to keep [H.p_them()] alive.") + H.reagents.add_reagent(/datum/reagent/medicine/epinephrine,5) + return ..() /datum/status_effect/stabilized/lightpink/on_remove() REMOVE_TRAIT(owner, TRAIT_FREESPRINT, "stabilized_slime") From 9b6cd54abf9377e8d424d57ebb1aefbeecb59bcd Mon Sep 17 00:00:00 2001 From: kiwedespars <47008095+kiwedespars@users.noreply.github.com> Date: Thu, 2 Apr 2020 00:35:38 -0700 Subject: [PATCH 3/3] there's an extra space and it bugged me im sorry --- .../research/xenobiology/crossbreeding/_status_effects.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index 828a11c396..95d6c49529 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -931,7 +931,7 @@ datum/status_effect/stabilized/blue/on_remove() /datum/status_effect/stabilized/lightpink/on_apply() ADD_TRAIT(owner, TRAIT_FREESPRINT, "stabilized_slime") return ..() - + /datum/status_effect/stabilized/lightpink/tick() for(var/mob/living/carbon/human/H in range(1, get_turf(owner))) if(H != owner && H.stat != DEAD && H.health <= 0 && !H.reagents.has_reagent(/datum/reagent/medicine/epinephrine))