diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index d7bfbbb0c03..1e1ec2624d6 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -480,9 +480,12 @@ if(istype(target.loc, /obj/structure/closet) || istype(target.loc, /obj/machinery/disposal) || istype(target.loc, /obj/machinery/sleeper) || istype(target.loc, /obj/machinery/bodyscanner) || istype(target.loc, /obj/machinery/recharge_station)) var/atom/A = target.loc Goto(A,move_to_delay,minimum_distance) + if(ranged && ranged_cooldown <= world.time) + OpenFire(A) + return TRUE if(A.Adjacent(targets_from)) A.attack_animal(src) - return 1 + return TRUE /mob/living/simple_animal/hostile/RangedAttack(atom/A, params) //Player firing if(ranged && ranged_cooldown <= world.time) diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm b/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm index 21233ac89e4..763314f704d 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm @@ -21,6 +21,7 @@ attacktext = "punches" attack_sound = 'sound/weapons/punch1.ogg' a_intent = INTENT_HARM + stat_attack = UNCONSCIOUS unsuitable_atmos_damage = 15 faction = list("syndicate") check_friendly_fire = TRUE @@ -103,7 +104,6 @@ name = "Syndicate Operative" force_threshold = 6 // Prevents people using punches to bypass eshield robust_searching = TRUE // Together with stat_attack, ensures dionae/etc that regen are killed properly - stat_attack = UNCONSCIOUS universal_speak = TRUE icon_state = "syndicate_swordonly" icon_living = "syndicate_swordonly"