Merge pull request #9696 from Incoming5643/why_cant_we_be_friends

Escape alone joint greentext + escaping on the nuke op shuttle
This commit is contained in:
Cheridan
2015-06-05 17:16:11 -05:00
7 changed files with 30 additions and 6 deletions
+1 -1
View File
@@ -337,7 +337,7 @@ var/datum/subsystem/ticker/ticker
if(Player.stat != DEAD && !isbrain(Player))
num_survivors++
if(station_evacuated) //If the shuttle has already left the station
if(!Player.onCentcom())
if(!Player.onCentcom() && !Player.onSyndieBase())
Player << "<font color='blue'><b>You managed to survive, but were marooned on [station_name()]...</b></FONT>"
else
num_escapees++