Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	html/changelogs/.all_changelog.yml
This commit is contained in:
PsiOmegaDelta
2015-08-17 09:44:21 +02:00
32 changed files with 687 additions and 649 deletions
@@ -189,7 +189,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/Stat()
..()
if(statpanel("Status"))
stat(null, "Station Time: [worldtime2text()]")
if(emergency_shuttle)
var/eta_status = emergency_shuttle.get_status_panel_eta()
if(eta_status)