cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into DisplacedGirderFix

Browse Source 
Conflicts:
	code/modules/recycling/disposal.dm
This commit is contained in:
phil235
2014-10-15 18:23:40 +02:00
parent dbea503e88 3e30a7fbab
commit 45cfe07f98
405 changed files with 10867 additions and 8837 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/shuttle_controller.dm
+1 -1
View File
@@ -137,7 +137,7 @@ var/global/datum/shuttle_controller/emergency_shuttle/emergency_shuttle
if(!online && direction == 1) //we don't call the shuttle if it's already coming
incall(SHUTTLEAUTOCALLTIMER) //X minutes! If they want to recall, they have X-(X-5) minutes to do so
log_game("All the communications consoles were destroyed and all AIs are inactive. Shuttle called.")
message_admins("All the communications consoles were destroyed and all AIs are inactive. Shuttle called.", 1)
message_admins("All the communications consoles were destroyed and all AIs are inactive. Shuttle called.")
/datum/shuttle_controller/proc/move_shuttles()
var/datum/shuttle_manager/s