cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hostile mobs no longer target logged out players. (#16200)

Browse Source 
* Hostile mobs no longer target logged out players.

* ffs

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2023-04-14 22:21:36 +00:00
committed by GitHub
co-authored by Matt Atlas
parent 8c474f304e
commit 6e45e5620d
2 changed files with 50 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
+9 -1
View File
@@ -70,6 +70,10 @@
for (var/atom/A in targets)
if(A == src)
continue
if(ismob(A)) //Don't target mobs with keys that have logged out.
var/mob/M = A
if(M.key && !M.client)
continue
if(!isturf(A.loc))
A = A.loc
var/datum/callback/cb = null
@@ -121,7 +125,7 @@
target_mob = user
change_stance(HOSTILE_STANCE_ATTACK)
mob/living/simple_animal/hostile/hitby(atom/movable/AM as mob|obj,var/speed = THROWFORCE_SPEED_DIVISOR)//Standardization and logging -Sieve
/mob/living/simple_animal/hostile/hitby(atom/movable/AM as mob|obj,var/speed = THROWFORCE_SPEED_DIVISOR)//Standardization and logging -Sieve
..()
if(istype(AM,/obj/))
var/obj/O = AM
@@ -170,6 +174,10 @@ mob/living/simple_animal/hostile/hitby(atom/movable/AM as mob|obj,var/speed = TH
if(QDELETED(target_mob) || SA_attackable(target_mob))
LoseTarget()
return 0
if(ismob(target_mob)) //target_mob is not in fact always a mob
if(target_mob.key && !target_mob.client)
LoseTarget()
return 0
if(!(target_mob in targets))
LoseTarget()
return 0