Runtimes are funtimes!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2941 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
quartz235@gmail.com
2012-01-10 22:21:26 +00:00
parent 188dfb526e
commit 26a2f20340
4 changed files with 19 additions and 14 deletions

View File

@@ -532,8 +532,9 @@ Code:
for (var/obj/item/weapon/mop/M in world) for (var/obj/item/weapon/mop/M in world)
var/turf/ml = get_turf(M) var/turf/ml = get_turf(M)
if (ml.z != cl.z) if(ml)
continue if (ml.z != cl.z)
continue
ldat += "Mop - <b>\[[ml.x],[ml.y]\]</b> - [M.reagents.total_volume ? "Wet" : "Dry"]<br>" ldat += "Mop - <b>\[[ml.x],[ml.y]\]</b> - [M.reagents.total_volume ? "Wet" : "Dry"]<br>"

View File

@@ -80,7 +80,7 @@ obj/structure
Tsrc.ReplaceWithWall() Tsrc.ReplaceWithWall()
for(var/obj/machinery/atmospherics/pipe/P in Tsrc) for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
P.layer = 1 P.layer = 1
W:use(2) if (W) W:use(2)
del(src) del(src)
return return

View File

@@ -354,7 +354,10 @@
Tempstun = 1 Tempstun = 1
if(bodytemperature <= (T0C - 50)) // hurt temperature if(bodytemperature <= (T0C - 50)) // hurt temperature
adjustFireLoss(round(sqrt(bodytemperature)) * 2) if(bodytemperature <= 49) // sqrting negative numbers is bad
adjustFireLoss(200)
else
adjustFireLoss(round(sqrt(bodytemperature)) * 2)
else else
Tempstun = 0 Tempstun = 0

View File

@@ -207,16 +207,17 @@
if(L.len == 2) if(L.len == 2)
L -= mob L -= mob
var/mob/M = L[1] var/mob/M = L[1]
if ((get_dist(mob, M) <= 1 || M.loc == mob.loc)) if(M)
var/turf/T = mob.loc if ((get_dist(mob, M) <= 1 || M.loc == mob.loc))
. = ..() var/turf/T = mob.loc
if (isturf(M.loc)) . = ..()
var/diag = get_dir(mob, M) if (isturf(M.loc))
if ((diag - 1) & diag) var/diag = get_dir(mob, M)
else if ((diag - 1) & diag)
diag = null else
if ((get_dist(mob, M) > 1 || diag)) diag = null
step(M, get_dir(M.loc, T)) if ((get_dist(mob, M) > 1 || diag))
step(M, get_dir(M.loc, T))
else else
for(var/mob/M in L) for(var/mob/M in L)
M.other_mobs = 1 M.other_mobs = 1