cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2996 from MagmaRam/gunshow

Browse Source 
Lock-on changes
This commit is contained in:
Anewbe
2017-02-14 17:00:28 -06:00
committed by GitHub
parent 95a670e562 db5e832e28
commit fae79a7f80
3 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,8 +107,10 @@ obj/aiming_overlay/proc/update_aiming_deferred()
cancel_aiming()
return
if(!locked && lock_time >= world.time)
if(!locked && lock_time <= world.time)
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()
var/cancel_aim = 1
@@ -176,7 +178,7 @@ obj/aiming_overlay/proc/update_aiming_deferred()
toggle_active(1)
locked = 0
update_icon()
lock_time = world.time + 35
lock_time = world.time + 25
/obj/aiming_overlay/update_icon()
if(locked)

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

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