cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/setup.dm
This commit is contained in:
PsiOmega
2015-06-07 10:30:27 +02:00
parent 2e920bce69 ddc1f888dd
commit fbc4bfbe9c
7 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/observer/observer.dm
+2 -2
View File
@@ -670,9 +670,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
client.images -= ghostimage //remove ourself
mob/dead/observer/MayRespawn(var/feedback = 0)
if(!client || !mind)
if(!client)
return 0
if(mind.current && mind.current.stat != DEAD)
if(mind && mind.current && mind.current.stat != DEAD)
if(feedback)
src << "<span class='warning'>Your non-dead body prevent you from respawning.</span>"
return 0