cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-10 07:41:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Watcher hatchlings will no longer shoot whatever the parent is buckled to, or anyone buckled to the parent (#95422)

Browse Source
This commit is contained in:
Lucy
2026-03-18 02:12:53 -04:00
committed by GitHub
parent 1a192327cb
commit db69ae5db2
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapfluff/ruins/lavalandruin_code/watcher_grave.dm
+10 -3
View File
@@ -147,7 +147,7 @@
pixel_y = 22
alpha = 0
/// Who are we following?
var/atom/parent
var/atom/movable/parent
/// Datum which keeps us hanging out with our parent
var/datum/movement_detector/tracker
/// Type of projectile we fire
@@ -184,15 +184,22 @@
for (var/mob/living/potential_target in oview(5, src))
if (!ismining(potential_target) || potential_target.stat == DEAD)
continue
if (!potential_target.has_faction(target_faction))
if (!potential_target.has_faction(target_faction) || parent.has_ally(potential_target))
continue
shoot_at(potential_target)
return
/// Take a shot
/obj/effect/watcher_orbiter/proc/shoot_at(atom/target)
var/list/ignore_targets = list(parent)
if(isliving(parent))
var/mob/living/living_parent = parent
if(LAZYLEN(living_parent.buckled_mobs))
ignore_targets += living_parent.buckled_mobs
if(living_parent.buckled)
ignore_targets += living_parent.buckled
COOLDOWN_START(src, shot_cooldown, fire_delay)
fire_projectile(projectile_type, target, projectile_sound, ignore_targets = list(parent))
fire_projectile(projectile_type, target, projectile_sound, ignore_targets = ignore_targets)
/// Set ourselves up to track and orbit around a guy
/obj/effect/watcher_orbiter/proc/follow(atom/movable/target)