cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 22:12:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Various Simple Mob Fixes (#11618)

Browse Source
This commit is contained in:
Geeves
2021-04-08 12:13:07 -03:00
committed by GitHub
parent 44222f1cc8
commit b87eb96ca0
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/hostile.dm
+4
View File
@@ -175,6 +175,8 @@ mob/living/simple_animal/hostile/hitby(atom/movable/AM as mob|obj,var/speed = TH
setClickCooldown(attack_delay)
if(!Adjacent(target_mob))
return
if(!canmove)
return
if(!see_target())
LoseTarget()
for(var/grab in grabbed_by)
@@ -210,6 +212,8 @@ mob/living/simple_animal/hostile/hitby(atom/movable/AM as mob|obj,var/speed = TH
/mob/living/simple_animal/hostile/proc/PostAttack(var/atom/target)
if(stat)
return
if(!isturf(loc)) // no teleporting out of lockers
return
for(var/grab in grabbed_by)
var/obj/item/grab/G = grab
if(G.state >= GRAB_AGGRESSIVE)