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

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/projectiles/targeting.dm
This commit is contained in:
GinjaNinja32
2015-04-13 12:49:07 +01:00
parent f205ce4327 6cf08526bc
commit d4eb42b38b
7 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,7 +195,7 @@
else
I.lower_aim()
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 << "<span class='danger'>Your move intent is now set to walk, as your targeter permits it.</span>" //Self explanitory.
set_m_intent("walk")
@@ -406,4 +406,4 @@ client/verb/AllowTargetRun()
if(target_can_radio)
M << "Your character may now <b>use the radio</b> at the discretion of their targeter."
else
M << "<span class='danger'><b>Your character will now be shot if they use the radio.</b></span>"
M << "<span class='danger'><b>Your character will now be shot if they use the radio.</b></span>"