From 4eb5e9b6d0924f0bb297955b7bdc6be2a0ed5b8f Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 23 Oct 2017 12:11:11 -0500 Subject: [PATCH] Can't aim at invisible things --- .../targeting/targeting_overlay.dm | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/code/modules/projectiles/targeting/targeting_overlay.dm b/code/modules/projectiles/targeting/targeting_overlay.dm index 9e399c10de3..00a380dedf0 100644 --- a/code/modules/projectiles/targeting/targeting_overlay.dm +++ b/code/modules/projectiles/targeting/targeting_overlay.dm @@ -74,7 +74,7 @@ owner << "[aiming_at ? "\The [aiming_at] is" : "Your targets are"] [message]." if(aiming_at) - aiming_at << "You are [message]." + to_chat(aiming_at, "You are [message].") /obj/aiming_overlay/process() if(!owner) @@ -109,25 +109,25 @@ obj/aiming_overlay/proc/update_aiming_deferred() if(!locked && lock_time <= world.time) locked = 1 - owner << "You are locked onto your target." - aiming_at << "The gun is trained on you!" + to_chat(owner, "You are locked onto your target.") + to_chat(aiming_at, "The gun is trained on you!") update_icon() var/cancel_aim = 1 var/mob/living/carbon/human/H = owner if(!(aiming_with in owner) || (istype(H) && !H.item_is_in_hands(aiming_with))) - owner << "You must keep hold of your weapon!" + to_chat(owner, "You must keep hold of your weapon!") else if(owner.eye_blind) - owner << "You are blind and cannot see your target!" + to_chat(owner, "You are blind and cannot see your target!") else if(!aiming_at || !istype(aiming_at.loc, /turf)) - owner << "You have lost sight of your target!" + to_chat(owner, "You have lost sight of your target!") else if(owner.incapacitated() || owner.lying || owner.restrained()) - owner << "You must be conscious and standing to keep track of your target!" - else if(aiming_at.alpha == 0 || (aiming_at.invisibility > owner.see_invisible)) - owner << "Your target has become invisible!" + to_chat(owner, "You must be conscious and standing to keep track of your target!") + else if(aiming_at.alpha <= 50 || (aiming_at.invisibility > owner.see_invisible)) + to_chat(owner, "Your target has become invisible!") else if(get_dist(get_turf(owner), get_turf(aiming_at)) > 7) // !(owner in viewers(aiming_at, 7)) - owner << "Your target is too far away to track!" + to_chat(owner, "Your target is too far away to track!") else cancel_aim = 0 @@ -147,13 +147,16 @@ obj/aiming_overlay/proc/update_aiming_deferred() return if(owner.incapacitated()) - owner << "You cannot aim a gun in your current state." + to_chat(owner, "You cannot aim a gun in your current state.") return if(owner.lying) - owner << "You cannot aim a gun while prone." + to_chat(owner, "You cannot aim a gun while prone.") return if(owner.restrained()) - owner << "You cannot aim a gun while handcuffed." + to_chat(owner, "You cannot aim a gun while handcuffed.") + return + if(target.alpha <= 50) + to_chat(owner, "You cannot aim at something you cannot see.") return if(aiming_at) @@ -167,7 +170,7 @@ obj/aiming_overlay/proc/update_aiming_deferred() if(owner.client) owner.client.add_gun_icons() - target << "You now have a gun pointed at you. No sudden moves!" + to_chat(target, "You now have a gun pointed at you. No sudden moves!") aiming_with = thing aiming_at = target if(istype(aiming_with, /obj/item/weapon/gun)) @@ -200,10 +203,10 @@ obj/aiming_overlay/proc/update_aiming_deferred() if(owner.client) if(active) - owner << "You will now aim rather than fire." + to_chat(owner, "You will now aim rather than fire.") owner.client.add_gun_icons() else - owner << "You will no longer aim rather than fire." + to_chat(owner, "You will no longer aim rather than fire.") owner.client.remove_gun_icons() owner.gun_setting_icon.icon_state = "gun[active]"