Merge pull request #33414 from kevinz000/DAMNIT_DEATHRIDE_WHY_WHY_WHY_IM_SALTY_REEEEEEEEEEEEE

[READY]Fixes beam rifles and flightsuits
This commit is contained in:
oranges
2017-12-11 10:18:45 +13:00
committed by CitadelStationBot
parent d82698d106
commit 30143ee601
5 changed files with 53 additions and 41 deletions
+1 -1
View File
@@ -358,8 +358,8 @@
if(lastfire > world.time + delay)
return
lastfire = world.time
. = ..()
stop_aiming()
return ..()
/obj/item/gun/energy/beam_rifle/proc/sync_ammo()
for(var/obj/item/ammo_casing/energy/beam_rifle/AC in contents)