From 19af747e4e88e1f10aae75aaf98133267e966a27 Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Mon, 6 Feb 2017 11:02:22 -0600 Subject: [PATCH 1/3] Adjusts targeting/hostage-taking to have a proper delay before shooting --- code/modules/projectiles/targeting/targeting_overlay.dm | 4 +++- code/modules/projectiles/targeting/targeting_triggers.dm | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/targeting/targeting_overlay.dm b/code/modules/projectiles/targeting/targeting_overlay.dm index 8c87751de7..2b882ed191 100644 --- a/code/modules/projectiles/targeting/targeting_overlay.dm +++ b/code/modules/projectiles/targeting/targeting_overlay.dm @@ -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 << "You are locked onto your target." + aiming_at << "The gun is trained on you!" update_icon() var/cancel_aim = 1 diff --git a/code/modules/projectiles/targeting/targeting_triggers.dm b/code/modules/projectiles/targeting/targeting_triggers.dm index 2544fae913..188440dcf6 100644 --- a/code/modules/projectiles/targeting/targeting_triggers.dm +++ b/code/modules/projectiles/targeting/targeting_triggers.dm @@ -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 From 9209047b4d35a757b529a67634e18fed9612bdbc Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Mon, 6 Feb 2017 11:06:52 -0600 Subject: [PATCH 2/3] Adds changelog --- html/changelogs/MagmaRam - Aimbot.yml | 36 +++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/MagmaRam - Aimbot.yml diff --git a/html/changelogs/MagmaRam - Aimbot.yml b/html/changelogs/MagmaRam - Aimbot.yml new file mode 100644 index 0000000000..dbe59cb09d --- /dev/null +++ b/html/changelogs/MagmaRam - Aimbot.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: MagmaRam + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "There is now a short delay before being able to fire when using hostage-taking mode, and a short delay between shots. This should make hostage mode useful for taking hostages and ambushes, rather than as an aimbot in actual firefights." From db5e832e28573bea342f8cd1b522dd5329c12fc3 Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Sat, 11 Feb 2017 20:05:22 -0600 Subject: [PATCH 3/3] Lock-on time is now 2.5 seconds. --- code/modules/projectiles/targeting/targeting_overlay.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/targeting/targeting_overlay.dm b/code/modules/projectiles/targeting/targeting_overlay.dm index 2b882ed191..2dcf0032be 100644 --- a/code/modules/projectiles/targeting/targeting_overlay.dm +++ b/code/modules/projectiles/targeting/targeting_overlay.dm @@ -178,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)