Skip to content

Commit

Permalink
Fixes synth brains getting deleted when gibbed (#2181)
Browse files Browse the repository at this point in the history
* Fixes synthetic brains not always dropping when they get gibbed

* Missing code

* Update organs.dm

Co-authored-by: Bloop <[email protected]>
Co-authored-by: Iajret <[email protected]>
  • Loading branch information
3 people authored Mar 1, 2024
1 parent 3eea338 commit 35d3508
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/death.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/death.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 35d3508

Please sign in to comment.