Merge branch 'master' into upstream-merge-29611

2017-08-15 18:55:12 -05:00
parent cc7ad81f79 c818168298
commit ab27b63cf9
246 changed files with 3752 additions and 1365 deletions
@@ -479,7 +479,7 @@ SUBSYSTEM_DEF(ticker)
 					var/list/area/shuttle_areas
 					if(SSshuttle && SSshuttle.emergency)
 						shuttle_areas = SSshuttle.emergency.shuttle_areas
-					if(!Player.onCentcom() && !Player.onSyndieBase())
+					if(!Player.onCentCom() && !Player.onSyndieBase())
 						to_chat(Player, "<font color='blue'><b>You managed to survive, but were marooned on [station_name()]...</b></FONT>")
 					else
 						num_escapees++