From 972ee79ffb9a7d85ecf02d9ef5a6055d0534b207 Mon Sep 17 00:00:00 2001
From: 81Denton <32391752+81Denton@users.noreply.github.com>
Date: Sun, 3 Nov 2019 09:30:22 +0100
Subject: [PATCH] Revive proc tweaks (#47522)

* Revive proc tweaks

* atomize PR

* Implements nemvar's suggestion
---
 code/modules/mob/living/living.dm            | 2 +-
 code/modules/projectiles/guns/magic/wand.dm  | 4 ++--
 code/modules/projectiles/projectile/magic.dm | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index cf658320db4..752462e0a20 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -516,7 +516,7 @@
 /mob/living/proc/revive(full_heal = FALSE, admin_revive = FALSE)
 	SEND_SIGNAL(src, COMSIG_LIVING_REVIVE, full_heal, admin_revive)
 	if(full_heal)
-		fully_heal(admin_revive = TRUE)
+		fully_heal(admin_revive = admin_revive)
 	if(stat == DEAD && can_be_revived()) //in some cases you can't revive (e.g. no brain)
 		GLOB.dead_mob_list -= src
 		GLOB.alive_mob_list += src
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index ded80e060c7..6d045d2f4e5 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -74,7 +74,7 @@
 	if(isliving(user))
 		var/mob/living/L = user
 		if(L.mob_biotypes & MOB_UNDEAD) //negative energy heals the undead
-			user.revive(full_heal = TRUE, admin_revive = FALSE)
+			user.revive(full_heal = TRUE, admin_revive = TRUE)
 			to_chat(user, "<span class='notice'>You feel great!</span>")
 			return
 	to_chat(user, "<span class='warning'>You irradiate yourself with pure negative energy! \
@@ -116,7 +116,7 @@
 			</span>")
 			user.death(0)
 			return
-	user.revive(full_heal = TRUE, admin_revive = FALSE)
+	user.revive(full_heal = TRUE, admin_revive = TRUE)
 	to_chat(user, "<span class='notice'>You feel great!</span>")
 
 /obj/item/gun/magic/wand/resurrection/debug //for testing
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 6ab6bfbf510..cb79ada874a 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -23,7 +23,7 @@
 			if(L.mob_biotypes & MOB_UNDEAD) //negative energy heals the undead
 				if(L.hellbound && L.stat == DEAD)
 					return BULLET_ACT_BLOCK
-				if(L.revive(full_heal = TRUE, admin_revive = FALSE))
+				if(L.revive(full_heal = TRUE, admin_revive = TRUE))
 					L.grab_ghost(force = TRUE) // even suicides
 					to_chat(L, "<span class='notice'>You rise with a start, you're undead!!!</span>")
 				else if(L.stat != DEAD)
@@ -51,7 +51,7 @@
 		else
 			if(target.hellbound && target.stat == DEAD)
 				return BULLET_ACT_BLOCK
-			if(target.revive(full_heal = TRUE, admin_revive = FALSE))
+			if(target.revive(full_heal = TRUE, admin_revive = TRUE))
 				target.grab_ghost(force = TRUE) // even suicides
 				to_chat(target, "<span class='notice'>You rise with a start, you're alive!!!</span>")
 			else if(target.stat != DEAD)