Skip to content
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

[MIRROR] Fixes Dead Lingering Ghost-Control Mobs #615

Merged
merged 1 commit into from
Nov 14, 2023
Merged

[MIRROR] Fixes Dead Lingering Ghost-Control Mobs #615

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions code/modules/mob/living/basic/farm_animals/gorilla/gorilla.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,12 @@
ADD_TRAIT(src, TRAIT_PACIFISM, INNATE_TRAIT)
AddComponent(/datum/component/crate_carrier)

/mob/living/basic/gorilla/cargorilla/death(gibbed)
var/datum/component/potential_component = GetComponent(/datum/component/ghost_direct_control)
if(!QDELETED(potential_component))
qdel(potential_component)
return ..()

/**
* Poll ghosts for control of the gorilla. Not added in init because we only want to poll when the round starts.
* Preferably in future we can replace this with a popup on the lobby to queue to become a gorilla.
Expand Down
6 changes: 6 additions & 0 deletions code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@

grant_actions_by_list(innate_actions)

/mob/living/basic/regal_rat/death(gibbed)
var/datum/component/potential_component = GetComponent(/datum/component/ghost_direct_control)
if(!QDELETED(potential_component))
qdel(potential_component)
return ..()

/mob/living/basic/regal_rat/examine(mob/user)
. = ..()
if(user == src)
Expand Down
Loading