cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/response_team.dm
	code/modules/hydroponics/spreading/spreading.dm
	code/modules/mob/dead/observer/observer.dm
This commit is contained in:
PsiOmega
2015-05-11 09:28:59 +02:00
parent f8e01fd564 2be2be05a2
commit d14904e1d6
16 changed files with 76 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client procs.dm
+11
View File
@@ -305,3 +305,14 @@
'icons/spideros_icons/sos_13.png',
'icons/spideros_icons/sos_14.png'
)
mob/proc/MayRespawn()
return 0
client/proc/MayRespawn()
if(mob)
return mob.MayRespawn()
// Something went wrong, client is usually kicked or transfered to a new mob at this point
return 0