From 2d1edc9fa2beea45c93065dd06848329986cf5e9 Mon Sep 17 00:00:00 2001 From: lolman360 <22850904+lolman360@users.noreply.github.com> Date: Tue, 18 Aug 2020 13:30:49 +1000 Subject: [PATCH 1/7] Update _box_magazine.dm --- .../projectiles/boxes_magazines/_box_magazine.dm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index d0d846c144..24372ded7e 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -84,13 +84,15 @@ 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 + if(load_delay) + if(!do_after(user, load_delay, target = src)) + return FALSE + 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)) From 8027706bea95ddebcc9d799b8d5db8d8ea6f50a6 Mon Sep 17 00:00:00 2001 From: lolman360 <22850904+lolman360@users.noreply.github.com> Date: Tue, 18 Aug 2020 13:45:44 +1000 Subject: [PATCH 2/7] Update _box_magazine.dm --- 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 24372ded7e..cea40dc27e 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -85,7 +85,8 @@ var/obj/item/ammo_box/AM = A for(var/obj/item/ammo_casing/AC in AM.stored_ammo) if(load_delay) - if(!do_after(user, load_delay, target = src)) + if(do_after(user, load_delay, target = src)) + else return FALSE var/did_load = give_round(AC, replace_spent) if(did_load) From 6f21b23a87450b83a13677b49ad07758d8b37d35 Mon Sep 17 00:00:00 2001 From: lolman360 Date: Tue, 18 Aug 2020 14:28:57 +1000 Subject: [PATCH 4/7] Fixes Shit. --- .../projectiles/boxes_magazines/_box_magazine.dm | 10 +++++++--- code/modules/projectiles/guns/ballistic.dm | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index cea40dc27e..c99508cda5 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -76,7 +76,8 @@ return 1 /obj/item/ammo_box/attackby(obj/item/A, mob/user, params, silent = FALSE, replace_spent = 0) - if(INTERACTING_WITH(user, A)) + if(INTERACTING_WITH(user, src) || INTERACTING_WITH(user, A)) + to_chat(user, "You're already doing that!") return FALSE var/num_loaded = 0 if(!can_load(user)) @@ -84,8 +85,11 @@ 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) - if(do_after(user, load_delay, target = src)) + if(load_delay || AM.load_delay) + var/loadtime = load_delay + if(AM.load_delay > load_delay) + loadtime = AM.load_delay + if(do_after(user, loadtime, target = src)) else return FALSE var/did_load = give_round(AC, replace_spent) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index fa8099a257..22e53e83f0 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -53,6 +53,10 @@ ..() if (istype(A, /obj/item/ammo_box/magazine)) var/obj/item/ammo_box/magazine/AM = A + if(AM.load_delay) + if(do_after(user, AM.load_delay, target = src)) + else + return FALSE if (!magazine && istype(AM, mag_type)) if(user.transferItemToLoc(AM, src)) magazine = AM From a7a964154e324169003f639233617acf9d4d6713 Mon Sep 17 00:00:00 2001 From: lolman360 <22850904+lolman360@users.noreply.github.com> Date: Wed, 19 Aug 2020 12:02:34 +1000 Subject: [PATCH 5/7] Update code/modules/projectiles/boxes_magazines/_box_magazine.dm Co-authored-by: silicons <2003111+silicons@users.noreply.github.com> --- code/modules/projectiles/boxes_magazines/_box_magazine.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index c99508cda5..2406b09c45 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -89,8 +89,7 @@ var/loadtime = load_delay if(AM.load_delay > load_delay) loadtime = AM.load_delay - if(do_after(user, loadtime, target = src)) - else + if(!do_after(user, loadtime, target = src)) return FALSE var/did_load = give_round(AC, replace_spent) if(did_load) From 09bba250508cc219796032fba5b50afa38e4eade Mon Sep 17 00:00:00 2001 From: lolman360 <22850904+lolman360@users.noreply.github.com> Date: Wed, 19 Aug 2020 12:02:45 +1000 Subject: [PATCH 6/7] Update code/modules/projectiles/boxes_magazines/_box_magazine.dm Co-authored-by: silicons <2003111+silicons@users.noreply.github.com> --- code/modules/projectiles/boxes_magazines/_box_magazine.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index 2406b09c45..78ca6e9280 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -86,9 +86,7 @@ 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 = load_delay - if(AM.load_delay > load_delay) - loadtime = 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) From 5306da79389920e0d0b95be2e8675489da7fc465 Mon Sep 17 00:00:00 2001 From: lolman360 <22850904+lolman360@users.noreply.github.com> Date: Wed, 19 Aug 2020 12:02:53 +1000 Subject: [PATCH 7/7] Update code/modules/projectiles/guns/ballistic.dm Co-authored-by: silicons <2003111+silicons@users.noreply.github.com> --- code/modules/projectiles/guns/ballistic.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 22e53e83f0..1aefa51a51 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -53,10 +53,8 @@ ..() if (istype(A, /obj/item/ammo_box/magazine)) var/obj/item/ammo_box/magazine/AM = A - if(AM.load_delay) - if(do_after(user, AM.load_delay, target = src)) - else - return FALSE + 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