cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-09-24 10:13:01 -04:00
parent ae8d35f963 5fdb6d3618
commit b308ee9d78
313 changed files with 6548 additions and 4624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/ai/basic_mobs/basic_ai_behaviors/targeting.dm
+2 -2
View File
@@ -91,7 +91,7 @@ GLOBAL_LIST_INIT(target_interested_atoms, typecacheof(list(/mob, /obj/machinery/
/datum/ai_behavior/find_potential_targets/proc/new_turf_found(turf/found, datum/ai_controller/controller, datum/targeting_strategy/strategy)
var/valid_found = FALSE
var/mob/pawn = controller.pawn
for(var/maybe_target as anything in found)
for(var/maybe_target in found)
if(maybe_target == pawn)
continue
if(!is_type_in_typecache(maybe_target, GLOB.target_interested_atoms))
@@ -120,7 +120,7 @@ GLOBAL_LIST_INIT(target_interested_atoms, typecacheof(list(/mob, /obj/machinery/
/datum/ai_behavior/find_potential_targets/proc/new_atoms_found(list/atom/movable/found, datum/ai_controller/controller, target_key, datum/targeting_strategy/strategy, hiding_location_key)
var/mob/pawn = controller.pawn
var/list/accepted_targets = list()
for(var/maybe_target as anything in found)
for(var/maybe_target in found)
if(maybe_target == pawn)
continue
// Need to better handle viewers here
code/datums/ai/basic_mobs/targeting_strategies/basic_targeting_strategy.dm
+1 -1
View File
@@ -97,7 +97,7 @@
if (!length(required_traits))
return TRUE
for (var/trait as anything in required_traits)
for (var/trait in required_traits)
if (HAS_TRAIT(the_target, trait))
return TRUE
return FALSE