Merge remote-tracking branch 'Krausus/InvestigateFix' into space_ruins

@tigercat2000 is a butt
This commit is contained in:
Crazylemon64
2016-06-24 16:42:47 -07:00
35 changed files with 97 additions and 135 deletions
+1 -1
View File
@@ -664,7 +664,7 @@ datum/reagent/strange_reagent/reaction_mob(var/mob/living/M as mob, var/method=T
var/mob/dead/observer/ghost = M.get_ghost()
if(ghost)
to_chat(ghost, "<span class='ghostalert'>Your are attempting to be revived with Strange Reagent. Return to your body if you want to be revived!</span> (Verbs -> Ghost -> Re-enter corpse)")
to_chat(ghost, sound('sound/effects/genetics.ogg'))
ghost << sound('sound/effects/genetics.ogg')
M.visible_message("<span class='notice'>[M] doesn't appear to respond, perhaps try again later?</span>")
if(!M.suiciding && !ghost && !(NOCLONE in M.mutations))
M.visible_message("<span class='warning'>[M] seems to rise from the dead!</span>")