cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 17:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7401 from PsiOmegaDelta/YouHaveViolatedTheLaw

Browse Source 
Fixes Officer Beepsky wrecking targets he cannot see.
This commit is contained in:
Zuhayr
2014-12-13 05:16:45 +10:30
parent 45c79a0ed7 8fdf4c7031
commit a0192f47df
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/machinery/bots/secbot.dm
View File

@@ -643,6 +643,9 @@ Auto Patrol: []"},
return
src.anchored = 0
for(var/mob/living/M in view(search_range,src)) //Let's find us a criminal
if(M.invisibility >= INVISIBILITY_LEVEL_ONE) // Cannot see him. see_invisible is a mob-var
continue
if(istype(M, /mob/living/carbon))
var/mob/living/carbon/C = M
if(C.stat || C.handcuffed)

9
code/game/machinery/portable_turret.dm
View File

@@ -348,7 +348,7 @@
spawn()
sleep(60)
attacked = 0
..()
if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
@@ -445,6 +445,9 @@
secondarytargets += L
/obj/machinery/porta_turret/proc/assess_living(var/mob/living/L)
if(L.invisibility >= INVISIBILITY_LEVEL_ONE) // Cannot see him. see_invisible is a mob-var
return TURRET_NOT_TARGET
if(!L)
return TURRET_NOT_TARGET
@@ -464,7 +467,7 @@
if(check_synth) //If it's set to attack all non-silicons, target them!
if(L.lying)
return TURRET_SECONDARY_TARGET
return lethal ? TURRET_SECONDARY_TARGET : TURRET_NOT_TARGET
return TURRET_PRIORITY_TARGET
if(iscuffed(L)) // If the target is handcuffed, leave it alone
@@ -480,7 +483,7 @@
return TURRET_NOT_TARGET //if threat level < 4, keep going
if(L.lying) //if the perp is lying down, it's still a target but a less-important target
return TURRET_SECONDARY_TARGET
return lethal ? TURRET_SECONDARY_TARGET : TURRET_NOT_TARGET
return TURRET_PRIORITY_TARGET //if the perp has passed all previous tests, congrats, it is now a "shoot-me!" nominee