cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-12 02:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

might as well fix the regen core name and a few tweaks.

Browse Source
This commit is contained in:
Artur
2020-03-25 20:24:54 +02:00
parent 2546de3ee2
commit 4c4b1b340b
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/antagonists/bloodsucker/bloodsucker_life.dm
View File

@@ -184,11 +184,14 @@
// Nutrition // Nutrition
owner.current.nutrition = clamp(owner.current.blood_volume, 545, 0) //The amount of blood is how full we are. 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 //A bit higher regeneration based on blood volume
switch(owner.current.blood_volume)
if(owner.current.blood_volume < 700)
additional_regen = 0.4
if(owner.current.blood_volume < BLOOD_VOLUME_NORMAL) if(owner.current.blood_volume < BLOOD_VOLUME_NORMAL)
additional_regen = 0.3 additional_regen = 0.3
else if(owner.current.blood_volume < BLOOD_VOLUME_OKAY) if(owner.current.blood_volume < BLOOD_VOLUME_OKAY)
additional_regen = 0.2 additional_regen = 0.2
else if(owner.current.blood_volume < BLOOD_VOLUME_BAD) if(owner.current.blood_volume < BLOOD_VOLUME_BAD)
additional_regen = 0.1 additional_regen = 0.1
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

2
code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
View File

@@ -22,7 +22,7 @@
// STATS // STATS
var/bloodsucker_level var/bloodsucker_level
var/bloodsucker_level_unspent = 1 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/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/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. var/max_blood_volume = 600 // Maximum blood a Vamp can hold via feeding.

12
code/modules/mining/equipment/regenerative_core.dm
View File

@@ -26,8 +26,8 @@
slot = "hivecore" slot = "hivecore"
force = 0 force = 0
actions_types = list(/datum/action/item_action/organ_action/use) actions_types = list(/datum/action/item_action/organ_action/use)
var/inert = 0 var/inert
var/preserved = 0 var/preserved
/obj/item/organ/regenerative_core/Initialize() /obj/item/organ/regenerative_core/Initialize()
. = ..() . = ..()
@@ -38,6 +38,8 @@
go_inert() go_inert()
/obj/item/organ/regenerative_core/proc/preserved(implanted = 0) /obj/item/organ/regenerative_core/proc/preserved(implanted = 0)
if(inert)
name = initial(name)
inert = FALSE inert = FALSE
preserved = TRUE preserved = TRUE
update_icon() update_icon()
@@ -88,10 +90,10 @@
else else
to_chat(user, "<span class='notice'>You start to smear [src] on yourself. It feels and smells disgusting, but you feel amazingly refreshed in mere moments.</span>") to_chat(user, "<span class='notice'>You start to smear [src] on yourself. It feels and smells disgusting, but you feel amazingly refreshed in mere moments.</span>")
SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "self")) SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "self"))
if(!AmBloodsucker(H)) if(AmBloodsucker(H))
H.revive(full_heal = TRUE)
else
H.revive(full_heal = FALSE) H.revive(full_heal = FALSE)
else
H.revive(full_heal = TRUE)
qdel(src) 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. 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.