runtime sanity

This commit is contained in:
D3athrow
2015-08-26 17:06:09 -05:00
parent d2537620f0
commit 59cec39b90
4 changed files with 7 additions and 9 deletions

View File

@@ -108,7 +108,7 @@
if(timestopped)
if(!pulledby || pulledby.timestopped) //being moved by our wizard maybe?
return 0
var/move_delay = 5 * world.tick_lag
var/move_delay = max(5 * world.tick_lag, 1)
if(ismob(src))
var/mob/M = src
if(M.client)
@@ -120,7 +120,6 @@
can_pull_tether = 1
else
return 0
glide_size = Ceiling(32 / move_delay * world.tick_lag) - 1 //We always split up movements into cardinals for issues with diagonal movements.
var/atom/oldloc = loc
if((bound_height != 32 || bound_width != 32) && (loc == newLoc))

View File

@@ -81,7 +81,7 @@
/obj/effect/plantsegment/proc/manual_unbuckle(mob/user as mob)
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\/obj/effect/plantsegment/proc/manual_unbuckle() called tick#: [world.time]")
if(locked_atoms.len)
if(locked_atoms && locked_atoms.len)
if(prob(seed ? min(max(0,100 - seed.potency),100) : 50))
var/mob/M = locked_atoms[1]
if(M != user)

View File

@@ -188,11 +188,10 @@
target.apply_damage(basedamage, BURN, "chest", "blocked" = 0)
target.Weaken(1)
else if(target)
spawn()
var/obj/item/projectile/beam/B = getFromPool(/obj/item/projectile/beam/lightning/spell)
B.damage = basedamage
target.bullet_act(B)
returnToPool(B)
var/obj/item/projectile/beam/B = getFromPool(/obj/item/projectile/beam/lightning/spell)
B.damage = basedamage
target.bullet_act(B)
returnToPool(B)
if(chained)
//DO IT AGAIN
var/mob/next_target

View File

@@ -67,7 +67,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
/spell/proc/process()
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\/spell/proc/process() called tick#: [world.time]")
spawn while(charge_counter < charge_max)
if(!holder.timestopped)
if(holder && !holder.timestopped)
charge_counter++
sleep(1)
return