diff --git a/code/modules/mining/equipment/monster_organs/regenerative_core.dm b/code/modules/mining/equipment/monster_organs/regenerative_core.dm index e601ac89f8c..bcb7bc0455f 100644 --- a/code/modules/mining/equipment/monster_organs/regenerative_core.dm +++ b/code/modules/mining/equipment/monster_organs/regenerative_core.dm @@ -31,7 +31,7 @@ trigger_organ_action(TRIGGER_FORCE_AVAILABLE) /obj/item/organ/monster_core/regenerative_core/on_triggered_internal() - owner.revive(HEAL_ALL) + owner.revive(HEAL_ALL & ~HEAL_REFRESH_ORGANS) qdel(src) /// Log applications and apply moodlet. diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 1755d43de1f..c7f457ee427 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -37,7 +37,7 @@ if(isliving(target)) var/mob/living/victim = target if(victim.mob_biotypes & MOB_UNDEAD) //negative energy heals the undead - if(victim.revive(ADMIN_HEAL_ALL, force_grab_ghost = TRUE)) // This heals suicides + if(victim.revive(ADMIN_HEAL_ALL & ~HEAL_REFRESH_ORGANS , force_grab_ghost = TRUE)) // This heals suicides victim.grab_ghost(force = TRUE) to_chat(victim, span_notice("You rise with a start, you're undead!!!")) else if(victim.stat != DEAD) @@ -68,7 +68,7 @@ victim.death() return - if(victim.revive(ADMIN_HEAL_ALL, force_grab_ghost = TRUE)) // This heals suicides + if(victim.revive(ADMIN_HEAL_ALL & ~HEAL_REFRESH_ORGANS , force_grab_ghost = TRUE)) // This heals suicides to_chat(victim, span_notice("You rise with a start, you're alive!!!")) else if(victim.stat != DEAD) to_chat(victim, span_notice("You feel great!")) diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm index d9ca390f1f4..e359e301423 100644 --- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm @@ -77,7 +77,7 @@ if(3) //VICTORY ROYALE to_chat(affected_mob, span_hierophant("You win, and the malevolent spirits fade away as well as your wounds.")) affected_mob.client.give_award(/datum/award/achievement/jobs/helbitaljanken, affected_mob) - affected_mob.revive(HEAL_ALL) + affected_mob.revive(HEAL_ALL & ~HEAL_REFRESH_ORGANS) holder.del_reagent(type) return diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 9a169257e1c..a60b4c171b7 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -43,7 +43,7 @@ chemical_flags = REAGENT_DEAD_PROCESS metabolized_traits = list(TRAIT_ANALGESIA) /// Flags to fullheal every metabolism tick - var/full_heal_flags = ~(HEAL_BRUTE|HEAL_BURN|HEAL_TOX|HEAL_RESTRAINTS|HEAL_REFRESH_ORGANS) + var/full_heal_flags = ~(HEAL_BRUTE|HEAL_BURN|HEAL_TOX|HEAL_RESTRAINTS|HEAL_ORGANS) // The best stuff there is. For testing/debugging. /datum/reagent/medicine/adminordrazine/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) @@ -76,7 +76,7 @@ name = "Quantum Medicine" description = "Rare and experimental particles, that apparently swap the user's body with one from an alternate dimension where it's completely healthy." taste_description = "science" - full_heal_flags = ~(HEAL_ADMIN|HEAL_BRUTE|HEAL_BURN|HEAL_TOX|HEAL_RESTRAINTS|HEAL_ALL_REAGENTS|HEAL_REFRESH_ORGANS) + full_heal_flags = ~(HEAL_ADMIN|HEAL_BRUTE|HEAL_BURN|HEAL_TOX|HEAL_RESTRAINTS|HEAL_ALL_REAGENTS|HEAL_ORGANS) /datum/reagent/medicine/synaptizine name = "Synaptizine" diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm index a2c5698fbb1..99ac6b3c1af 100644 --- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm +++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm @@ -30,7 +30,7 @@ Regenerative extracts: span_notice("You squeeze [src], and it bursts in your hand, splashing you with milky goo which quickly regenerates your injuries!")) core_effect_before(H, user) user.do_attack_animation(interacting_with) - H.revive(HEAL_ALL) + H.revive(HEAL_ALL & ~HEAL_REFRESH_ORGANS) core_effect(H, user) playsound(H, 'sound/effects/splat.ogg', 40, TRUE) qdel(src) @@ -270,7 +270,7 @@ Regenerative extracts: if(target == user) return var/mob/living/U = user - U.revive(HEAL_ALL) + U.revive(HEAL_ALL & ~HEAL_REFRESH_ORGANS) to_chat(U, span_notice("Some of the milky goo sprays onto you, as well!")) /obj/item/slimecross/regenerative/adamantine