cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-19 14:42:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds checking on target to mob shoot_target proc.

Browse Source
This commit is contained in:
MistakeNot4892
2021-12-03 09:55:52 +11:00
parent a6c23c66b5
commit ee5dc0e2ec
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/simple_mob/combat.dm
View File

@@ -86,6 +86,10 @@
//The actual top-level ranged attack proc //The actual top-level ranged attack proc
/mob/living/simple_mob/proc/shoot_target(atom/A) /mob/living/simple_mob/proc/shoot_target(atom/A)
set waitfor = FALSE set waitfor = FALSE
if(!istype(A) || QDELETED(A))
return
setClickCooldown(get_attack_speed()) setClickCooldown(get_attack_speed())
face_atom(A) face_atom(A)

4
code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
View File

@@ -301,6 +301,10 @@
/mob/living/simple_mob/humanoid/merc/ranged/sniper/shoot_target(atom/A) /mob/living/simple_mob/humanoid/merc/ranged/sniper/shoot_target(atom/A)
set waitfor = FALSE set waitfor = FALSE
if(!istype(A) || QDELETED(A))
return
setClickCooldown(get_attack_speed()) setClickCooldown(get_attack_speed())
face_atom(A) face_atom(A)