cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update beam_rifle.dm

Browse Source
This commit is contained in:
LetterJay
2017-10-16 06:14:24 -05:00
committed by GitHub
parent ee70d961d7
commit 3c0c5db5d9
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/projectiles/guns/beam_rifle.dm
View File

@@ -38,11 +38,7 @@
var/aiming_time = 12
var/aiming_time_fire_threshold = 5
var/aiming_time_left = 12
<<<<<<< HEAD
var/aiming_time_increase_user_movement = 6
=======
var/aiming_time_increase_user_movement = 3
>>>>>>> 64851d8... Moves projectile processing to a subsystem (#30599)
var/scoped_slow = 1
var/aiming_time_increase_angle_multiplier = 0.3
var/last_process = 0
@@ -253,15 +249,9 @@
return
check_user()
handle_zooming()
<<<<<<< HEAD
aiming_time_left = min(0, aiming_time_left - (world.time - lastprocess))
aiming_beam(TRUE)
lastprocess = world.time
=======
aiming_time_left = max(0, aiming_time_left - (world.time - last_process))
aiming_beam(TRUE)
last_process = world.time
>>>>>>> 64851d8... Moves projectile processing to a subsystem (#30599)
/obj/item/gun/energy/beam_rifle/proc/check_user(automatic_cleanup = TRUE)
if(!istype(current_user) || !isturf(current_user.loc) || !(src in current_user.held_items) || current_user.incapacitated()) //Doesn't work if you're not holding it!