diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm index 90919a4e80..06eb271dd6 100644 --- a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm +++ b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm @@ -184,12 +184,15 @@ // Nutrition owner.current.nutrition = clamp(owner.current.blood_volume, 545, 0) //The amount of blood is how full we are. //A bit higher regeneration based on blood volume - if(owner.current.blood_volume < BLOOD_VOLUME_NORMAL) - additional_regen = 0.3 - else if(owner.current.blood_volume < BLOOD_VOLUME_OKAY) - additional_regen = 0.2 - else if(owner.current.blood_volume < BLOOD_VOLUME_BAD) - additional_regen = 0.1 + switch(owner.current.blood_volume) + if(owner.current.blood_volume < 700) + additional_regen = 0.4 + if(owner.current.blood_volume < BLOOD_VOLUME_NORMAL) + additional_regen = 0.3 + if(owner.current.blood_volume < BLOOD_VOLUME_OKAY) + additional_regen = 0.2 + if(owner.current.blood_volume < BLOOD_VOLUME_BAD) + additional_regen = 0.1 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // DEATH diff --git a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm index f8c35f7938..f95883e7c8 100644 --- a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm +++ b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm @@ -22,7 +22,7 @@ // STATS var/bloodsucker_level var/bloodsucker_level_unspent = 1 - var/regen_rate = 0.4 // How fast do I regenerate? + var/regen_rate = 0.3 // How fast do I regenerate? var/additional_regen // How much additional blood regen we gain from bonuses such as high blood. var/feed_amount = 15 // Amount of blood drawn from a target per tick. var/max_blood_volume = 600 // Maximum blood a Vamp can hold via feeding. diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm index c89698530f..c14aa097bb 100644 --- a/code/modules/mining/equipment/regenerative_core.dm +++ b/code/modules/mining/equipment/regenerative_core.dm @@ -26,8 +26,8 @@ slot = "hivecore" force = 0 actions_types = list(/datum/action/item_action/organ_action/use) - var/inert = 0 - var/preserved = 0 + var/inert + var/preserved /obj/item/organ/regenerative_core/Initialize() . = ..() @@ -38,7 +38,9 @@ go_inert() /obj/item/organ/regenerative_core/proc/preserved(implanted = 0) - inert = FALSE + if(inert) + name = initial(name) + inert = FALSE preserved = TRUE update_icon() desc = "All that remains of a hivelord. It is preserved, allowing you to use it to heal completely without danger of decay." @@ -88,10 +90,10 @@ else to_chat(user, "You start to smear [src] on yourself. It feels and smells disgusting, but you feel amazingly refreshed in mere moments.") SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "self")) - if(!AmBloodsucker(H)) - H.revive(full_heal = TRUE) - else + if(AmBloodsucker(H)) H.revive(full_heal = FALSE) + else + H.revive(full_heal = TRUE) qdel(src) user.log_message("[user] used [src] to heal [H]! Wake the fuck up, Samurai!", LOG_ATTACK, color="green") //Logging for 'old' style legion core use, when clicking on a sprite of yourself or another.