From 472ef6165fc31d38c474fbf9edea1ab9692d8b22 Mon Sep 17 00:00:00 2001 From: lolman360 Date: Tue, 11 Aug 2020 18:52:26 +1000 Subject: [PATCH 1/3] imamurderer --- code/modules/projectiles/boxes_magazines/_box_magazine.dm | 4 ++++ code/modules/projectiles/boxes_magazines/ammo_boxes.dm | 2 ++ 2 files changed, 6 insertions(+) diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index 9ea030da99..05afeae897 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -20,6 +20,7 @@ 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 @@ -79,6 +80,9 @@ if(!can_load(user)) return if(istype(A, /obj/item/ammo_box)) + if(load_delay) + if(!do_after(user, load_delay, target = src)) + return var/obj/item/ammo_box/AM = A for(var/obj/item/ammo_casing/AC in AM.stored_ammo) var/did_load = give_round(AC, replace_spent) diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index 987efc0404..7ede4507da 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -148,6 +148,8 @@ max_ammo = 4 var/pixeloffsetx = 4 start_empty = TRUE + multiload = FALSE + load_delay = 2 //2ds /obj/item/ammo_box/shotgun/update_overlays() . = ..() From 8c70b56706eb3974f5161c1efc63ec781fa0e639 Mon Sep 17 00:00:00 2001 From: lolman360 Date: Tue, 11 Aug 2020 19:04:59 +1000 Subject: [PATCH 2/3] whoops --- .../boxes_magazines/_box_magazine.dm | 17 ++++++++--------- .../projectiles/boxes_magazines/ammo_boxes.dm | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index 05afeae897..ff78780104 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -80,17 +80,16 @@ if(!can_load(user)) return if(istype(A, /obj/item/ammo_box)) - if(load_delay) - if(!do_after(user, load_delay, target = src)) - return + var/obj/item/ammo_box/AM = A for(var/obj/item/ammo_casing/AC in AM.stored_ammo) - var/did_load = give_round(AC, replace_spent) - if(did_load) - AM.stored_ammo -= AC - num_loaded++ - if(!did_load || !multiload) - break + 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 if(istype(A, /obj/item/ammo_casing)) var/obj/item/ammo_casing/AC = A if(give_round(AC, replace_spent)) diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index 7ede4507da..0d9183d1a4 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -149,7 +149,7 @@ var/pixeloffsetx = 4 start_empty = TRUE multiload = FALSE - load_delay = 2 //2ds + load_delay = 6 //6ds /obj/item/ammo_box/shotgun/update_overlays() . = ..() From 3aba9eb5a67c2686d6db86e9fcb05cd5997acb6d Mon Sep 17 00:00:00 2001 From: lolman360 Date: Wed, 12 Aug 2020 15:11:55 +1000 Subject: [PATCH 3/3] kee --- code/modules/projectiles/boxes_magazines/_box_magazine.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index ff78780104..d0d846c144 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -76,11 +76,12 @@ 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))