cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 09:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes pointblank spacing + fire delay issues (#9059)

Browse Source 
* Fixes pointblank spacing + fire delay issues

* I hate comments
This commit is contained in:
Matt Atlas
2020-06-08 01:55:48 +02:00
committed by GitHub
parent 2cda98e2d0
commit 38c2f9cfbf
2 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
code/modules/projectiles/gun.dm
View File

@@ -265,7 +265,7 @@
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 = (burst - 1) * burst_delay
user.setClickCooldown(shoot_time)
user.setMoveCooldown(shoot_time)
next_fire_time = world.time + shoot_time
@@ -305,10 +305,9 @@
update_held_icon()
//update timing
var/delay = min(max(burst_delay+1, fire_delay), DEFAULT_QUICK_COOLDOWN)
if(delay)
user.setClickCooldown(delay)
next_fire_time = world.time + fire_delay
var/delay = max(burst_delay+1, fire_delay)
user.setClickCooldown(min(delay, DEFAULT_QUICK_COOLDOWN))
user.setMoveCooldown(move_delay)
// Similar to the above proc, but does not require a user, which is ideal for things like turrets.
/obj/item/gun/proc/Fire_userless(atom/target)
@@ -379,8 +378,8 @@
//called if there was no projectile to shoot
/obj/item/gun/proc/handle_click_empty(mob/user)
if (user)
user.visible_message("*click click*", span("danger","*click*"))
if(user)
to_chat(user, span("danger","*click*"))
else
src.visible_message("*click click*")
playsound(loc, 'sound/weapons/empty.ogg', 100, 1)
@@ -395,14 +394,14 @@
if(playemote)
if(reflex)
user.visible_message(
SPAN_DANGER("<b>\The [user] fires \the [src][pointblank ? " point blank at \the [target]" : ""] by reflex!</b>"),
SPAN_DANGER("You fire \the [src][pointblank ? " point blank at \the [target]" : ""] by reflex!"),
SPAN_DANGER("<b>\The [user] fires \the [src][pointblank ? " point blank at [target]" : ""] by reflex!</b>"),
SPAN_DANGER("You fire \the [src][pointblank ? " point blank at [target]" : ""] by reflex!"),
"You hear a [fire_sound_text]!"
)
else
user.visible_message(
SPAN_DANGER("\The [user] fires \the [src][pointblank ? " point blank at \the [target]" : ""]!"),
SPAN_DANGER("You fire \the [src][pointblank ? " point blank at \the [target]" : ""]!"),
SPAN_DANGER("\The [user] fires \the [src][pointblank ? " point blank at [target]" : ""]!"),
SPAN_DANGER("You fire \the [src][pointblank ? " point blank at [target]" : ""]!"),
"You hear a [fire_sound_text]!"
)