From 670868b77bf9d39227ee45656774a9bd20bab4e6 Mon Sep 17 00:00:00 2001 From: Couls Date: Sun, 7 Apr 2019 00:45:53 -0400 Subject: [PATCH] Allow ghosts to be resummoned as skeletons --- code/game/gamemodes/wizard/artefact.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index dbe3146dd7f..f3534375d87 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -618,6 +618,7 @@ var/global/list/multiverse = list() var/list/spooky_scaries = list() var/unlimited = 0 var/heresy = 0 + var/ghost = FALSE /obj/item/necromantic_stone/unlimited unlimited = 1 @@ -633,11 +634,12 @@ var/global/list/multiverse = list() if(M.stat != DEAD) to_chat(user, "This artifact can only affect the dead!") return + if(M.get_ghost() || M.get_ghost().client) // checks if the target is ghosted + ghost = TRUE - if(!M.mind || !M.client) + if((!M.client || !M.mind) && !ghost) // if there is no client connected to the ghost or mob to_chat(user, "There is no soul connected to this body...") return - check_spooky()//clean out/refresh the list if(spooky_scaries.len >= 3 && !unlimited) @@ -648,6 +650,7 @@ var/global/list/multiverse = list() else M.set_species(/datum/species/skeleton) M.visible_message(" A massive amount of flesh sloughs off [M] and a skeleton rises up!") + M.grab_ghost() // yoinks the ghost if its not in the body M.revive() equip_skeleton(M) spooky_scaries |= M