cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

check antag "call shuttle" overrides fake recall, can use marked datum as arg in the bs12 call proc command

Browse Source
This commit is contained in:
Tastyfish
2012-01-19 01:19:58 -05:00
parent 0365700f21
commit 1be9c4cfed
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/admin/admin.dm
View File

@@ -22,6 +22,7 @@
if( ticker.mode.name == "blob" ) if( ticker.mode.name == "blob" )
alert("You can't call the shuttle during blob!") alert("You can't call the shuttle during blob!")
return return
emergency_shuttle.fake_recall = 0 // allow admins to override gamemode
switch(href_list["call_shuttle"]) switch(href_list["call_shuttle"])
if("1") if("1")
if ((!( ticker ) || emergency_shuttle.location)) if ((!( ticker ) || emergency_shuttle.location))

10
code/modules/admin/verbs/debug.dm
View File

@@ -133,7 +133,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
var/i var/i
for(i=0; i<argNum; 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) switch(class)
if("cancel") if("cancel")
return return
@@ -156,6 +156,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if("file") if("file")
argL.Add( input("Pick file:","File",null) as file ) argL.Add( input("Pick file:","File",null) as file )
if("marked datum")
argL.Add(usr.client.holder.marked_datum)
usr << "\blue Calling '[procname]'" usr << "\blue Calling '[procname]'"
returnval = call(procname)(arglist(argL)) 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 var/i
for(i=0; i<argNum; 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) switch(class)
if("cancel") if("cancel")
return return
@@ -205,6 +208,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if("file") if("file")
argL.Add( input("Pick file:","File",null) as file ) argL.Add( input("Pick file:","File",null) as file )
if("marked datum")
argL.Add(usr.client.holder.marked_datum)
usr << "\blue Calling '[procname]' on '[target]'" usr << "\blue Calling '[procname]' on '[target]'"
returnval = call(target,procname)(arglist(argL)) returnval = call(target,procname)(arglist(argL))