cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 08:01:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
skull132
2017-01-23 15:52:13 -05:00
parent 02d6d1932b a4763014b9
commit b20032ea25
15 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,9 +16,6 @@
if(!owner.canClick())
return
owner.setClickCooldown(5) // Spam prevention, essentially.
if(owner.a_intent == I_HELP)
owner << "<span class='warning'>You refrain from firing \the [aiming_with] as your intent is set to help.</span>"
return
owner.visible_message("<span class='danger'>\The [owner] pulls the trigger reflexively!</span>")
var/obj/item/weapon/gun/G = aiming_with
if(istype(G))