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

Conflicts:
	.travis.yml
This commit is contained in:
PsiOmega
2015-09-13 10:52:01 +02:00
7 changed files with 28 additions and 26 deletions
@@ -141,6 +141,8 @@ Works together with spawning an observer, noted above.
var/client/C = U.client
for(var/mob/living/carbon/human/target in target_list)
C.images += target.hud_list[SPECIALROLE_HUD]
for(var/mob/living/silicon/target in target_list)
C.images += target.hud_list[SPECIALROLE_HUD]
return 1
/mob/proc/ghostize(var/can_reenter_corpse = 1)