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

Fix Space Carp trying to go into portals for no reason (#90679)

Browse Source
This commit is contained in:
Jacquerel
2025-04-29 18:28:51 -06:00
committed by Shadow-Quill
parent 1dbe3038de
commit 894ce4b17b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/space_fauna/carp/carp_abilities.dm
+1
View File
@@ -137,6 +137,7 @@
if (isliving(entered_atom))
var/mob/living/teleported_mob = entered_atom
teleported_mob.changeNext_move(disorient_time)
teleported_mob.ai_controller?.CancelActions()
var/turf/destination = pick(exit_locs)
do_teleport(entered_atom, destination, channel = TELEPORT_CHANNEL_MAGIC)
code/modules/mob/living/basic/space_fauna/carp/carp_ai_rift_actions.dm
+2 -2
View File
@@ -201,7 +201,7 @@
if (!exit_count)
continue
var/turf/rift_exit = rift.exit_locs[exit_count]
if (get_dist(rift_exit, target) >= distance_to_target)
if ((get_dist(rift_exit, target) + get_dist(rift, target)) >= distance_to_target)
continue
controller.queue_behavior(/datum/ai_behavior/travel_towards_atom, get_turf(rift))
controller.queue_behavior(/datum/ai_behavior/travel_towards_atom, rift)
return SUBTREE_RETURN_FINISH_PLANNING