Skip to content

Commit

Permalink
Let MMI brains commit suicide. (ParadiseSS13#24411)
Browse files Browse the repository at this point in the history
* Let MMI brains commit suicide.

* Update code/game/verbs/suicide.dm

Co-authored-by: DGamerL <[email protected]>

* Update code/game/verbs/suicide.dm

Co-authored-by: Luc <[email protected]>

---------

Co-authored-by: DGamerL <[email protected]>
Co-authored-by: Luc <[email protected]>
  • Loading branch information
3 people authored Mar 11, 2024
1 parent 3ea8d4a commit 8c531f4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
4 changes: 4 additions & 0 deletions code/game/verbs/suicide.dm
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,7 @@
affected.add_autopsy_data(byitem ? "Suicide by [byitem]" : "Suicide", dmgamt)

updatehealth()

/mob/living/brain/do_suicide()
visible_message("<span class='danger'>[src] is thinking about thinking about thinking about thinking about.... It looks like [p_theyre()] trying to commit suicide!</span>")
death()
3 changes: 3 additions & 0 deletions code/modules/mob/living/brain/MMI.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
brainmob.forceMove(src)
REMOVE_TRAIT(brainmob, TRAIT_RESPAWNABLE, GHOSTED)
brainmob.set_stat(CONSCIOUS)
// If they suicided as an MMI, re-inserting them should
// restore their ability to suicide.
brainmob.suiciding = FALSE
brainmob.see_invisible = initial(brainmob.see_invisible)
GLOB.dead_mob_list -= brainmob//Update dem lists
GLOB.alive_mob_list += brainmob
Expand Down

0 comments on commit 8c531f4

Please sign in to comment.