From fd0f845868066be0427ad7115d041435808d7553 Mon Sep 17 00:00:00 2001 From: "n3ophyt3@gmail.com" Date: Fri, 28 Jan 2011 03:59:54 +0000 Subject: [PATCH] git-svn-id: http://tgstation13.googlecode.com/svn/trunk@923 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/Chemistry-Tools.dm | 12 ++++++------ code/modules/mob/dead/observer/observer.dm | 13 +++++++------ code/modules/mob/living/carbon/human/human.dm | 5 +++-- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index ee057ef9b7c..d8d4f833e4b 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -266,10 +266,10 @@ O.show_message(text("\red [] was hit by the syringe!", M), 1) del(D) - - for(var/atom/A in D.loc) - if(A == user) continue - if(A.density) del(D) + if(D) + for(var/atom/A in D.loc) + if(A == user) continue + if(A.density) del(D) sleep(1) @@ -355,7 +355,7 @@ w_class = 1 var/amount_per_transfer_from_this = 5 var/possible_transfer_amounts = list(5,10,25) - + verb/set_APTFT() //set amount_per_transfer_from_this set name = "Set transfer amount" set src in range(0) @@ -714,7 +714,7 @@ user << "\blue You inject [M] with the hypospray." M << "\red You feel a tiny prick!" src.reagents.reaction(M, INGEST) - if(M.reagents) + if(M.reagents) var/trans = reagents.trans_to(M, amount_per_transfer_from_this) user << "\blue [trans] units injected. [reagents.total_volume] units remaining in the hypospray." return diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index c2025d14aca..97506f9a2dc 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -44,12 +44,13 @@ ..() statpanel("Status") if (src.client.statpanel == "Status") - if(ticker.mode) - //world << "DEBUG: ticker not null" - if(ticker.mode.name == "AI malfunction") - //world << "DEBUG: malf mode ticker test" - if(ticker.mode:malf_mode_declared) - stat(null, "Time left: [max(ticker.mode:AI_win_timeleft/(ticker.mode:apcs/3), 0)]") + if(ticker) + if(ticker.mode) + //world << "DEBUG: ticker not null" + if(ticker.mode.name == "AI malfunction") + //world << "DEBUG: malf mode ticker test" + if(ticker.mode:malf_mode_declared) + stat(null, "Time left: [max(ticker.mode:AI_win_timeleft/(ticker.mode:apcs/3), 0)]") if(emergency_shuttle) if(emergency_shuttle.online && emergency_shuttle.location < 2) var/timeleft = emergency_shuttle.timeleft() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 39984f49f81..979f00ee518 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -177,8 +177,9 @@ stat("Internal Atmosphere Info", src.internal.name) stat("Tank Pressure", src.internal.air_contents.return_pressure()) stat("Distribution Pressure", src.internal.distribute_pressure) - if (src.mind.special_role == "Changeling") - stat("Chemical Storage", src.chem_charges) + if (src.mind) + if (src.mind.special_role == "Changeling") + stat("Chemical Storage", src.chem_charges) /mob/living/carbon/human/bullet_act(flag, A as obj)