Skip to content

Commit

Permalink
Fixes cyborgs not dying when they fall into chasms (tgstation#85787)
Browse files Browse the repository at this point in the history
## About The Pull Request
When a cyborg gets gibbed, its MMI pops out and is still able to talk.
Funny thing about chasms, they gib you, which leaves you still able to
talk despite the fact that you should be dead, so this nulls out the
cyborgs MMI if they fall into a chasm, leaving the player properly dead
albeit round removed
## Why It's Good For The Game
It fixes a bug that almost never happens
## Changelog
:cl:
fix: borgs no longer drop MMIs when chasmed
/:cl:

---------

Co-authored-by: Odairu <39929315+Odairu@users.noreply.github.com>
(cherry picked from commit 6c9cfa1)
  • Loading branch information
imedial authored and Sadboysuss committed Aug 15, 2024
1 parent 0775fb7 commit b61dd94
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions code/datums/components/chasm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,10 @@
REMOVE_TRAIT(fallen_mob, TRAIT_NO_TRANSFORM, REF(src))
if (fallen_mob.stat != DEAD)
fallen_mob.investigate_log("has died from falling into a chasm.", INVESTIGATE_DEATHS)
if(issilicon(fallen_mob))
//Silicons are held together by hopes and dreams, unfortunately, I'm having a nightmare
var/mob/living/silicon/robot/fallen_borg = fallen_mob
fallen_borg.mmi = null
fallen_mob.death(TRUE)
fallen_mob.apply_damage(300)

Expand Down

0 comments on commit b61dd94

Please sign in to comment.