From 9e035424da33b7bb8826299903e9a4485c40cbe0 Mon Sep 17 00:00:00 2001
From: cib <cib123@googlemail.com>
Date: Thu, 5 Jan 2012 19:36:26 -0800
Subject: [PATCH] Nerfed the medbot and bruise packs.

---
 code/game/machinery/bots/medbot.dm         | 24 +---------------------
 code/game/objects/items/weapons/medical.dm |  9 ++++++++
 code/modules/admin/admin.dm                |  4 ++++
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm
index 12911896d7d..24fdc2fff7a 100644
--- a/code/game/machinery/bots/medbot.dm
+++ b/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
diff --git a/code/game/objects/items/weapons/medical.dm b/code/game/objects/items/weapons/medical.dm
index cbf794b33a4..1d5b7452068 100644
--- a/code/game/objects/items/weapons/medical.dm
+++ b/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]!"
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index d0a70b61229..71917f6f60e 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1894,6 +1894,10 @@
 						else
 							id = H.wear_id
 
+						if(!id)
+							usr << "Player has wear_id, but no id exists."
+							dat += "<td><font color=red>ERROR</font></td>"
+
 						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>"