cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 21:17:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes a runtime with cybernetic hearts being EMP'd outside of mobs (#76587)

Browse Source 
## About The Pull Request

This proc made a false assumption owner always was set when emp'd, when
hearts can just be emp'd out in the wild

## Why It's Good For The Game

Runtimes

## Changelog

🆑 Melbert
fix: Fixed EMPing a cybernetic heart not implanted in a body not
applying effects (stopping the heartbeat temporarily)
/🆑
This commit is contained in:
MrMelbert
2023-07-06 12:49:12 -05:00
committed by GitHub
parent f5bb4e2c24
commit e9928ebbe3
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/internal/heart/_heart.dm
+10 -8
View File
@@ -229,23 +229,25 @@
/obj/item/organ/internal/heart/cybernetic/emp_act(severity)
. = ..()
// If the owner doesn't need a heart, we don't need to do anything with it.
if(!owner.needs_heart())
return
if(. & EMP_PROTECT_SELF)
return
if(!COOLDOWN_FINISHED(src, severe_cooldown)) //So we cant just spam emp to kill people.
// Some effects are byassed if our owner (should it exist) doesn't need a heart
var/owner_needs_us = owner?.needs_heart()
if(owner_needs_us && !COOLDOWN_FINISHED(src, severe_cooldown)) //So we cant just spam emp to kill people.
owner.set_dizzy_if_lower(20 SECONDS)
owner.losebreath += 10
COOLDOWN_START(src, severe_cooldown, 20 SECONDS)
if(prob(emp_vulnerability/severity)) //Chance of permanent effects
organ_flags |= ORGAN_EMP //Starts organ faliure - gonna need replacing soon.
Stop()
owner.visible_message(span_danger("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!"), \
span_userdanger("You feel a terrible pain in your chest, as if your heart has stopped!"))
addtimer(CALLBACK(src, PROC_REF(Restart)), 10 SECONDS)
if(owner_needs_us)
owner.visible_message(
span_danger("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!"),
span_userdanger("You feel a terrible pain in your chest, as if your heart has stopped!"),
)
/obj/item/organ/internal/heart/cybernetic/on_life(seconds_per_tick, times_fired)
. = ..()