Merge pull request #5426 from Anewbe/deadringer_fixes

Fixes a few bugs associated with the Dead Ringer

code/modules/artifice/deadringer.dm

@@ -23,7 +23,6 @@
 	processing_objects -= src
 	..()
 
-
 /obj/item/weapon/deadringer/dropped()
 	if(timer > 20)
 		uncloak()
@@ -50,7 +49,6 @@
 		activated = 0
 		return
 
-
 /obj/item/weapon/deadringer/process()
 	if(activated)
 		if (ismob(src.loc))
@@ -77,13 +75,11 @@
 		icon_state = "deadringer"
 	return
 
-
 /obj/item/weapon/deadringer/proc/deathprevent()
 	for(var/mob/living/simple_animal/D in oviewers(7, src))
 		D.LoseTarget()
 	watchowner.emote("deathgasp")
-	watchowner.invisibility = 85
-	watchowner.alpha = 127
+	watchowner.alpha = 15
 	makeacorpse(watchowner)
 	for(var/mob/living/simple_animal/D in oviewers(7, src))
 		D.LoseTarget()
@@ -91,7 +87,6 @@
 
 /obj/item/weapon/deadringer/proc/uncloak()
 	if(watchowner)
-		watchowner.invisibility = 0
 		watchowner.alpha = 255
 		playsound(get_turf(src), 'sound/effects/uncloak.ogg', 35, 1, -1)
 	return
@@ -180,5 +175,3 @@
 		var/obj/item/organ/internal/G = I
 		G.Destroy()
 	return
-
-