Merge pull request #1424 from Neerti/4/16/2016_aim_intent_changes

Aim Intent Changes

code/modules/projectiles/targeting/targeting_overlay.dm

@@ -23,6 +23,7 @@
 	owner = newowner
 	loc = null
 	verbs.Cut()
+	toggle_permission(TARGET_CAN_RADIO)
 
 /obj/aiming_overlay/proc/toggle_permission(var/perm)
 
@@ -202,6 +203,7 @@ obj/aiming_overlay/proc/update_aiming_deferred()
 		else
 			owner << "<span class='notice'>You will no longer aim rather than fire.</span>"
 			owner.client.remove_gun_icons()
+		owner.gun_setting_icon.icon_state = "gun[active]"
 
 /obj/aiming_overlay/proc/cancel_aiming(var/no_message = 0)
 	if(!aiming_with || !aiming_at)

code/modules/projectiles/targeting/targeting_triggers.dm

@@ -1,4 +1,8 @@
-/mob/living/proc/trigger_aiming(var/trigger_type)
+//as core click exists at the mob level
+/mob/proc/trigger_aiming(var/trigger_type)
+	return
+
+/mob/living/trigger_aiming(var/trigger_type)
 	if(!aimed.len)
 		return
 	for(var/obj/aiming_overlay/AO in aimed)
@@ -23,7 +27,3 @@
 	var/obj/item/weapon/gun/G = aiming_with
 	if(istype(G))
 		G.Fire(aiming_at, owner)
-
-/mob/living/ClickOn(var/atom/A, var/params)
-	. = ..()
-	trigger_aiming(TARGET_CAN_CLICK)