cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #8550

Browse Source
This commit is contained in:
Chinsky
2015-04-13 06:41:58 +03:00
parent d39cc9686d
commit d6d005db6a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/projectiles/targeting.dm
View File

@@ -47,7 +47,7 @@
/obj/item/weapon/gun/proc/PreFire(atom/A as mob|obj|turf|area, mob/living/user as mob|obj, params) /obj/item/weapon/gun/proc/PreFire(atom/A as mob|obj|turf|area, mob/living/user as mob|obj, params)
//Lets not spam it. //Lets not spam it.
if(lock_time > world.time - 2) return if(lock_time > world.time - 2) return
user.set_dir(get_cardinal_dir(src, A)) user.set_dir(get_cardinal_dir(src, A))
if(isliving(A) && !(A in aim_targets)) if(isliving(A) && !(A in aim_targets))
Aim(A) //Clicked a mob, aim at them Aim(A) //Clicked a mob, aim at them
@@ -58,7 +58,7 @@
if(isliving(M) && (M in view(user)) && !(M in aim_targets)) if(isliving(M) && (M in view(user)) && !(M in aim_targets))
Aim(M) //Aha! Aim at them! Aim(M) //Aha! Aim at them!
return 1 return 1
return 0 return 0
//Aiming at the target mob. //Aiming at the target mob.
@@ -83,12 +83,12 @@
if(src != M.equipped()) if(src != M.equipped())
stop_aim() stop_aim()
return return
//reflex firing is disabled when help intent is set //reflex firing is disabled when help intent is set
if (M.a_intent == "help") if (M.a_intent == "help")
M << "\red You refrain from firing your [src] as your intent is set to help." M << "\red You refrain from firing your [src] as your intent is set to help."
return return
M.last_move_intent = world.time M.last_move_intent = world.time
var/firing_check = can_hit(T,usr) //0 if it cannot hit them, 1 if it is capable of hitting, and 2 if a special check is preventing it from firing. var/firing_check = can_hit(T,usr) //0 if it cannot hit them, 1 if it is capable of hitting, and 2 if a special check is preventing it from firing.
if(firing_check > 0) if(firing_check > 0)
@@ -194,7 +194,7 @@
else else
I.lower_aim() I.lower_aim()
return return
if(m_intent == "run" && T.client.target_can_move == 1 && T.client.target_can_run == 0) if(iscarbon(src) && m_intent == "run" && T.client.target_can_move == 1 && T.client.target_can_run == 0)
src << "\red Your move intent is now set to walk, as your targeter permits it." //Self explanitory. src << "\red Your move intent is now set to walk, as your targeter permits it." //Self explanitory.
set_m_intent("walk") set_m_intent("walk")