From 0a9db72857dfe3af82d794e69d5f151db4fa8815 Mon Sep 17 00:00:00 2001
From: LaharlMontogmmery <sebmetroid@hotmail.com>
Date: Tue, 16 Jun 2015 21:26:45 +0200
Subject: [PATCH] Put the content transfer code into a proc, for
 maintainability

---
 .../objects/items/weapons/storage/storage.dm  | 53 ++++++++++---------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 3fce65f1ff0..2b66880adce 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -39,33 +39,10 @@
 			show_to(M)
 			return
 
-		if(!( M.restrained() ) && !( M.stat )) // I'M PRETTY SURE THIS IS ALREADY HANDLED SOMEWHERE ELSE
+		if(!( M.restrained() ) && !( M.stat ))
 			if(!( istype(over_object, /obj/screen) ))
 				if(Adjacent(M) && over_object.Adjacent(M))
-					playsound(loc, "rustle", 50, 1, -5)
-					if( istype(over_object, /obj/item/weapon/storage) ) //Check if storage item
-						var/obj/item/weapon/storage/S = over_object
-						orient2hud(M)
-						if(M.s_active) //refresh the HUD
-							M.s_active.close(M)
-							show_to(M)
-						for(var/obj/item/I in src)
-							if(S.can_be_inserted(I,0,M))
-								remove_from_storage(I, S)
-						return
-
-					if( istype(over_object, /obj/machinery/disposal) ) //Check if it's a bin
-						for(var/obj/item/I in src)
-							remove_from_storage(I, over_object) //No check needed, put everything inside
-						return
-
-					var/turf/T = get_turf(over_object) //Get_turf, and check if the turf isn't a wall
-					if( istype(T, /turf/simulated/wall) )
-						return
-
-					for(var/obj/item/I in src)
-						remove_from_storage(I, T)
-					return
+					contentto(over_object, M)
 
 			if(!(loc == usr) || (loc && loc.loc == usr))
 				return
@@ -82,6 +59,32 @@
 					M.put_in_l_hand(src)
 			add_fingerprint(usr)
 
+//Case by case proc for Contents transfer to other containers, bins, turf, and more possible additions.
+/obj/item/weapon/storage/proc/contentto(obj/dest_object, mob/user)
+	playsound(loc, "rustle", 50, 1, -5)
+	if( istype(dest_object, /obj/item/weapon/storage) ) //Check if storage item
+		var/obj/item/weapon/storage/S = dest_object
+		orient2hud(user)
+		if(user.s_active) //close the HUD
+			user.s_active.close(user)
+		for(var/obj/item/I in src)
+			if(S.can_be_inserted(I,0,user))
+				remove_from_storage(I, S)
+		return
+
+	if( istype(dest_object, /obj/machinery/disposal) ) //Check if it's a bin
+		for(var/obj/item/I in src)
+			remove_from_storage(I, dest_object) //No check needed, put everything inside
+		return
+
+	var/turf/T = get_turf(dest_object) //Get_turf, and check if the turf isn't a wall
+	if( istype(T, /turf/simulated/wall) )
+		return
+
+	for(var/obj/item/I in src)
+		remove_from_storage(I, T)
+	return
+
 /obj/item/weapon/storage/proc/return_inv()
 	var/list/L = list()
 	L += contents