From 5863fe37d25d46ad67fbf9beb9c337f47c732f03 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Mon, 25 Jan 2021 17:04:35 -0500 Subject: [PATCH 1/5] Adds rate of healing limit to the healing rod --- code/datums/status_effects/buffs.dm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index e6b2e8d2008..d9d8495f922 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -109,6 +109,10 @@ alert_type = null var/hand var/deathTick = 0 + /// How many points the rod has to heal with, starts with 25, maxes at 50, or whatever heal_points_max is set to. + var/heal_points = 25 + /// Max heal points for the rod to spend on healing people + var/max_heal_points = 50 /datum/status_effect/hippocraticOath/on_apply() //Makes the user passive, it's in their oath not to harm! @@ -178,7 +182,11 @@ itemUser.adjustBrainLoss(-1.5) itemUser.adjustCloneLoss(-0.5) //Becasue apparently clone damage is the bastion of all health //Heal all those around you, unbiased + if(heal_points < (max_heal_points)) + heal_points = max((heal_points += 3), max_heal_points) for(var/mob/living/L in view(7, owner)) + if(heal_points <= 0) + break if(L.health < L.maxHealth) new /obj/effect/temp_visual/heal(get_turf(L), "#375637") if(iscarbon(L)) @@ -189,18 +197,23 @@ L.adjustStaminaLoss(-3.5) L.adjustBrainLoss(-3.5) L.adjustCloneLoss(-1) //Becasue apparently clone damage is the bastion of all health + heal_points-- if(ishuman(L)) var/mob/living/carbon/human/H = L for(var/obj/item/organ/external/E in H.bodyparts) if(prob(10)) E.mend_fracture() E.internal_bleeding = FALSE + heal_points-- else if(issilicon(L)) L.adjustBruteLoss(-3.5) L.adjustFireLoss(-3.5) + heal_points-- else if(isanimal(L)) var/mob/living/simple_animal/SM = L SM.adjustHealth(-3.5) + if(prob(50)) + heal_points -- // Animals are simpler /obj/screen/alert/status_effect/regenerative_core name = "Reinforcing Tendrils" From 22898f6d4989a28543b8723e128196e24065f081 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Tue, 26 Jan 2021 15:39:45 -0500 Subject: [PATCH 2/5] Minimizes problems --- code/datums/status_effects/buffs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index d9d8495f922..0420a6ded95 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -183,7 +183,7 @@ itemUser.adjustCloneLoss(-0.5) //Becasue apparently clone damage is the bastion of all health //Heal all those around you, unbiased if(heal_points < (max_heal_points)) - heal_points = max((heal_points += 3), max_heal_points) + heal_points = min((heal_points += 3), max_heal_points) for(var/mob/living/L in view(7, owner)) if(heal_points <= 0) break From 2523dc90bc24c5a296e985ab2537e2817f4b447a Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Mon, 26 Jul 2021 13:47:06 -0400 Subject: [PATCH 3/5] Update code/datums/status_effects/buffs.dm Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/datums/status_effects/buffs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 0420a6ded95..085d76d215e 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -183,7 +183,7 @@ itemUser.adjustCloneLoss(-0.5) //Becasue apparently clone damage is the bastion of all health //Heal all those around you, unbiased if(heal_points < (max_heal_points)) - heal_points = min((heal_points += 3), max_heal_points) + heal_points = min(heal_points += 3, max_heal_points) for(var/mob/living/L in view(7, owner)) if(heal_points <= 0) break From 2eb5e26aba646cada73e02a9246d8b06a5ac3ed3 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Mon, 26 Jul 2021 13:50:33 -0400 Subject: [PATCH 4/5] Final changes --- code/datums/status_effects/buffs.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 085d76d215e..5f6179a5118 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -109,8 +109,8 @@ alert_type = null var/hand var/deathTick = 0 - /// How many points the rod has to heal with, starts with 25, maxes at 50, or whatever heal_points_max is set to. - var/heal_points = 25 + /// How many points the rod has to heal with, maxes at 50, or whatever heal_points_max is set to. + var/heal_points = 50 /// Max heal points for the rod to spend on healing people var/max_heal_points = 50 @@ -181,9 +181,9 @@ itemUser.adjustStaminaLoss(-1.5) itemUser.adjustBrainLoss(-1.5) itemUser.adjustCloneLoss(-0.5) //Becasue apparently clone damage is the bastion of all health - //Heal all those around you, unbiased if(heal_points < (max_heal_points)) heal_points = min(heal_points += 3, max_heal_points) + //Heal all those around you, unbiased for(var/mob/living/L in view(7, owner)) if(heal_points <= 0) break From 076cbba3c48400d5a38018e3e2ed4c9887acd3fd Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Mon, 26 Jul 2021 13:51:57 -0400 Subject: [PATCH 5/5] Aaaand extra brackets I forgot --- code/datums/status_effects/buffs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 5f6179a5118..b30d579c3d8 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -181,7 +181,7 @@ itemUser.adjustStaminaLoss(-1.5) itemUser.adjustBrainLoss(-1.5) itemUser.adjustCloneLoss(-0.5) //Becasue apparently clone damage is the bastion of all health - if(heal_points < (max_heal_points)) + if(heal_points < max_heal_points) heal_points = min(heal_points += 3, max_heal_points) //Heal all those around you, unbiased for(var/mob/living/L in view(7, owner))