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

This commit is contained in:
PsiOmegaDelta
2015-07-21 14:25:46 +02:00

View File

@@ -61,7 +61,8 @@
/mob/living/simple_animal/hostile/retaliate/goat/Retaliate()
..()
src.visible_message("\red [src] gets an evil-looking gleam in their eye.")
if(stat == CONSCIOUS)
visible_message("<span class='warning'>[src] gets an evil-looking gleam in their eye.</span>")
/mob/living/simple_animal/hostile/retaliate/goat/Move()
..()