Magic Overhaul Part Deux

code/modules/projectiles/projectile/magic.dm

@@ -38,21 +38,26 @@
 
 	if(istype(target,/mob))
 		var/old_stat = target.stat
-		if(target.stat == DEAD)
-			dead_mob_list -= target
-			living_mob_list += target
-		target.stat = CONSCIOUS
-		target.tod = null
-		target.setToxLoss(0)
-		target.setOxyLoss(0)
-		target.setCloneLoss(0)
-		target.SetParalysis(0)
-		target.SetStunned(0)
-		target.SetWeakened(0)
-		target.radiation = 0
-		target.heal_overall_damage(target.getBruteLoss(), target.getFireLoss())
-		target.reagents.clear_reagents()
-		target.suiciding = 0
+		if(isanimal(target) && target.stat == DEAD)
+			var/mob/living/simple_animal/O = target
+			var/mob/living/simple_animal/A = new O.type(O.loc)
+			A.real_name = O.real_name
+			A.name = O.name
+			if(iscorgi(O))
+				var/mob/living/simple_animal/corgi/C = O
+				if(C.inventory_head)
+					C.inventory_head.loc = C.loc
+				if(C.inventory_back)
+					C.inventory_back.loc = C.loc
+			if(O.mind)
+				O.mind.transfer_to(A)
+			else
+				A.key = O.key
+			del(O)
+			target = A
+		else
+			target.revive()
+			target.suiciding = 0
 		if(!target.ckey)
 			for(var/mob/dead/observer/ghost in player_list)
 				if(target.real_name == ghost.real_name)