cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 08:11:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3535 from CHOMPStation2/upstream-merge-12026

Browse Source 
[MIRROR] [MIRROR] Adds checking on target to mob shoot_target proc.
This commit is contained in:
Nadyr
2022-01-09 20:11:45 -05:00
committed by GitHub
parent 79d354647b 1f515607c4
commit 8365029d00
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_mob/combat.dm
+4
View File
@@ -86,6 +86,10 @@
//The actual top-level ranged attack proc
/mob/living/simple_mob/proc/shoot_target(atom/A)
set waitfor = FALSE
if(!istype(A) || QDELETED(A))
return
setClickCooldown(get_attack_speed())
face_atom(A)
code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
+4
View File
@@ -304,6 +304,10 @@
/mob/living/simple_mob/humanoid/merc/ranged/sniper/shoot_target(atom/A)
set waitfor = FALSE
if(!istype(A) || QDELETED(A))
return
setClickCooldown(get_attack_speed())
face_atom(A)