Merge pull request #294 from Tastyfish/master

added L & R to zone_sel hud thing, check antag call shuttle, marked datum call proc
This commit is contained in:
Albert Iordache
2012-01-19 11:01:04 -08:00
4 changed files with 10 additions and 3 deletions
+1
View File
@@ -22,6 +22,7 @@
if( ticker.mode.name == "blob" )
alert("You can't call the shuttle during blob!")
return
emergency_shuttle.fake_recall = 0 // allow admins to override gamemode
switch(href_list["call_shuttle"])
if("1")
if ((!( ticker ) || emergency_shuttle.location))
+8 -2
View File
@@ -133,7 +133,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
var/i
for(i=0; i<argNum; i++)
class = input("Type of Argument #[i]","Variable Type", "text") in list("text","num","type","reference","icon","file","cancel")
class = input("Type of Argument #[i]","Variable Type", "text") in list("text","num","type","reference","icon","file","marked datum","cancel")
switch(class)
if("cancel")
return
@@ -156,6 +156,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if("file")
argL.Add( input("Pick file:","File",null) as file )
if("marked datum")
argL.Add(holder.marked_datum)
usr << "\blue Calling '[procname]'"
returnval = call(procname)(arglist(argL))
@@ -182,7 +185,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
var/i
for(i=0; i<argNum; i++)
class = input("Type of Argument #[i]","Variable Type", "text") in list("text","num","type","reference","icon","file","cancel")
class = input("Type of Argument #[i]","Variable Type", "text") in list("text","num","type","reference","icon","file","marked datum","cancel")
switch(class)
if("cancel")
return
@@ -205,6 +208,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if("file")
argL.Add( input("Pick file:","File",null) as file )
if("marked datum")
argL.Add(holder.marked_datum)
usr << "\blue Calling '[procname]' on '[target]'"
returnval = call(target,procname)(arglist(argL))