Fix surge damage not ticking. (#21248)

title

Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2025-08-28 10:36:41 +00:00
committed by GitHub
co-authored by Matt Atlas
parent c87f824a39
commit 75d5ee5a64
3 changed files with 61 additions and 3 deletions
+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.
+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
+58
View File
@@ -0,0 +1,58 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################
# Your name.
author: MattAtlas
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Fixes surge damage not ticking properly on prosthetics."