This commit is contained in:
KorPhaeron
2016-01-03 02:58:32 -06:00
parent 6adbd8972f
commit 03a39b9542
3 changed files with 8 additions and 6 deletions
@@ -116,11 +116,7 @@
return 1
if(isliving(the_target))
var/mob/living/L = the_target
var/faction_check = 0
for(var/F in faction)
if(F in L.faction)
faction_check = 1
break
var/faction_check = faction_check(L)
if(robust_searching)
if(L.stat > stat_attack || L.stat != stat_attack && stat_exclusive == 1)
return 0
@@ -87,7 +87,7 @@
if(grasping.len < max_grasps)
for(var/mob/living/L in range(grasp_range,src))
if(L == src)
if(L == src || faction_check(L))
continue
if(!(L in grasping) && L != target && prob(grasp_chance))
L << "<span class='userdanger'>\the [src] has you entangled!</span>"
+6
View File
@@ -976,3 +976,9 @@ var/next_mob_id = 0
//Can the mob use Topic to interact with machines
/mob/proc/canUseTopic()
return
/mob/proc/faction_check(mob/target)
for(var/F in faction)
if(F in target.faction)
return 1
return 0