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

This commit is contained in:
Steelpoint
2015-01-13 12:52:24 +08:00
53 changed files with 612 additions and 256 deletions
+1 -1
View File
@@ -684,7 +684,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction" || ticker.mode.name == "confliction")
var/choice = input("The shuttle will just return if you call it. Call anyway?") in list("Confirm", "Cancel")
if(choice == "Confirm")
SSshuttle.emergencyFakeRecall = rand(0.5,0.9)
SSshuttle.emergencyFakeRecall = rand(5,9) * 0.1
else
return