Merge pull request #160 from Markolie/master

Bug fixes

code/modules/events/money_spam.dm

@@ -88,15 +88,6 @@
 
 			useMS.send_pda_message("[P.owner]", sender, message)
 
-			if (prob(50)) //Give the AI an increased chance to intercept the message
-				for(var/mob/living/silicon/ai/ai in mob_list)
-					// Allows other AIs to intercept the message but the AI won't intercept their own message.
-					if(ai.aiPDA != P && ai.aiPDA != src)
-						ai.show_message("<i>Intercepted message from <b>[sender]</b></i> (Unknown / spam?) <i>to <b>[P:owner]</b>: [message]</i>")
-
-			//Commented out because we don't send messages like this anymore.  Instead it will just popup in their chat window.
-			//P.tnote += "<i><b>&larr; From [sender] (Unknown / spam?):</b></i><br>[message]<br>"
-
 			if (!P.silent)
 				playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1)
 			for (var/mob/O in hearers(3, P.loc))

code/modules/events/tgevents/anomaly_bluespace.dm

@@ -22,6 +22,8 @@
 			var/obj/item/device/radio/beacon/chosen
 			var/list/possible = list()
 			for(var/obj/item/device/radio/beacon/W in world)
+				if(W.z != 1)
+					continue
 				possible += W
 
 			if(possible.len > 0)

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

@@ -17,6 +17,7 @@
 		var/datum/organ/external/H = organs_by_name["head"]
 		if (!H.amputated)
 			if ((health >= (config.health_threshold_dead/100*75)) && stat == DEAD)  //need to get them 25% away from death point before reviving them
+				living_mob_list -= src
 				mob_list -= src
 				dead_mob_list -= src
 				living_mob_list += src
@@ -24,13 +25,16 @@
 				stat = CONSCIOUS
 				ear_deaf = 0
 				tod = 0
+				timeofdeath = 0
 	if (stat == CONSCIOUS && (src in dead_mob_list)) //Defib fix
+		living_mob_list -= src
 		mob_list -= src
 		dead_mob_list -= src
 		living_mob_list += src
-		mob_list += src		
+		mob_list += src
 		ear_deaf = 0
 		tod = 0
+		timeofdeath = 0
 	return
 
 /mob/living/carbon/human/getBrainLoss()

code/modules/mob/living/silicon/robot/life.dm

@@ -33,13 +33,16 @@
 	adjustFireLoss(0)
 
 /mob/living/silicon/robot/proc/use_power()
-
 	if (is_component_functioning("power cell") && cell)
 		if(src.cell.charge <= 0)
 			uneq_all()
 			src.stat = 1		
-			Paralyse(3)
 			has_power = 0
+			for(var/V in components)
+				var/datum/robot_component/C = components[V]
+				if(C.name == "actuator") // Let drained robots move, disable the rest
+					continue
+				C.consume_power()
 		else
 			if(src.module_state_1)
 				src.cell.use(3)