Merge pull request #696 from Citadel-Station-13/upstream-merge-25458

[MIRROR] Belligerent now prevents you from running even between chants
This commit is contained in:
kevinz000
2017-05-07 23:19:35 -07:00
committed by GitHub
9 changed files with 60 additions and 17 deletions
@@ -77,7 +77,7 @@
if(!prey && LAZYLEN(meals))
prey = pick(meals)
to_chat(prey, "<span class='heavy_brass'><font size=5>\"You will do, heretic.\"</font></span>\n\
<span class='userdanger'You feel something massive turn its crushing focus to you...</span>")
<span class='userdanger'>You feel something massive turn its crushing focus to you...</span>")
prey << 'sound/effects/ratvar_reveal.ogg'
else
if((!istype(prey, /obj/singularity/narsie) && prob(10) && LAZYLEN(meals) > 1) || prey.z != z || !(prey in meals))