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

Merge pull request #1134 from CHOMPStation2/cadyn-patch-5

Browse Source 
Delete defib timer
This commit is contained in:
cadyn
2021-01-24 06:52:37 -08:00
committed by GitHub
parent 4f9ed16579 fdbe1750cf
commit c5ae5ec866
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -288,7 +288,7 @@
/obj/item/weapon/shockpaddles/proc/can_revive(mob/living/carbon/human/H) //This is checked right before attempting to revive /obj/item/weapon/shockpaddles/proc/can_revive(mob/living/carbon/human/H) //This is checked right before attempting to revive
var/obj/item/organ/internal/brain/brain = H.internal_organs_by_name[O_BRAIN] var/obj/item/organ/internal/brain/brain = H.internal_organs_by_name[O_BRAIN]
if(H.should_have_organ(O_BRAIN) && (!brain || brain.defib_timer <= 0 ) ) if(H.should_have_organ(O_BRAIN) && (!brain) ) //CHOMPEdit Defib Timer Removal
return "buzzes, \"Resuscitation failed - Excessive neural degeneration. Further attempts futile.\"" return "buzzes, \"Resuscitation failed - Excessive neural degeneration. Further attempts futile.\""
H.updatehealth() H.updatehealth()

6
code/modules/organs/organ.dm
View File

@@ -145,8 +145,7 @@ var/list/organ_cache = list()
STOP_PROCESSING(SSobj, src) STOP_PROCESSING(SSobj, src)
handle_organ_mod_special(TRUE) handle_organ_mod_special(TRUE)
if(owner && vital) if(owner && vital)
owner.can_defib = 0 owner.death() //CHOMPEdit Defib Timer Removal
owner.death()
/obj/item/organ/proc/adjust_germ_level(var/amount) // Unless you're setting germ level directly to 0, use this proc instead /obj/item/organ/proc/adjust_germ_level(var/amount) // Unless you're setting germ level directly to 0, use this proc instead
germ_level = CLAMP(germ_level + amount, 0, INFECTION_LEVEL_MAX) germ_level = CLAMP(germ_level + amount, 0, INFECTION_LEVEL_MAX)
@@ -405,8 +404,7 @@ var/list/organ_cache = list()
if(user) if(user)
add_attack_logs(user, owner, "Removed vital organ [src.name]") add_attack_logs(user, owner, "Removed vital organ [src.name]")
if(owner.stat != DEAD) if(owner.stat != DEAD)
owner.can_defib = 0 owner.death() //CHOMPEdit Defib Timer Removal
owner.death()
handle_organ_mod_special(TRUE) handle_organ_mod_special(TRUE)