From 58553e4ad0777e4d66950b8c0324cec8974a042c Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Tue, 8 Aug 2023 13:24:32 +1000 Subject: [PATCH] Fixes nymph possession not returning if already occupied. --- code/modules/mob/living/carbon/nymph/diona.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/carbon/nymph/diona.dm b/code/modules/mob/living/carbon/nymph/diona.dm index db3c04a741..bf9e97cb5a 100644 --- a/code/modules/mob/living/carbon/nymph/diona.dm +++ b/code/modules/mob/living/carbon/nymph/diona.dm @@ -135,12 +135,14 @@ var/global/list/_nymph_default_emotes = list( /mob/living/carbon/diona/attack_ghost(mob/observer/dead/user) if(client || key || ckey) to_chat(user, SPAN_WARNING("\The [src] already has a player.")) + return if(alert(user, "Do you wish to take control of \the [src]?", "Chirp Time", "No", "Yes") == "No") return if(QDELETED(src) || QDELETED(user) || !user.client) return if(client || key || ckey) to_chat(user, SPAN_WARNING("\The [src] already has a player.")) + return var/datum/ghosttrap/plant/P = get_ghost_trap("living plant") if(P.assess_candidate(user)) P.transfer_personality(user, src)