From 35d3508352b30968d85a9f5378b6ba91341f3487 Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Fri, 1 Mar 2024 14:37:45 +0300 Subject: [PATCH] Fixes synth brains getting deleted when gibbed (#2181) * Fixes synthetic brains not always dropping when they get gibbed * Missing code * Update organs.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> Co-authored-by: Iajret --- code/modules/mob/living/carbon/death.dm | 2 +- code/modules/mob/living/death.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm index 85a6b06a2d3..13d7b37e6b8 100644 --- a/code/modules/mob/living/carbon/death.dm +++ b/code/modules/mob/living/carbon/death.dm @@ -42,7 +42,7 @@ for(var/obj/item/organ/organ as anything in organs) if((drop_bitflags & DROP_BRAIN) && istype(organ, /obj/item/organ/internal/brain)) - if(drop_bitflags & DROP_BODYPARTS) + if(drop_bitflags & DROP_BODYPARTS && (check_zone(organ.zone) != BODY_ZONE_CHEST)) // NOVA EDIT CHANGE - sYNTH BRAINS - ORIGINAL: if(drop_bitflags & DROP_BODYPARTS) continue // the head will drop, so the brain should stay inside organ.Remove(src) diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index ee0450f4075..92abcffd186 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -19,7 +19,7 @@ death(TRUE) ghostize() - spill_organs(drop_bitflags) + spill_organs(issynthetic(src) ? drop_bitflags|DROP_BRAIN : drop_bitflags) // NOVA EDIT CHANGE - Synths always drop brains - ORIGINAL: spill_organs(drop_bitflags) if(drop_bitflags & DROP_BODYPARTS) spread_bodyparts(drop_bitflags)