From 50eca196589f0e0b626f470fe058b0df72a9d071 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Mon, 17 Aug 2020 20:20:04 -0700
Subject: [PATCH 1/2] Revert "load_delay var for /obj/item/ammo_box, nerfs
 shotgun stripper clips (hatter why'd you pr them)"

---
 .../projectiles/boxes_magazines/_box_magazine.dm | 16 ++++++----------
 .../projectiles/boxes_magazines/ammo_boxes.dm    |  2 --
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
index d0d846c144..9ea030da99 100644
--- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm
+++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
@@ -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))
diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
index 0b00c89c02..41b2ce8bf9 100644
--- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
+++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
@@ -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()
 	. = ..()

From 05b5d39732f7feca4b0bf35e087d69ff8c6ecf9c Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sat, 29 Aug 2020 21:38:45 -0700
Subject: [PATCH 2/2] Update ballistic.dm

---
 code/modules/projectiles/guns/ballistic.dm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 1aefa51a51..fa8099a257 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -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