cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 06:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Identity theft objective set fix, tank examine fix, proccall null return fix

Browse Source
This commit is contained in:
Markolie
2016-10-21 17:51:38 +02:00
parent 7173a8fe9f
commit 1a307cd8c9
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/mind.dm
+1 -1
View File
@@ -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)
code/game/objects/items/weapons/tanks/tanks.dm
+5
View File
@@ -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
code/modules/admin/verbs/debug.dm
+2 -2
View File
@@ -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!