Merge pull request #224 from CIB/master

Medical stuff

code/game/events/Events/ElectricalStorm.dm

@@ -84,11 +84,11 @@
 	proc
 		BlowLight() //Blow out a light fixture
 			var/obj/machinery/light/Light = null
-			var/insanity = 0
+			var/failed_attempts = 0
 			while (Light == null || Light.status != 0)
 				Light = pick(Lights)
-				insanity++
-				if (insanity >= Lights.len)
+				failed_attempts++
+				if (failed_attempts >= 10)
 					return
 
 			spawn(0) //Overload the light, spectacularly.
@@ -98,12 +98,12 @@
 				Light.broken()
 
 		DisruptAPC()
-			var/insanity = 0
+			var/failed_attempts = 0
 			var/obj/machinery/power/apc/APC
 			while (!APC || !APC.operating)
 				APC = pick(APCs)
-				insanity++
-				if (insanity >= APCs.len)
+				failed_attempts++
+				if (failed_attempts >= 10)
 					return
 
 			if (prob(40))

code/game/gamemodes/malfunction/Malf_Modules.dm

@@ -93,7 +93,7 @@ rcd light flash thingy on matter drain
 /datum/AI_Module/small/blackout
 	module_name = "Blackout"
 	mod_pick_name = "blackout"
-	uses = 3
+	uses = 1
 
 /client/proc/blackout()
 	set category = "Malfunction"
@@ -246,7 +246,7 @@ rcd light flash thingy on matter drain
 				already = 1
 		if (!already)
 			usr.verbs += /client/proc/interhack
-			src.temp = "Hacks the status upgrade from Cent. Com, removing any information about malfunctioning electrical systems."
+			src.temp = "Tricks the station's automated diagnosis suite for a while, giving you more time until you are revealed."
 			usr:current_modules += new /datum/AI_Module/small/interhack
 			src.processing_time -= 15
 		else src.temp = "This module is only needed once."

code/game/gamemodes/malfunction/malfunction.dm

@@ -62,6 +62,13 @@
 */
 	spawn (rand(waittime_l, waittime_h))
 		send_intercept()
+		sleep(10*60*5) // 5 minutes
+		if(intercept_hacked)
+			sleep(10 * 60 * 20) // 30 minutes
+			command_alert("Diagnosis suite failure detected. Running backup diagnosis tool.", "Anomaly Alert")
+			sleep(100)
+		command_alert("AI unit diagnosis failed. Unable to detect morality cores. Disabling of unit recommended.", "Anomaly Alert")
+
 	..()
 
 

code/game/machinery/bots/medbot.dm

@@ -383,29 +383,7 @@
 	if(src.emagged) //Emagged! Time to poison everybody.
 		reagent_id = "toxin"
 
-	var/virus = 0
-	for(var/datum/disease/D in C.viruses)
-		virus = 1
-
-	if (!reagent_id && (virus))
-		if(!C.reagents.has_reagent(src.treatment_virus))
-			reagent_id = src.treatment_virus
-
-	if (!reagent_id && (C.getBruteLoss() >= heal_threshold))
-		if(!C.reagents.has_reagent(src.treatment_brute))
-			reagent_id = src.treatment_brute
-
-	if (!reagent_id && (C.getOxyLoss() >= (15 + heal_threshold)))
-		if(!C.reagents.has_reagent(src.treatment_oxy))
-			reagent_id = src.treatment_oxy
-
-	if (!reagent_id && (C.getFireLoss() >= heal_threshold))
-		if(!C.reagents.has_reagent(src.treatment_fire))
-			reagent_id = src.treatment_fire
-
-	if (!reagent_id && (C.getToxLoss() >= heal_threshold))
-		if(!C.reagents.has_reagent(src.treatment_tox))
-			reagent_id = src.treatment_tox
+	if (!reagent_id) reagent_id = "inaprovaline"
 
 	if(!reagent_id) //If they don't need any of that they're probably cured!
 		src.oldpatient = src.patient

code/game/objects/items/weapons/medical.dm

@@ -15,6 +15,15 @@ MEDICAL
 			t_him = "her"
 		user << "\red \The [M] is dead, you cannot help [t_him]!"
 		return
+	if (M.health < 50)
+		var/t_him = "it"
+		if (M.gender == MALE)
+			t_him = "him"
+		else if (M.gender == FEMALE)
+			t_him = "her"
+		user << "\red \The [M] is wounded badly, this item cannot help [t_him]!"
+		return
+
 
 	if (!istype(M))
 		user << "\red \The [src] cannot be applied to [M]!"

code/modules/admin/admin.dm

@@ -1894,7 +1894,10 @@
 						else
 							id = H.wear_id
 
-						if(isnull(id.assignment))
+						if(!id)
+							usr << "<font color=red>ERROR:</font> Inform the coders that an [H.name] had wear_id but no ID on their ID slot."
+							dat += "<td><font color=red>ERROR</font></td>"
+						else if(isnull(id.assignment))
 							usr << "<font color=red>ERROR:</font> Inform the coders that an [id.name] was checked for its assignment variable."
 							dat += "<td><font color=red>ERROR</font></td>"
 						else