From 89f32cf154229ee31e2f64e8aabd388cfcb8aed2 Mon Sep 17 00:00:00 2001 From: "vageyenaman@gmail.com" Date: Thu, 7 Jul 2011 07:59:45 +0000 Subject: [PATCH] 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 | 2 +- code/modules/mob/living/carbon/metroid/life.dm | 1 + code/modules/mob/living/carbon/metroid/metroid.dm | 3 +-- tgstation.dme | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index ffd5415b6a6..a3176d8cd5c 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -335,7 +335,7 @@ Neutralize All Unidentified Life Signs: []
"}, 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? diff --git a/code/modules/mob/living/carbon/metroid/life.dm b/code/modules/mob/living/carbon/metroid/life.dm index c292bf4ba1f..d62074ef58a 100644 --- a/code/modules/mob/living/carbon/metroid/life.dm +++ b/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() diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index a13929d300b..30e35800594 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/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 diff --git a/tgstation.dme b/tgstation.dme index 1f10e071077..4416b69d021 100644 --- a/tgstation.dme +++ b/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