cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14171 from AnturK/bang

Browse Source 
Simple mob fixes
This commit is contained in:
tkdrg
2015-12-31 18:40:42 -03:00
parent 70ba1a24f5 b875ab18cf
commit 82c53c4474
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/mob/living/simple_animal/hostile/hostile.dm
View File

@@ -155,6 +155,9 @@
if(ranged)//We ranged? Shoot at em
if(target_distance >= 2 && ranged_cooldown <= 0)//But make sure they're a tile away at least, and our range attack is off cooldown
OpenFire(target)
if(!Process_Spacemove()) // Drifting
walk(src,0)
return 1
if(retreat_distance != null)//If we have a retreat distance, check if we need to run from our target
if(target_distance <= retreat_distance)//If target's closer than our retreat distance, run
walk_away(src,target,retreat_distance,move_to_delay)
@@ -320,4 +323,4 @@
. = 0
/mob/living/simple_animal/hostile/proc/AIShouldSleep(var/list/possible_targets)
return !FindTarget(possible_targets, 1)
return !FindTarget(possible_targets, 1)

12
code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
View File

@@ -217,12 +217,16 @@
minimum_distance = 3
pass_flags = PASSTABLE
loot = list(/obj/item/organ/internal/hivelord_core)
var/next_brood = 0
var/brood_cooldown = 20
/mob/living/simple_animal/hostile/asteroid/hivelord/OpenFire(the_target)
var/mob/living/simple_animal/hostile/asteroid/hivelordbrood/A = new /mob/living/simple_animal/hostile/asteroid/hivelordbrood(src.loc)
A.GiveTarget(target)
A.friends = friends
A.faction = faction
if(world.time >= next_brood)
var/mob/living/simple_animal/hostile/asteroid/hivelordbrood/A = new /mob/living/simple_animal/hostile/asteroid/hivelordbrood(src.loc)
A.GiveTarget(target)
A.friends = friends
A.faction = faction
next_brood = world.time + brood_cooldown
return
/mob/living/simple_animal/hostile/asteroid/hivelord/AttackingTarget()