From a947775f2e12e452828df18cac144bd76a2bd2e9 Mon Sep 17 00:00:00 2001 From: ESwordTheCat Date: Sat, 5 Apr 2014 06:23:51 +0800 Subject: [PATCH] Add missing lens. Conflicts: code/modules/mob/mob.dm --- code/modules/mob/mob.dm | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 4d3539afc09..af989fb0577 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -801,26 +801,29 @@ var/list/slot_equipment_priority = list( \ /mob/Stat() ..() - if(statpanel("Status")) //not looking at that panel + if(client && client.holder) - if(client && client.holder) - stat(null,"Location:\t([x], [y], [z])") - stat(null,"CPU:\t[world.cpu]") - stat(null,"Instances:\t[world.contents.len]") + if(statpanel("Status")) //not looking at that panel + stat(null, "Location:\t([x], [y], [z])") + stat(null, "CPU:\t[world.cpu]") + stat(null, "Instances:\t[world.contents.len]") if(master_controller) - stat(null,"MasterController-[last_tick_duration] ([master_controller.processing?"On":"Off"]-[controller_iteration])") - stat(null,"Air-[master_controller.air_cost]\tSun-[master_controller.sun_cost]") - stat(null,"Mob-[master_controller.mobs_cost]\t#[mob_list.len]") - stat(null,"Dis-[master_controller.diseases_cost]\t#[active_diseases.len]") - stat(null,"Mch-[master_controller.machines_cost]\t#[machines.len]") - stat(null,"Obj-[master_controller.objects_cost]\t#[processing_objects.len]") - stat(null,"Net-[master_controller.networks_cost]\tPnet-[master_controller.powernets_cost]") - stat(null,"NanoUI-[master_controller.nano_cost]\t#[nanomanager.processing_uis.len]") - stat(null,"GC-[master_controller.gc_cost]\t#[garbage.queue.len]") - stat(null,"Tick-[master_controller.ticker_cost]\tALL-[master_controller.total_cost]") + stat(null, "MasterController-[last_tick_duration] ([master_controller.processing?"On":"Off"]-[controller_iteration])") + stat(null, "Air-[master_controller.air_cost]") + stat(null, "Sun-[master_controller.sun_cost]") + stat(null, "Mob-[master_controller.mobs_cost]\t#[mob_list.len]") + stat(null, "Dis-[master_controller.diseases_cost]\t#[active_diseases.len]") + stat(null, "Mch-[master_controller.machines_cost]\t#[machines.len]") + stat(null, "Obj-[master_controller.objects_cost]\t#[processing_objects.len]") + stat(null, "PiNet-[master_controller.networks_cost]\t#[pipe_networks.len]") + stat(null, "Ponet-[master_controller.powernets_cost]\t#[powernets.len]") + stat(null, "NanoUI-[master_controller.nano_cost]\t#[nanomanager.processing_uis.len]") + stat(null, "GC-[master_controller.gc_cost]\t#[garbage.queue.len]") + stat(null, "Tick-[master_controller.ticker_cost]") + stat(null, "ALL-[master_controller.total_cost]") else - stat(null,"MasterController-ERROR") + stat(null, "MasterController-ERROR") if(listed_turf && client) if(get_dist(listed_turf,src) > 1) @@ -1192,3 +1195,4 @@ mob/proc/yank_out_object() else usr << "You are not dead or you have given up your right to be respawned!" return +