cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into protean-rework

Browse Source
This commit is contained in:
BlackMajor
2023-02-23 14:31:09 +13:00
parent 38fd6c9307 0905d37574
commit 2cf320e897
310 changed files with 144992 additions and 152112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/ai/ai_holder_targeting.dm
View File

@@ -70,10 +70,10 @@
// Step 4, give us our selected target.
/datum/ai_holder/proc/give_target(new_target, urgent = FALSE)
ai_log("give_target() : Given '[new_target]', urgent=[urgent].", AI_LOG_TRACE)
if(target)
remove_target()
target = new_target
if(target != null)
@@ -282,7 +282,7 @@
// Checks to see if an atom attacked us lately
/datum/ai_holder/proc/check_attacker(var/atom/movable/A)
return (A in attackers)
return (A.name in attackers)
// We were attacked by this thing recently
/datum/ai_holder/proc/add_attacker(var/atom/movable/A)