Merge pull request #11810 from PsiOmegaDelta/151229-PolarisDev

Polaris Fixes
This commit is contained in:
GinjaNinja32
2015-12-29 18:28:01 +00:00
2 changed files with 24 additions and 15 deletions

View File

@@ -112,7 +112,8 @@ obj/aiming_overlay/proc/update_aiming_deferred()
update_icon()
var/cancel_aim = 1
if(!(aiming_with in owner) || (owner.l_hand != aiming_with && owner.r_hand != aiming_with))
if(!(aiming_with in owner) || (istype(owner, /mob/living/carbon/human) && (owner.l_hand != aiming_with && owner.r_hand != aiming_with)))
owner << "<span class='warning'>You must keep hold of your weapon!</span>"
else if(!aiming_at || !istype(aiming_at.loc, /turf))
owner << "<span class='warning'>You have lost sight of your target!</span>"