Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TG Mirror] Fixes CI failure from AttackingTarget not passing the attacked_target in its args [MDB IGNORE] #123

Merged
merged 1 commit into from
Oct 18, 2023
Merged

[TG Mirror] Fixes CI failure from AttackingTarget not passing the attacked_target in its args [MDB IGNORE] #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/mob/living/basic/jungle/venus_human_trap.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
* Akin to certain spiders, venus human traps can also be possessed and controlled by ghosts.
*
*/

/mob/living/basic/venus_human_trap
name = "venus human trap"
desc = "Now you know how the fly feels."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/hostile/alien.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
. = ..()
AddElement(/datum/element/cleaning)

/mob/living/simple_animal/hostile/alien/maid/AttackingTarget()
/mob/living/simple_animal/hostile/alien/maid/AttackingTarget(atom/attacked_target)
if(ismovable(target))
target.wash(CLEAN_SCRUB)
if(istype(target, /obj/effect/decal/cleanable))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/hostile/constructs/wraith.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/// The seconds refunded when putting a target into critical
var/crit_refund = 5 SECONDS

/mob/living/simple_animal/hostile/construct/wraith/AttackingTarget() //refund jaunt cooldown when attacking living targets
/mob/living/simple_animal/hostile/construct/wraith/AttackingTarget(atom/attacked_target) //refund jaunt cooldown when attacking living targets
var/prev_stat
var/mob/living/living_target = target

Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/simple_animal/hostile/hostile.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,14 +314,14 @@
for(var/i in 1 to rapid_melee)
addtimer(cb, (i - 1)*delay)
else
AttackingTarget()
AttackingTarget(target)
if(patience)
GainPatience()

/mob/living/simple_animal/hostile/proc/CheckAndAttack()
var/atom/target_from = GET_TARGETS_FROM(src)
if(target && isturf(target_from.loc) && target.Adjacent(target_from) && !incapacitated())
AttackingTarget()
AttackingTarget(target)

/mob/living/simple_animal/hostile/proc/MoveToTarget(list/possible_targets)//Step 5, handle movement between us and our target
stop_automated_movement = 1
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
if(hop_cooldown <= world.time)
Hop(player_hop = TRUE)

/mob/living/simple_animal/hostile/jungle/leaper/AttackingTarget()
/mob/living/simple_animal/hostile/jungle/leaper/AttackingTarget(atom/attacked_target)
if(isliving(target))
return
return ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@

return ..()

/mob/living/simple_animal/hostile/megafauna/AttackingTarget()
/mob/living/simple_animal/hostile/megafauna/AttackingTarget(atom/attacked_target)
if(recovery_time >= world.time)
return
. = ..()
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Difficulty: Medium
return FALSE
return ..()

/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/AttackingTarget()
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/AttackingTarget(atom/attacked_target)
if(QDELETED(target))
return
face_atom(target)
Expand Down Expand Up @@ -185,7 +185,7 @@ Difficulty: Medium
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/guidance
guidance = TRUE

/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/hunter/AttackingTarget()
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/hunter/AttackingTarget(atom/attacked_target)
. = ..()
if(. && prob(12))
INVOKE_ASYNC(dash, TYPE_PROC_REF(/datum/action, Trigger), target)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ Difficulty: Hard
if(!(flags_1 & ADMIN_SPAWNED_1))
SSshuttle.shuttle_purchase_requirements_met[SHUTTLE_UNLOCK_BUBBLEGUM] = TRUE

/mob/living/simple_animal/hostile/megafauna/bubblegum/AttackingTarget()
/mob/living/simple_animal/hostile/megafauna/bubblegum/AttackingTarget(atom/attacked_target)
. = ..()
if(.)
recovery_time = world.time + 20 // can only attack melee once every 2 seconds but rapid_melee gives higher priority
Expand Down Expand Up @@ -348,7 +348,7 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/OpenFire()
return

/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/AttackingTarget()
/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/AttackingTarget(atom/attacked_target)
return

/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/try_bloodattack()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
return
return ..()

/mob/living/simple_animal/hostile/megafauna/dragon/AttackingTarget()
/mob/living/simple_animal/hostile/megafauna/dragon/AttackingTarget(atom/attacked_target)
if(!swooping)
return ..()

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ Difficulty: Hard
wander = TRUE
did_reset = FALSE

/mob/living/simple_animal/hostile/megafauna/hierophant/AttackingTarget()
/mob/living/simple_animal/hostile/megafauna/hierophant/AttackingTarget(atom/attacked_target)
if(!blinking)
if(target && isliving(target))
var/mob/living/L = target
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@


///In addition to parent functionality, this will also turn the target into a small legion if they are unconscious.
/mob/living/simple_animal/hostile/megafauna/legion/AttackingTarget()
/mob/living/simple_animal/hostile/megafauna/legion/AttackingTarget(atom/attacked_target)
. = ..()
if(!. || !ishuman(target))
return
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/simple_animal/hostile/mimic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
if(.)
trigger()

/mob/living/simple_animal/hostile/mimic/crate/AttackingTarget()
/mob/living/simple_animal/hostile/mimic/crate/AttackingTarget(atom/attacked_target)
. = ..()
if(.)
icon_state = initial(icon_state)
Expand Down Expand Up @@ -184,7 +184,7 @@ GLOBAL_LIST_INIT(animatable_blacklist, list(/obj/structure/table, /obj/structure
if(destroy_objects)
..()

/mob/living/simple_animal/hostile/mimic/copy/AttackingTarget()
/mob/living/simple_animal/hostile/mimic/copy/AttackingTarget(atom/attacked_target)
. = ..()
if(knockdown_people && . && prob(15) && iscarbon(target))
var/mob/living/carbon/C = target
Expand Down Expand Up @@ -303,7 +303,7 @@ GLOBAL_LIST_INIT(animatable_blacklist, list(/obj/structure/table, /obj/structure
lock = new
lock.Grant(src)

/mob/living/simple_animal/hostile/mimic/xenobio/AttackingTarget()
/mob/living/simple_animal/hostile/mimic/xenobio/AttackingTarget(atom/attacked_target)
if(src == target)
toggle_open()
return
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
attack_action.Grant(src)

//Prevents elites from attacking members of their faction (can't hurt themselves either) and lets them mine rock with an attack despite not being able to smash walls.
/mob/living/simple_animal/hostile/asteroid/elite/AttackingTarget()
/mob/living/simple_animal/hostile/asteroid/elite/AttackingTarget(atom/attacked_target)
if(ishostile(target))
var/mob/living/simple_animal/hostile/M = target
if(faction_check_atom(M))
Expand Down
2 changes: 2 additions & 0 deletions code/modules/mob/living/simple_animal/hostile/ooze.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@

///Tries to transfer the atoms reagents then delete it
/mob/living/simple_animal/hostile/ooze/proc/eat_atom(atom/eat_target, silent)
if(isnull(eat_target))
return
if(SEND_SIGNAL(eat_target, COMSIG_OOZE_EAT_ATOM, src, edible_food_types) & COMPONENT_ATOM_EATEN)
return
if(silent || !isitem(eat_target)) //Don't bother reporting it for everything
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/hostile/zombie.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
. = ..()
apply_dynamic_human_appearance(src, outfit, /datum/species/zombie, bloody_slots = ITEM_SLOT_OCLOTHING)

/mob/living/simple_animal/hostile/zombie/AttackingTarget()
/mob/living/simple_animal/hostile/zombie/AttackingTarget(atom/attacked_target)
. = ..()
if(. && ishuman(target) && prob(infection_chance))
try_to_zombie_infect(target)
Expand Down
Loading