From 157c899df133b2d8f06f5b5ed347ed7d97d003e9 Mon Sep 17 00:00:00 2001 From: Geeves Date: Mon, 28 Sep 2020 13:35:45 +0200 Subject: [PATCH] Full Auto Fire Fix (#10091) --- code/modules/projectiles/gun.dm | 4 ++-- html/changelogs/geeves-full_auto_fire_fix.yml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/geeves-full_auto_fire_fix.yml diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index e65e98369b8..9ee92532d5b 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -297,11 +297,11 @@ return FALSE if(world.time < next_fire_time) - if (world.time % 3) //to prevent spam + if(world.time % 3 && !can_autofire) //to prevent spam to_chat(user, SPAN_WARNING("\The [src] is not ready to fire again!")) return FALSE - var/shoot_time = (burst - 1) * burst_delay + var/shoot_time = max((burst - 1) * burst_delay, burst_delay) user.setClickCooldown(shoot_time) user.setMoveCooldown(shoot_time) next_fire_time = world.time + shoot_time diff --git a/html/changelogs/geeves-full_auto_fire_fix.yml b/html/changelogs/geeves-full_auto_fire_fix.yml new file mode 100644 index 00000000000..671b02b4f22 --- /dev/null +++ b/html/changelogs/geeves-full_auto_fire_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fixed there not being a delay when full auto firing a gun." \ No newline at end of file