cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-28 23:58:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9203 from MistakeNot4892/chirp

Browse Source 
Fixes nymph possession not returning if already occupied.
This commit is contained in:
Atermonera
2023-08-08 16:28:24 -08:00
committed by GitHub
parent 40cc235e00 58553e4ad0
commit 21c2fd9a8a
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/nymph/diona.dm
+2
View File
@@ -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)