Merge conflic fix

This commit is contained in:
MrStonedOne
2016-01-03 14:51:14 -08:00
249 changed files with 4185 additions and 3732 deletions
+5
View File
@@ -71,6 +71,11 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if(targetselected && !hascall(target,procname))
usr << "<font color='red'>Error: callproc(): target has no such call [procname].</font>"
return
else
var/procpath = text2path(procname)
if (!procpath)
usr << "<font color='red'>Error: callproc(): proc [procname] does not exist. (Did you forget the /proc/ part?)</font>"
return
var/list/lst = get_callproc_args()
if(!lst)
return