From ed1d9a8a04684d1529d71689ff9c0681d828d159 Mon Sep 17 00:00:00 2001
From: ForFoxSake <ForFoxSake@users.noreply.github.com>
Date: Thu, 6 Aug 2020 19:22:51 +0100
Subject: [PATCH 1/2] Adds tg-style fast(ish) magazine restocking. (#7391)

* Allows magazines to be reloaded automatically from piles of bullets.

* Fixes usr, adds changelog.
---
 code/modules/projectiles/ammunition.dm        | 42 +++++++++++++++++--
 .../changelogs/forfoxsake - fastmagazines.yml |  6 +++
 2 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 html/changelogs/forfoxsake - fastmagazines.yml

diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 65ec739d626..8c7e9a440b1 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -29,8 +29,8 @@
 	set_dir(pick(cardinal)) //spin spent casings
 	update_icon()
 
-/obj/item/ammo_casing/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(W.is_screwdriver())
+/obj/item/ammo_casing/attackby(obj/item/I as obj, mob/user as mob)
+	if(I.is_screwdriver())
 		if(!BB)
 			to_chat(user, "<font color='blue'>There is no bullet in the casing to inscribe anything into.</font>")
 			return
@@ -45,6 +45,39 @@
 		else
 			to_chat(user, "<font color='blue'>You inscribe \"[label_text]\" into \the [initial(BB.name)].</font>")
 			BB.name = "[initial(BB.name)] (\"[label_text]\")"
+	else if(istype(I, /obj/item/ammo_magazine) && isturf(loc)) // Mass magazine reloading.
+		var/obj/item/ammo_magazine/box = I
+		if (!box.can_remove_ammo || box.reloading)
+			return ..()
+
+		box.reloading = TRUE
+		var/boolets = 0
+		var/turf/floor = loc
+		for(var/obj/item/ammo_casing/bullet in floor)
+			if(box.stored_ammo.len >= box.max_ammo)
+				break
+			if(box.caliber == bullet.caliber && bullet.BB)
+				if (boolets < 1)
+					to_chat(user, "<span class='notice'>You start collecting shells.</span>") // Say it here so it doesn't get said if we don't find anything useful.
+				if(do_after(user,5,box))
+					if(box.stored_ammo.len >= box.max_ammo) // Double check because these can change during the wait.
+						break
+					if(bullet.loc != floor)
+						continue
+					bullet.forceMove(box)
+					box.stored_ammo.Add(bullet)
+					box.update_icon()
+					boolets++
+				else
+					break
+
+		if(boolets > 0)
+			to_chat(user, "<span class='notice'>You collect [boolets] shell\s. [box] now contains [box.stored_ammo.len] shell\s.</span>")
+		else
+			to_chat(user, "<span class='warning'>You fail to collect anything!</span>")
+		box.reloading = FALSE
+	else
+		return ..()
 
 /obj/item/ammo_casing/update_icon()
 	if(!BB)
@@ -84,6 +117,7 @@
 	var/initial_ammo = null
 
 	var/can_remove_ammo = TRUE	// Can this thing have bullets removed one-by-one? As of first implementation, only affects smart magazines
+	var/reloading = FALSE		//  Is this magazine being reloaded, currently? - Currently only useful for automatic pickups, ignored by manual reloading.
 
 	var/multiple_sprites = 0
 	//because BYOND doesn't support numbers as keys in associative lists
@@ -115,7 +149,7 @@
 			to_chat(user, "<span class='warning'>[src] is full!</span>")
 			return
 		user.remove_from_mob(C)
-		C.loc = src
+		C.forceMove(src)
 		stored_ammo.Add(C)
 		update_icon()
 	if(istype(W, /obj/item/ammo_magazine/clip))
@@ -131,7 +165,7 @@
 			return
 		var/obj/item/ammo_casing/AC = L.stored_ammo[1] //select the next casing.
 		L.stored_ammo -= AC //Remove this casing from loaded list of the clip.
-		AC.loc = src
+		AC.forceMove(src)
 		stored_ammo.Insert(1, AC) //add it to the head of our magazine's list
 		L.update_icon()
 	playsound(src, 'sound/weapons/flipblade.ogg', 50, 1)
diff --git a/html/changelogs/forfoxsake - fastmagazines.yml b/html/changelogs/forfoxsake - fastmagazines.yml
new file mode 100644
index 00000000000..a56e4dbaf8b
--- /dev/null
+++ b/html/changelogs/forfoxsake - fastmagazines.yml	
@@ -0,0 +1,6 @@
+author: ForFoxSake
+
+delete-after: True
+
+changes: 
+  - rscadd: "Ported tgstation styled magazine restocking. Hit a bullet on a table or floor with a partially empty magazine to start restocking."