From b7c71c7c767350adcbcc32141b9fad624daf26ed Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Mon, 11 Jul 2016 09:23:43 -0400
Subject: [PATCH] differences

---
 code/game/objects/items/robot/robot_upgrades.dm |  5 ++++-
 code/modules/mob/living/silicon/robot/robot.dm  | 10 +---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index 2c470acc0b5..3836b8eca80 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -89,7 +89,10 @@
 			if(ghost.mind && ghost.mind.current == R)
 				R.key = ghost.key
 
-	R.revive()
+	R.stat = CONSCIOUS
+	dead_mob_list -= R //please never forget this ever kthx
+	living_mob_list += R
+	R.notify_ai(1)
 
 	return 1
 
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 813789138b8..b18ff0abea3 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1486,12 +1486,4 @@ var/list/robot_verbs_default = list(
 		if(1)
 			disable_component("comms", 160)
 		if(2)
-			disable_component("comms", 60)
-
-/mob/living/silicon/robot/revive(admin_revive = 0)
-	if(..()) //successfully ressuscitated from death
-		update_headlamp()
-		if(admin_revive)
-			locked = 1
-		notify_ai(1)
-		. = 1
\ No newline at end of file
+			disable_component("comms", 60)
\ No newline at end of file