Skip to content

Fixes Simple Animal Graves #6517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CheffieGithub merged 1 commit into from
Jun 2, 2026
+3 −1
Merged

Fixes Simple Animal Graves #6517

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion code/modules/mob/living/carbon/spirit/spirit.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,14 @@
. = FALSE
if(QDELETED(corpse) || (corpse.stat != DEAD))
return
// funeral + buried will make Journey to Underworld function as return to lobby
if(ishuman(corpse))
var/mob/living/carbon/human/human_corpse = corpse
if(!human_corpse.funeral)
human_corpse.funeral = TRUE
. = TRUE
// Animals have no mind so we have no ghost or spirit to talk to. They still are 'pacified' though.
else if(isanimal(corpse))
return TRUE
var/datum/mind/corpse_mind = get_mind(corpse, include_last = TRUE)
if(corpse_mind?.remove_antag_datum(/datum/antagonist/zombie))
. = TRUE
Expand Down
Loading