Merge pull request #1322 from Citadel-Station-13/upstream-merge-27877
[MIRROR] Advanced proccall now supports /proc/PROCNAME
This commit is contained in:
@@ -52,7 +52,20 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
|
|||||||
if(!procname)
|
if(!procname)
|
||||||
return
|
return
|
||||||
|
|
||||||
if(targetselected && !hascall(target,procname))
|
//hascall() doesn't support proc paths (eg: /proc/gib(), it only supports "gib")
|
||||||
|
var/testname = procname
|
||||||
|
if(targetselected)
|
||||||
|
//Find one of the 3 possible ways they could have written /proc/PROCNAME
|
||||||
|
if(findtext(procname, "/proc/"))
|
||||||
|
testname = replacetext(procname, "/proc/", "")
|
||||||
|
else if(findtext(procname, "/proc"))
|
||||||
|
testname = replacetext(procname, "/proc", "")
|
||||||
|
else if(findtext(procname, "proc/"))
|
||||||
|
testname = replacetext(procname, "proc/", "")
|
||||||
|
//Clear out any parenthesis if they're a dummy
|
||||||
|
testname = replacetext(testname, "()", "")
|
||||||
|
|
||||||
|
if(targetselected && !hascall(target,testname))
|
||||||
to_chat(usr, "<font color='red'>Error: callproc(): type [target.type] has no proc named [procname].</font>")
|
to_chat(usr, "<font color='red'>Error: callproc(): type [target.type] has no proc named [procname].</font>")
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user