diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm
index 1b09e2f1bc3..ef8dae63ebb 100644
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -128,6 +128,9 @@
 			src.occupant.updatehealth()
 			if (src.occupant.health >= 0 && src.occupant.stat == 2)
 				src.occupant.stat = 0
+				src.occupant.lying = 0
+				dead_mob_list -= src.occupant
+				living_mob_list += src.occupant
 				src.overlays -= image('icons/obj/computer.dmi', "ai-fixer-404")
 				src.overlays += image('icons/obj/computer.dmi', "ai-fixer-full")
 			src.updateUsrDialog()
diff --git a/code/game/verbs/AI_status.dm b/code/game/verbs/AI_status.dm
deleted file mode 100644
index 9ebab4a16a1..00000000000
--- a/code/game/verbs/AI_status.dm
+++ /dev/null
@@ -1,20 +0,0 @@
-/mob/living/silicon/ai/proc/ai_statuschange()
-	set category = "AI Commands"
-	set name = "AI status"
-
-	if(usr.stat == 2)
-		usr <<"You cannot change your emotional status because you are dead!"
-		return
-	var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Friend Computer")
-	var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
-	for (var/obj/machinery/ai_status_display/AISD in world) //change status
-		spawn( 0 )
-		AISD.emotion = emote
-	for (var/obj/machinery/status_display/SD in world) //if Friend Computer, change ALL displays
-		if(emote=="Friend Computer")
-			spawn(0)
-			SD.friendc = 1
-		else
-			spawn(0)
-			SD.friendc = 0
-	return
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index d7dd8efb940..d3670f3bb4f 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -49,6 +49,7 @@
 	name = real_name
 	anchored = 1
 	canmove = 0
+	density = 1
 	loc = loc
 
 	holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo1"))
@@ -548,6 +549,27 @@
 
 	malf_picker.use(src)
 
+/mob/living/silicon/ai/proc/ai_statuschange()
+	set category = "AI Commands"
+	set name = "AI status"
+
+	if(usr.stat == 2)
+		usr <<"You cannot change your emotional status because you are dead!"
+		return
+	var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Friend Computer")
+	var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
+	for (var/obj/machinery/ai_status_display/AISD in world) //change status
+		spawn( 0 )
+		AISD.emotion = emote
+	for (var/obj/machinery/status_display/SD in world) //if Friend Computer, change ALL displays
+		if(emote=="Friend Computer")
+			spawn(0)
+			SD.friendc = 1
+		else
+			spawn(0)
+			SD.friendc = 0
+	return
+
 //I am the icon meister. Bow fefore me.	//>fefore
 /mob/living/silicon/ai/proc/ai_hologram_change()
 	set name = "Change Hologram"