From 1a307cd8c9fd8c04b2fa085293e6ee01d81ef383 Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Fri, 21 Oct 2016 17:51:38 +0200
Subject: [PATCH] Identity theft objective set fix, tank examine fix, proccall
 null return fix

---
 code/datums/mind.dm                            | 2 +-
 code/game/objects/items/weapons/tanks/tanks.dm | 5 +++++
 code/modules/admin/verbs/debug.dm              | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index b21cd769fb1..50595bb23a6 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -589,7 +589,7 @@
 				var/list/possible_targets = list("Free objective")
 				for(var/datum/mind/possible_target in ticker.minds)
 					if((possible_target != src) && istype(possible_target.current, /mob/living/carbon/human))
-						possible_targets += possible_target.current
+						possible_targets += possible_target
 
 				var/new_target = input("Select target:", "Objective target") as null|anything in possible_targets
 				if(!new_target)
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 87e8d52db54..ae28bd61d17 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -84,6 +84,11 @@
 	var/obj/icon = src
 	if(istype(loc, /obj/item/assembly))
 		icon = loc
+		
+	if(!in_range(src, user))
+		if(icon == src)
+			to_chat(user, "<span class='notice'>It's \a [bicon(icon)][src]! If you want any more information you'll need to get closer.</span>")
+		return
 
 	var/celsius_temperature = air_contents.temperature-T0C
 	var/descriptive
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 227188b2209..37ff565f4a3 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -92,7 +92,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			log_admin("[key_name(src)] called [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]")
 			returnval = call(procname)(arglist(lst)) // Pass the lst as an argument list to the proc
 
-		to_chat(usr, "<font color='blue'>[procname] returned: [returnval ? returnval : "null"]</font>")
+		to_chat(usr, "<font color='blue'>[procname] returned: [!isnull(returnval) ? returnval : "null"]</font>")
 		feedback_add_details("admin_verb","APC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/callproc_datum(var/A as null|area|mob|obj|turf)
@@ -122,7 +122,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 
 	spawn()
 		var/returnval = call(A,procname)(arglist(lst)) // Pass the lst as an argument list to the proc
-		to_chat(usr, "<span class='notice'>[procname] returned: [returnval ? returnval : "null"]</span>")
+		to_chat(usr, "<span class='notice'>[procname] returned: [!isnull(returnval) ? returnval : "null"]</span>")
 
 	feedback_add_details("admin_verb","DPC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!