cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-28 09:52:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12656 from VOREStation/upstream-merge-8494

Browse Source 
[MIRROR] Fixes runtime with turrets and viscerators
This commit is contained in:
Casey
2022-04-05 20:17:16 -04:00
committed by GitHub
parent 096fe78f41 eb26ddfb9e
commit a01915aba9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm
View File

@@ -57,14 +57,14 @@
// Used for a special grenade, to ensure they don't attack the wrong thing.
/mob/living/simple_mob/mechanical/viscerator/mercenary/IIsAlly(mob/living/L)
. = ..()
if(!.) // Not friendly, see if they're a baddie first.
if(!. && isliving(L)) // Not friendly, see if they're a baddie first.
if(L.mind && mercs.is_antagonist(L.mind))
return TRUE
// Similar to above but for raiders.
/mob/living/simple_mob/mechanical/viscerator/raider/IIsAlly(mob/living/L)
. = ..()
if(!.) // Not friendly, see if they're a baddie first.
if(!. && isliving(L)) // Not friendly, see if they're a baddie first.
if(L.mind && raiders.is_antagonist(L.mind))
return TRUE
@@ -83,7 +83,7 @@
/mob/living/simple_mob/mechanical/viscerator/station/IIsAlly(mob/living/L)
. = ..()
if(!.)
if(!. && isliving(L))
if(isrobot(L)) // They ignore synths.
return TRUE
if(istype(L, /mob/living/simple_mob/mechanical/ward/monitor/crew)) // Also ignore friendly monitor wards
@@ -97,4 +97,4 @@
movement_cooldown = 0.5
/decl/mob_organ_names/viscerator
hit_zones = list("chassis", "rotor blades", "sensor array")
hit_zones = list("chassis", "rotor blades", "sensor array")