Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

# Conflicts:
#	code/game/gamemodes/cult/runes.dm
This commit is contained in:
Markolie
2017-01-12 16:24:26 +01:00
25 changed files with 157 additions and 125 deletions
+2
View File
@@ -123,6 +123,8 @@
/obj/singularity/narsie/proc/acquire(var/mob/food)
if(food == target)
return
to_chat(target, "<span class='cultlarge'>[uppertext(ticker.mode.cultdat.entity_name)] HAS LOST INTEREST IN YOU</span>")
target = food
if(ishuman(target))