shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31935 from ShizCalev/shade-qdel-fix

Browse Source 
Fixes shades being sent back to the arrival shuttle when their stone is qdel'd
This commit is contained in:
Jordan Brown
2017-10-21 19:52:57 -04:00
committed by CitadelStationBot
parent 3e1c307e4e
commit 17d2ff88c5
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/gamemodes/wizard/soulstone.dm
View File

@@ -44,6 +44,11 @@
if(spent)
to_chat(user, "<span class='cult'>This shard is spent; it is now just a creepy rock.</span>")
/obj/item/device/soulstone/Destroy() //Stops the shade from being qdel'd immediately and their ghost being sent back to the arrival shuttle.
for(var/mob/living/simple_animal/shade/A in src)
A.death()
return ..()
//////////////////////////////Capturing////////////////////////////////////////////////////////
/obj/item/device/soulstone/attack(mob/living/carbon/human/M, mob/living/user)