cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-19 03:49:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Emp Damage Hotfix (#22413)

Browse Source 
Some of the prosthetics weren't ticking down EMP damage, which was
because they had overrides of Process() that weren't correctly passing
in the SPT value needed by the tick_surge_damage(seconds_per_tick) proc.
This commit is contained in:
VMSolidus
2026-05-06 07:07:13 -04:00
committed by GitHub
parent 4ca1964078
commit 57f346a965
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/internal/_internal.dm
+1 -1
View File
@@ -167,7 +167,7 @@
take_damage(owner.chem_effects[toxin_type] * seconds_per_tick)
handle_regeneration(seconds_per_tick)
tick_surge_damage() //Yes, this is intentional.
tick_surge_damage(seconds_per_tick) //Yes, this is intentional.
/obj/item/organ/internal/proc/handle_regeneration(seconds_per_tick)
SHOULD_CALL_PARENT(TRUE)
code/modules/organs/organ_external.dm
+2 -2
View File
@@ -783,7 +783,7 @@ This function completely restores a damaged organ to perfect condition.
return TRUE
return FALSE
/obj/item/organ/external/process()
/obj/item/organ/external/process(seconds_per_tick)
if(owner)
//Specialized handling for tesla limbs. Checks if the limb currently has an associated tesla spine. Else, will disable the emissive and active overlays
if(is_tesla)
@@ -815,7 +815,7 @@ This function completely restores a damaged organ to perfect condition.
N.handle_nymph(src)
if(surge_damage && (status & ORGAN_ASSISTED))
tick_surge_damage() //Yes, this being here is intentional since this proc does not call ..() unless the owner is null.
tick_surge_damage(seconds_per_tick) //Yes, this being here is intentional since this proc does not call ..() unless the owner is null.
//Infections
update_germs()