Skip to content

Commit

Permalink
Legion core healing nerf + legion core fix (#11068)
Browse files Browse the repository at this point in the history
* fixed being able to preserve inert cores

* balance change

* Update buffs.dm

* Update regenerative_core.dm

* made the cooldown not ridiculously long due to an oversight

* fixes

* nitpick
  • Loading branch information
XeonMations authored Jun 12, 2024
1 parent 24123ce commit fd7dd91
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
12 changes: 7 additions & 5 deletions code/datums/status_effects/buffs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,7 @@
status_type = STATUS_EFFECT_REPLACE
alert_type = /atom/movable/screen/alert/status_effect/regenerative_core
var/power = 1
var/duration_mod = 1
var/alreadyinfected = FALSE

/datum/status_effect/regenerative_core/on_apply()
Expand All @@ -557,10 +558,11 @@
alreadyinfected = TRUE
ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, "legion_core_trait")
ADD_TRAIT(owner, TRAIT_NECROPOLIS_INFECTED, "legion_core_trait")
if(owner.z == 5)
power = 2
owner.adjustBruteLoss(-50 * power)
owner.adjustFireLoss(-50 * power)
if(is_mining_level(owner.z))
power = 5
duration_mod = 2
owner.adjustBruteLoss(-20 * power)
owner.adjustFireLoss(-20 * power)
owner.cure_nearsighted()
owner.ExtinguishMob()
owner.fire_stacks = 0
Expand All @@ -572,7 +574,7 @@
var/mob/living/carbon/human/humi = owner
humi.coretemperature = humi.get_body_temp_normal()
owner.restoreEars()
duration = rand(150, 450) * power
duration = rand(150, 450) * duration_mod
return TRUE

/datum/status_effect/regenerative_core/on_remove()
Expand Down
5 changes: 3 additions & 2 deletions code/modules/mining/equipment/regenerative_core.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
if(C.preserved)
to_chat(user, "<span class='notice'>[M] is already stabilised.")
return

if(C.inert)
to_chat(user, "<span class='notice'>[M] is inert, it's not worth it to stabilize a nonfunctional one.")
return
C.preserved()
to_chat(user, "<span class='notice'>You inject [M] with the stabilizer. It will no longer go inert.</span>")
qdel(src)
Expand All @@ -42,7 +44,6 @@
go_inert()

/obj/item/organ/regenerative_core/proc/preserved(implanted = 0)
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."
Expand Down

0 comments on commit fd7dd91

Please sign in to comment.