cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-16 09:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1742 from Markolie/ghosties

Browse Source 
Ghost/admin ghost machinery interaction
This commit is contained in:
Fox-McCloud
2015-08-15 15:16:10 -04:00
parent 46b8c18de0 0b3f58b5d9
commit 1e88bc6712
36 changed files with 545 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/computer3/computers/communications.dm
+8 -2
View File
@@ -129,7 +129,10 @@
if(!computer.radio.subspace)
return
if(authenticated)
call_shuttle_proc(usr)
var/input = stripped_input(usr, "Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","") as text|null
if(!input || ..(href, href_list) || !authenticated)
return
call_shuttle_proc(usr, input)
if(emergency_shuttle.online())
post_status("shuttle")
state = STATE_DEFAULT
@@ -236,7 +239,10 @@
if("ai-callshuttle2" in href_list)
if(!computer.radio.subspace)
return
call_shuttle_proc(usr)
var/input = stripped_input(usr, "Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","") as text|null
if(!input || ..(href, href_list))
return
call_shuttle_proc(usr, input)
aistate = STATE_DEFAULT
if("ai-messagelist" in href_list)
aicurrmsg = 0