Some minor modifications to the last revision that I forgot to do.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1795 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/machinery/portable_turret.dm

@@ -335,7 +335,7 @@ Neutralize All Unidentified Life Signs: []<BR>"},
 					if(src.assess_perp(C)<4)
 						continue // if threat level < 4, keep going
 
-				else if ((istype(C, /mob/living/carbon/monkey)) && (C.client) && (ticker.mode.name == "monkey"))
+				else if (istype(C, /mob/living/carbon/monkey))
 					continue // WHY WOULD YOU TARGET MONKIES???? Skip all monkies, jesus, don't waste your time bro
 
 				var/dst = get_dist(src, C) // if it's too far away, why bother?

code/modules/mob/living/carbon/metroid/life.dm

@@ -218,6 +218,7 @@
 
 		handle_environment(datum/gas_mixture/environment)
 			if(!environment)
+				fireloss += rand(10,20)
 				return
 
 			var/environment_heat_capacity = environment.heat_capacity()

code/modules/mob/living/carbon/metroid/metroid.dm

@@ -26,9 +26,8 @@
 	var/health_deficiency = (100 - health)
 	if(health_deficiency >= 45) tally += (health_deficiency / 25)
 
-	if (bodytemperature < 283.222)
+	if (bodytemperature < 183.222)
 		tally += (283.222 - bodytemperature) / 10 * 1.75
-		toxloss+=rand(5,20)
 
 	if(reagents)
 		if(reagents.has_reagent("hyperzine")) // hyperzine slows Metroids down

tgstation.dme

@@ -824,5 +824,5 @@
 #include "code\WorkInProgress\recycling\scrap.dm"
 #include "code\WorkInProgress\recycling\sortingmachinery.dm"
 #include "interface\skin.dmf"
-#include "maps\TestingMap.dmm"
+#include "maps\tgstation.2.0.7.dmm"
 // END_INCLUDE