cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[MIRROR] Fixes defib timers being 10 times as long compared to intended."

Browse Source
This commit is contained in:
cadyn
2021-01-24 18:53:16 -08:00
committed by GitHub
parent d3f6cba62c
commit 5bbdccefa5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/devices/defib.dm
View File

@@ -509,8 +509,8 @@
return // Still no brain. return // Still no brain.
// If the brain'd `defib_timer` var gets below this number, brain damage will happen at a linear rate. // If the brain'd `defib_timer` var gets below this number, brain damage will happen at a linear rate.
// This is measures in `Life()` ticks. E.g. 10 minute defib timer = 300 `Life()` ticks. // Original math was VERY off. Life() tick occurs every ~2 seconds, not every 2 world.time ticks. // This is measures in `Life()` ticks. E.g. 10 minute defib timer = 6000 world.time units = 3000 `Life()` ticks.
var/brain_damage_timer = ((config.defib_timer MINUTES) / 20) - ((config.defib_braindamage_timer MINUTES) / 20) var/brain_damage_timer = ((config.defib_timer MINUTES) / 2) - ((config.defib_braindamage_timer MINUTES) / 2)
if(brain.defib_timer > brain_damage_timer) if(brain.defib_timer > brain_damage_timer)
return // They got revived before brain damage got a chance to set in. return // They got revived before brain damage got a chance to set in.

6
code/modules/organs/internal/brain.dm
View File

@@ -33,7 +33,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
if(!owner || owner.stat == DEAD) if(!owner || owner.stat == DEAD)
defib_timer = max(--defib_timer, 0) defib_timer = max(--defib_timer, 0)
else else
defib_timer = min(++defib_timer, (config.defib_timer MINUTES) / 20) // Time vars measure things in ticks. Life tick happens every ~2 seconds, therefore dividing by 20 defib_timer = min(++defib_timer, (config.defib_timer MINUTES) / 2)
/obj/item/organ/internal/brain/proc/can_assist() /obj/item/organ/internal/brain/proc/can_assist()
return can_assist return can_assist
@@ -81,7 +81,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
/obj/item/organ/internal/brain/New() /obj/item/organ/internal/brain/New()
..() ..()
health = config.default_brain_health health = config.default_brain_health
defib_timer = (config.defib_timer MINUTES) / 20 // Time vars measure things in ticks. Life tick happens every ~2 seconds, therefore dividing by 20 defib_timer = (config.defib_timer MINUTES) / 2
spawn(5) spawn(5)
if(brainmob) if(brainmob)
butcherable = FALSE butcherable = FALSE
@@ -103,7 +103,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
if(istype(H)) if(istype(H))
brainmob.dna = H.dna.Clone() brainmob.dna = H.dna.Clone()
brainmob.timeofhostdeath = H.timeofdeath brainmob.timeofhostdeath = H.timeofdeath
brainmob.ooc_notes = H.ooc_notes //VOREStation Edit brainmob.ooc_notes = H.ooc_notes //VOREStation Edit
// Copy modifiers. // Copy modifiers.
for(var/datum/modifier/M in H.modifiers) for(var/datum/modifier/M in H.modifiers)