Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port

code/modules/mob/living/carbon/human/human_damage.dm

@@ -23,12 +23,14 @@
 				mob_list += src
 				stat = CONSCIOUS
 				ear_deaf = 0
+				tod = 0
 	if (stat == CONSCIOUS && (src in dead_mob_list)) //Defib fix
 		mob_list -= src
 		dead_mob_list -= src
 		living_mob_list += src
 		mob_list += src		
 		ear_deaf = 0
+		tod = 0
 	return
 
 /mob/living/carbon/human/getBrainLoss()

code/modules/mob/living/silicon/ai/ai.dm

@@ -63,7 +63,7 @@ var/list/ai_list = list()
 	var/obj/item/borg/sight/hud/sec/sechud = null
 	var/obj/item/borg/sight/hud/med/healthhud = null
 	
-	var/arrivalmsg = "$name, $rank has arrived on the station."
+	var/arrivalmsg = "$name, $rank, has arrived on the station."
 
 /mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/device/mmi/B, var/safety = 0)
 	var/list/possibleNames = ai_names

code/modules/mob/mob.dm

@@ -1212,9 +1212,9 @@ mob/proc/yank_out_object()
 
 
 
-/mob/verb/respawn()
+/mob/dead/observer/verb/respawn()
 	set name = "Respawn as NPC"
-	set category = "OOC"
+	set category = "Ghost"
 
 	if((usr in respawnable_list) && (stat==2 || istype(usr,/mob/dead/observer)))
 		var/list/creatures = list("Mouse")

code/modules/mob/transform_procs.dm

@@ -432,12 +432,13 @@
 		return 1 //Parrots are no longer unfinished! -Nodrak
 	if(ispath(MP, /mob/living/simple_animal/pony))
 		return 1 // ZOMG PONIES WHEEE
+	if(ispath(MP, /mob/living/simple_animal/fox))
+		return 1 		
 	//Not in here? Must be untested!
 	return 0
 
 
 /mob/proc/safe_respawn(var/MP)
-//Bad mobs! - Remember to add a comment explaining what's wrong with the mob
 	if(!MP)
 		return 0	//Sanity, this should never happen.
 
@@ -456,6 +457,8 @@
 		return 1
 	if(ispath(MP, /mob/living/simple_animal/pony))
 		return 1
+	if(ispath(MP, /mob/living/simple_animal/fox))
+		return 1 	
 
 //Antag Creatures!
 /*	if(ispath(MP, /mob/living/simple_animal/hostile/carp))