shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5129 from Citadel-Station-13/upstream-merge-34969

Browse Source 
[MIRROR] Fixes marooned status.
This commit is contained in:
LetterJay
2018-01-27 14:17:55 -06:00
committed by GitHub
parent f5c7bcea78 fd852a0595
commit 434449724e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/roundend.dm
+1 -1
View File
@@ -292,7 +292,7 @@
if(M.mind && !isnewplayer(M))
if(M.stat != DEAD && !isbrain(M))
if(EMERGENCY_ESCAPED_OR_ENDGAMED)
if(!M.onCentCom() || !M.onSyndieBase())
if(!M.onCentCom() && !M.onSyndieBase())
parts += "<div class='panel stationborder'>"
parts += "<span class='marooned'>You managed to survive, but were marooned on [station_name()]...</span>"
else