Energy weapons can be reloaded

This commit is contained in:
Anewbe
2016-10-06 21:17:40 -05:00
parent 62b02e8e05
commit 0f51fda83a
22 changed files with 218 additions and 141 deletions

View File

@@ -85,6 +85,8 @@
var/dna_lock = 0 //whether or not the gun is locked to dna
var/obj/item/dnalockingchip/attached_lock
var/last_shot = 0 //records the last shot fired
/obj/item/weapon/gun/New()
..()
for(var/i in 1 to firemodes.len)
@@ -274,6 +276,8 @@
target = targloc
pointblank = 0
last_shot = world.time
// We do this down here, so we don't get the message if we fire an empty gun.
if(requires_two_hands)
if(user.item_is_in_hands(src) && user.hands_are_full())
@@ -322,6 +326,8 @@
P.launch(target)
last_shot = world.time
if(silenced)
playsound(src, fire_sound, 10, 1)
else