cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolves Issue 881 - Cause: r4593

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4598 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
elly1989@rocketmail.com
2012-09-01 14:41:52 +00:00
parent 0decd596f6
commit 618b4fbf50
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
code/modules/mob/mob.dm
View File

@@ -665,26 +665,24 @@ note dizziness decrements automatically in the mob's Life() proc.
/mob/Stat() /mob/Stat()
..() ..()
if(!statpanel("Status")) //not looking at that panel if(statpanel("Status")) //not looking at that panel
return
if(client && client.holder) if(client && client.holder)
stat(null,"Location: \t ([x], [y], [z])") stat(null,"Location: \t ([x], [y], [z])")
stat(null,"CPU: \t [world.cpu]") stat(null,"CPU: \t [world.cpu]")
if(master_controller) if(master_controller)
stat(null,"MasterController-[last_tick_duration] ([master_controller.processing?"On":"Off"]-[controller_iteration])") 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,"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,"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,"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,"Net-[master_controller.networks_cost]\t Pnet-[master_controller.powernets_cost]")
stat(null,"Tick-[master_controller.ticker_cost]\t ALL-[master_controller.total_cost]") stat(null,"Tick-[master_controller.ticker_cost]\t ALL-[master_controller.total_cost]")
else else
stat(null,"MasterController-ERROR") stat(null,"MasterController-ERROR")
if (spell_list.len) if(spell_list.len)
for(var/obj/effect/proc_holder/spell/S in spell_list) for(var/obj/effect/proc_holder/spell/S in spell_list)
switch(S.charge_type) switch(S.charge_type)
if("recharge") if("recharge")