Merge pull request #13287 from Citadel-Station-13/revert-13122-haha
Reverts load delays because it's still a problem and by god am I just done at this point
This commit is contained in:
@@ -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,19 +75,12 @@
|
||||
return 1
|
||||
|
||||
/obj/item/ammo_box/attackby(obj/item/A, mob/user, params, silent = FALSE, replace_spent = 0)
|
||||
if(INTERACTING_WITH(user, src) || INTERACTING_WITH(user, A))
|
||||
to_chat(user, "<span class='notice'>You're already doing that!</span>")
|
||||
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 || AM.load_delay)
|
||||
var/loadtime = max(AM.load_delay, load_delay)
|
||||
if(!do_after(user, loadtime, target = src))
|
||||
return FALSE
|
||||
var/did_load = give_round(AC, replace_spent)
|
||||
if(did_load)
|
||||
AM.stored_ammo -= AC
|
||||
|
||||
@@ -156,8 +156,6 @@
|
||||
max_ammo = 4
|
||||
var/pixeloffsetx = 4
|
||||
start_empty = TRUE
|
||||
multiload = FALSE
|
||||
load_delay = 6 //6ds
|
||||
|
||||
/obj/item/ammo_box/shotgun/update_overlays()
|
||||
. = ..()
|
||||
|
||||
@@ -53,8 +53,6 @@
|
||||
..()
|
||||
if (istype(A, /obj/item/ammo_box/magazine))
|
||||
var/obj/item/ammo_box/magazine/AM = A
|
||||
if(AM.load_delay && !do_after(user, AM.load_delay, target = src))
|
||||
return FALSE
|
||||
if (!magazine && istype(AM, mag_type))
|
||||
if(user.transferItemToLoc(AM, src))
|
||||
magazine = AM
|
||||
|
||||
Reference in New Issue
Block a user