cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjusts targeting/hostage-taking to have a proper delay before shooting

Browse Source
This commit is contained in:
MagmaRam
2017-02-06 11:02:22 -06:00
parent 62d19de99f
commit 19af747e4e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,8 +107,10 @@ obj/aiming_overlay/proc/update_aiming_deferred()
cancel_aiming() cancel_aiming()
return return
if(!locked && lock_time >= world.time) if(!locked && lock_time <= world.time)
locked = 1 locked = 1
owner << "<span class ='notice'>You are locked onto your target.</span>"
aiming_at << "<span class='danger'>The gun is trained on you!</span>"
update_icon() update_icon()
var/cancel_aim = 1 var/cancel_aim = 1

2
code/modules/projectiles/targeting/targeting_triggers.dm
View File

@@ -27,3 +27,5 @@
var/obj/item/weapon/gun/G = aiming_with var/obj/item/weapon/gun/G = aiming_with
if(istype(G)) if(istype(G))
G.Fire(aiming_at, owner, reflex = 1) G.Fire(aiming_at, owner, reflex = 1)
locked = 0
lock_time = world.time+10