From 618b4fbf50466c24a126a78ff69120effe242524 Mon Sep 17 00:00:00 2001 From: "elly1989@rocketmail.com" Date: Sat, 1 Sep 2012 14:41:52 +0000 Subject: [PATCH] Resolves Issue 881 - Cause: r4593 git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4598 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/mob.dm | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 9e75c3e9d4e..b8910ba6065 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -665,26 +665,24 @@ note dizziness decrements automatically in the mob's Life() proc. /mob/Stat() ..() - if(!statpanel("Status")) //not looking at that panel - return + if(statpanel("Status")) //not looking at that panel - if(client && client.holder) - stat(null,"Location: \t ([x], [y], [z])") - stat(null,"CPU: \t [world.cpu]") + if(client && client.holder) + stat(null,"Location: \t ([x], [y], [z])") + stat(null,"CPU: \t [world.cpu]") - if(master_controller) - stat(null,"MasterController-[last_tick_duration] ([master_controller.processing?"On":"Off"]-[controller_iteration])") - stat(null,"Air-[master_controller.air_cost]\t Sun-[master_controller.sun_cost]") - stat(null,"Mob-[master_controller.mobs_cost]\t Dis-[master_controller.diseases_cost]") - stat(null,"Mch-[master_controller.machines_cost]\t Obj-[master_controller.objects_cost]") - stat(null,"Net-[master_controller.networks_cost]\t Pnet-[master_controller.powernets_cost]") - stat(null,"Tick-[master_controller.ticker_cost]\t ALL-[master_controller.total_cost]") - else - stat(null,"MasterController-ERROR") + if(master_controller) + stat(null,"MasterController-[last_tick_duration] ([master_controller.processing?"On":"Off"]-[controller_iteration])") + stat(null,"Air-[master_controller.air_cost]\t Sun-[master_controller.sun_cost]") + stat(null,"Mob-[master_controller.mobs_cost]\t Dis-[master_controller.diseases_cost]") + stat(null,"Mch-[master_controller.machines_cost]\t Obj-[master_controller.objects_cost]") + stat(null,"Net-[master_controller.networks_cost]\t Pnet-[master_controller.powernets_cost]") + stat(null,"Tick-[master_controller.ticker_cost]\t ALL-[master_controller.total_cost]") + else + stat(null,"MasterController-ERROR") - if (spell_list.len) - + if(spell_list.len) for(var/obj/effect/proc_holder/spell/S in spell_list) switch(S.charge_type) if("recharge")