shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3442 from Citadel-Station-13/upstream-merge-31757

Browse Source 
[MIRROR] Makes player-controlled minebots a target for ocular wardens
This commit is contained in:
LetterJay
2017-10-17 08:54:42 -04:00
committed by GitHub
parent af1f7ce8d0 0c39f2e091
commit 612f2eccc2
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm
+9 -4
View File
@@ -116,9 +116,9 @@
continue
if(ishostile(L))
var/mob/living/simple_animal/hostile/H = L
if(ismegafauna(H) || (!H.mind && H.AIStatus == AI_OFF))
if(("ratvar" in H.faction) || (!H.mind && "neutral" in H.faction))
continue
if(("ratvar" in H.faction) || ("neutral" in H.faction))
if(ismegafauna(H) || (!H.mind && H.AIStatus == AI_OFF))
continue
else if(isrevenant(L))
var/mob/living/simple_animal/revenant/R = L
@@ -127,10 +127,15 @@
else if(!L.mind)
continue
. += L
var/list/viewcache = list()
for(var/N in GLOB.mechas_list)
var/obj/mecha/M = N
if(get_dist(M, src) <= sight_range && M.occupant && !is_servant_of_ratvar(M.occupant) && (M in view(sight_range, src)))
. += M
if(get_dist(M, src) <= sight_range && M.occupant && !is_servant_of_ratvar(M.occupant))
if(!length(viewcache))
for (var/obj/Z in view(sight_range, src))
viewcache += Z
if (M in viewcache)
. += M
/obj/structure/destructible/clockwork/ocular_warden/proc/lose_target()
if(!target)