Revert "load_delay var for /obj/item/ammo_box, nerfs shotgun stripper clips (hatter why'd you pr them)"

This commit is contained in:
silicons
2020-08-17 20:20:04 -07:00
committed by GitHub
parent 20648fc1bb
commit 50eca19658
2 changed files with 6 additions and 12 deletions
@@ -20,7 +20,6 @@
var/caliber
var/multiload = 1
var/start_empty = 0
var/load_delay = 0 //how long do we take to load (deciseconds)
var/list/bullet_cost
var/list/base_cost// override this one as well if you override bullet_cost
@@ -76,21 +75,18 @@
return 1
/obj/item/ammo_box/attackby(obj/item/A, mob/user, params, silent = FALSE, replace_spent = 0)
if(INTERACTING_WITH(user, A))
return FALSE
var/num_loaded = 0
if(!can_load(user))
return
if(istype(A, /obj/item/ammo_box))
var/obj/item/ammo_box/AM = A
for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
if(load_delay && do_after(user, load_delay, target = src))
var/did_load = give_round(AC, replace_spent)
if(did_load)
AM.stored_ammo -= AC
num_loaded++
if(!did_load || !multiload)
break
var/did_load = give_round(AC, replace_spent)
if(did_load)
AM.stored_ammo -= AC
num_loaded++
if(!did_load || !multiload)
break
if(istype(A, /obj/item/ammo_casing))
var/obj/item/ammo_casing/AC = A
if(give_round(AC, replace_spent))
@@ -153,8 +153,6 @@
max_ammo = 4
var/pixeloffsetx = 4
start_empty = TRUE
multiload = FALSE
load_delay = 6 //6ds
/obj/item/ammo_box/shotgun/update_overlays()
. = ..()