Merge branch 'master' of https://github.com/tgstation/-tg-station into FixGib

Conflicts:
	code/modules/mob/living/death.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
This commit is contained in:
phil235
2016-04-30 12:30:36 +02:00
247 changed files with 68739 additions and 2284 deletions
+1 -1
View File
@@ -462,7 +462,7 @@ var/list/admin_verbs_hideable = list(
holder.fakekey = new_key
createStealthKey()
if(isobserver(mob))
mob.invisibility = INVISIBILITY_MAXIMUM + 1 //JUST IN CASE
mob.invisibility = INVISIBILITY_ABSTRACT //JUST IN CASE
mob.alpha = 0 //JUUUUST IN CASE
mob.name = " "
mob.mouse_opacity = 0