cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 12:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix surge damage not ticking. (#21248)

Browse Source 
title

Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2025-08-28 12:36:41 +02:00
committed by GitHub
parent c87f824a39
commit 75d5ee5a64
3 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ.dm
+2 -2
View File
@@ -159,7 +159,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
germ_level = 0
return
if((status & ORGAN_ASSISTED) && surge_damage)
if(BP_IS_ROBOTIC(src) && surge_damage)
tick_surge_damage()
if(!owner)
@@ -416,7 +416,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
#define MAXIMUM_SURGE_DAMAGE 100
/obj/item/organ/proc/take_surge_damage(var/surge)
if(!(status & ORGAN_ASSISTED))
if(!BP_IS_ROBOTIC(src))
return //We check earlier, but just to make sure.
surge_damage = clamp(0, surge + surge_damage, MAXIMUM_SURGE_DAMAGE) //We want X seconds at most of hampered movement or what have you.
code/modules/organs/organ_external.dm
+1 -1
View File
@@ -710,7 +710,7 @@ This function completely restores a damaged organ to perfect condition.
//Determines if we even need to process this organ.
/obj/item/organ/external/proc/need_process()
if((status & ORGAN_ASSISTED) && surge_damage)
if(BP_IS_ROBOTIC(src) && surge_damage)
return TRUE
if(is_tesla && owner)
return TRUE