Sorts storage icon file, resprites knife world icons, resprites medkits

_maps/map_files/generic/CentCom.dmm

@@ -4956,11 +4956,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/centcom/holding)
-"aRQ" = (
-/obj/structure/closet/abductor,
-/obj/item/storage/box/alienhandcuffs,
-/turf/open/floor/plating/abductor,
-/area/abductor_ship)
 "aRS" = (
 /obj/machinery/light/directional/west,
 /obj/structure/rack,
@@ -18782,7 +18777,7 @@ aaa
 aaa
 aks
 akP
-aRQ
+alj
 alG
 alj
 amw
@@ -18809,7 +18804,7 @@ aaa
 aaa
 aks
 akP
-aRQ
+alj
 alG
 alj
 amw
@@ -18836,7 +18831,7 @@ aaa
 aaa
 aks
 akP
-aRQ
+alj
 alG
 alj
 amw
@@ -18866,7 +18861,7 @@ aaa
 aaa
 aks
 akP
-aRQ
+alj
 alG
 alj
 amw

code/datums/traits/negative.dm

@@ -118,8 +118,6 @@
 				heirloom_type = pick(/obj/item/pen/fountain, /obj/item/storage/pill_bottle/dice)
 			if("Chaplain")
 				heirloom_type = pick(/obj/item/toy/windupToolbox, /obj/item/reagent_containers/food/drinks/bottle/holywater)
-			if("Assistant")
-				heirloom_type = /obj/item/storage/toolbox/mechanical/old/heirloom
 			//Security/Command
 			if("Captain")
 				heirloom_type = /obj/item/reagent_containers/food/drinks/flask/gold

code/game/objects/items/gift.dm

@@ -13,7 +13,7 @@ GLOBAL_LIST_EMPTY(possible_gifts)
 /obj/item/a_gift
 	name = "gift"
 	desc = "PRESENTS!!!! eek!"
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	icon_state = "giftdeliverypackage3"
 	item_state = "gift"
 	resistance_flags = FLAMMABLE

code/game/objects/items/melee/dualsaber.dm

@@ -4,8 +4,8 @@
 /obj/item/dualsaber
 	icon = 'icons/obj/weapon/energy.dmi'
 	icon_state = "dualsaber"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/weapons/melee/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/melee/swords_righthand.dmi'
 	name = "double-bladed energy sword"
 	desc = "For when simply killing someone isn't enough."
 	force = 3

code/game/objects/items/melee/energy.dm

@@ -83,8 +83,8 @@
 	desc = "For when a katana isn't enough. While Nanotrasen and the Syndicate both produce the so-called e-swords, they are visually and functionaly identical."
 	icon_state = "sword"
 	base_icon_state = "sword"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/weapons/melee/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/melee/swords_righthand.dmi'
 	force = 3
 	throwforce = 5
 	hitsound = "swing_hit" //it starts deactivated
@@ -197,8 +197,8 @@
 	desc = "Arrrr matey."
 	icon_state = "cutlass"
 	base_icon_state = "cutlass"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/weapons/melee/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/melee/swords_righthand.dmi'
 	icon_state_on = "cutlass"
 
 /obj/item/melee/transforming/energy/sword/saber/pirate/red
@@ -220,8 +220,8 @@
 	name = "energy blade"
 	desc = "A concentrated beam of energy in the shape of a blade. Very stylish... and lethal."
 	icon_state = "blade"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/weapons/melee/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/melee/swords_righthand.dmi'
 	force = 30 //Normal attacks deal esword damage
 	hitsound = 'sound/weapons/blade1.ogg'
 	active = 1
@@ -256,8 +256,8 @@
 	name = "energy sword"
 	desc = "That cable over there, I'm going to cut it."
 	icon_state = "plasmasword0"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/weapons/melee/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/melee/swords_righthand.dmi'
 	sharpness = IS_SHARP
 	armour_penetration = 200
 	block_chance = 0

code/game/objects/items/melee/knife.dm

@@ -2,8 +2,9 @@
 	icon_state = "kitchenknife"
 	item_state = "kitchenknife"
 	icon = 'icons/obj/weapon/knife.dmi'
-	lefthand_file = 'icons/mob/inhands/weapons/knifes_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/knifes_righthand.dmi'
+	world_file = 'icons/obj/weapon/knife_world.dmi'
+	lefthand_file = 'icons/mob/inhands/weapons/melee/knives_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/melee/knives_righthand.dmi'
 	pickup_sound =  'sound/items/handling/knife1_pickup.ogg'
 	drop_sound = 'sound/items/handling/knife3_drop.ogg'
 	flags_1 = CONDUCT_1
@@ -20,7 +21,6 @@
 	item_flags = EYE_STAB
 	tool_behaviour = TOOL_KNIFE
 
-
 /obj/item/melee/knife/ComponentInitialize()
 	. = ..()
 	set_butchering()
@@ -55,7 +55,6 @@
 		user.visible_message("<span class='danger'>[user]'s spoon snaps into tiny pieces in their hand.</span>")
 		qdel(src)
 
-
 /obj/item/melee/knife/plastic/afterattack(mob/living/carbon/user)
 	.=..()
 	if(prob(break_chance))
@@ -105,7 +104,6 @@
 	force = 20
 	throwforce = 20
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
-	world_file = 'icons/obj/world/melee.dmi'
 
 /obj/item/melee/knife/survival
 	name = "survival knife"
@@ -116,20 +114,18 @@
 	force = 15
 	throwforce = 15
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
-	world_file = 'icons/obj/world/melee.dmi'
 
 /obj/item/melee/knife/bone
 	name = "bone dagger"
 	item_state = "bone_dagger"
 	icon_state = "bone_dagger"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/weapons/melee/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/melee/swords_righthand.dmi'
 	desc = "A sharpened bone. The bare minimum in survival."
 	embedding = list("pain_mult" = 4, "embed_chance" = 35, "fall_chance" = 10)
 	force = 15
 	throwforce = 15
 	custom_materials = null
-	world_file = 'icons/obj/world/melee.dmi'
 
 /obj/item/melee/knife/combat/cyborg
 	name = "cyborg knife"
@@ -142,8 +138,8 @@
 	icon = 'icons/obj/shards.dmi'
 	icon_state = "shiv"
 	item_state = "shiv"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/weapons/melee/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/melee/swords_righthand.dmi'
 	desc = "A makeshift glass shiv."
 	force = 8
 	throwforce = 12
@@ -162,8 +158,8 @@
 /obj/item/melee/knife/switchblade
 	name = "switchblade"
 	icon_state = "switchblade"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/weapons/melee/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/melee/swords_righthand.dmi'
 	desc = "A sharp, concealable, spring-loaded knife."
 	flags_1 = CONDUCT_1
 	force = 3

code/game/objects/items/melee/stunbaton.dm

@@ -486,7 +486,7 @@
 /obj/item/conversion_kit
 	name = "conversion kit"
 	desc = "A strange box containing wood working tools and an instruction paper to turn stun batons into something else."
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	icon_state = "uk"
 	custom_price = 450
 

code/game/objects/items/melee/sword.dm

@@ -1,7 +1,7 @@
 /obj/item/melee/sword
 	icon = 'icons/obj/weapon/sword.dmi'
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/weapons/melee/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/melee/swords_righthand.dmi'
 	pickup_sound =  'sound/items/unsheath.ogg'
 	drop_sound = 'sound/items/handling/metal_drop.ogg'
 	hitsound = 'sound/weapons/bladeslice.ogg'
@@ -319,8 +319,8 @@
 /obj/item/melee/sword/vibro
 	icon_state = "hfrequency0"
 	base_icon_state = "hfrequency"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/weapons/melee/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/melee/swords_righthand.dmi'
 	name = "vibro sword"
 	desc = "A potent weapon capable of cutting through nearly anything. Wielding it in two hands will allow you to deflect gunfire."
 	armour_penetration = 100

code/game/objects/items/miscellaneous.dm

@@ -15,7 +15,7 @@
 /obj/item/choice_beacon
 	name = "choice box"
 	desc = "A box containing items to choose."
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	icon_state = "deliverypackage3"
 	var/uses = 1
 

code/game/objects/items/robot/robot_upgrades.dm

@@ -550,7 +550,7 @@
 /obj/item/borg/upgrade/rped
 	name = "engineering cyborg RPED"
 	desc = "A rapid part exchange device for the engineering cyborg."
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	icon_state = "borgrped"
 	require_module = TRUE
 	module_type = list(/obj/item/robot_module/engineering, /obj/item/robot_module/saboteur)

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -369,9 +369,6 @@ GLOBAL_LIST_INIT(cardboard_recipes, list (														\
 		new /datum/stack_recipe("nugget box", /obj/item/storage/fancy/nugget_box),			\
 		null,																					\
 
-		new /datum/stack_recipe("lethal ammo box", /obj/item/storage/box/lethalshot),			\
-		new /datum/stack_recipe("rubber shot ammo box", /obj/item/storage/box/rubbershot),		\
-		new /datum/stack_recipe("bean bag ammo box", /obj/item/storage/box/beanbag),			\
 		new /datum/stack_recipe("flashbang box", /obj/item/storage/box/flashbangs),				\
 		new /datum/stack_recipe("flashes box", /obj/item/storage/box/flashes),					\
 		new /datum/stack_recipe("handcuffs box", /obj/item/storage/box/handcuffs),				\

code/game/objects/items/storage/book.dm

@@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning",
 /obj/item/storage/book/bible
 	name = "bible"
 	desc = "Apply to head repeatedly."
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	icon_state = "bible"
 	item_state = "bible"
 	lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'

code/game/objects/items/storage/boxes.dm

@@ -262,7 +262,7 @@
 
 /obj/item/storage/box/hypospray
 	name = "hypospray mk. II kit"
-	icon = 'icons/obj/storage.dmi'		//WS Edit - Suitcases
+	icon = 'icons/obj/storage/storage.dmi'
 	icon_state = "medbriefcase"
 	illustration = null
 
@@ -618,15 +618,6 @@
 	for(var/i in 1 to 7)
 		new /obj/item/restraints/handcuffs/cable/zipties(src)
 
-/obj/item/storage/box/alienhandcuffs
-	name = "box of spare handcuffs"
-	desc = "A box full of handcuffs."
-	icon_state = "alienbox"
-	illustration = "handcuff"
-
-/obj/item/storage/box/alienhandcuffs/PopulateContents()
-	for(var/i in 1 to 7)
-		new	/obj/item/restraints/handcuffs/alien(src)
 
 /obj/item/storage/box/fakesyndiesuit
 	name = "boxed space suit and helmet"
@@ -686,7 +677,7 @@
 
 /obj/item/storage/box/lights
 	name = "box of replacement bulbs"
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	illustration = "light"
 	desc = "This box is shaped on the inside so that only light tubes and bulbs fit."
 	item_state = "syringe_kit"
@@ -811,57 +802,6 @@
 	else
 		new /obj/item/tank/internals/plasmaman/belt(src)
 
-/obj/item/storage/box/rubbershot
-	name = "box of rubber shots"
-	desc = "A box full of rubber shots, designed for riot shotguns."
-	icon_state = "rubbershot_box"
-	illustration = null
-
-/obj/item/storage/box/rubbershot/PopulateContents()
-	for(var/i in 1 to 7)
-		new /obj/item/ammo_casing/shotgun/rubbershot(src)
-
-/obj/item/storage/box/lethalshot
-	name = "box of lethal shotgun shots"
-	desc = "A box full of lethal shots, designed for riot shotguns."
-	icon_state = "lethalshot_box"
-	illustration = null
-
-/obj/item/storage/box/lethalshot/PopulateContents()
-	for(var/i in 1 to 7)
-		new /obj/item/ammo_casing/shotgun/buckshot(src)
-
-/obj/item/storage/box/techshot
-	name = "box of unloaded shotgun tech shells"
-	desc = "A box full of unloaded tech shells, capable of producing a variety of effects once loaded."
-	icon_state = "techshot_box"
-	illustration = null
-
-/obj/item/storage/box/techshot/PopulateContents()
-	for(var/i in 1 to 7)
-		new /obj/item/ammo_casing/shotgun/techshell(src)
-
-/obj/item/storage/box/beanbag
-	name = "box of beanbags"
-	desc = "A box full of beanbag shells."
-	icon_state = "beanbag_box"
-	illustration = null
-
-/obj/item/storage/box/beanbag/PopulateContents()
-	for(var/i in 1 to 6)
-		new /obj/item/ammo_casing/shotgun/beanbag(src)
-
-/obj/item/storage/box/slugshot
-	name = "box of 12-gauge slug shotgun shells"
-	desc = "a box full of slug shots, designed for riot shotguns"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "slugshot_box"
-	illustration = null
-
-/obj/item/storage/box/slugshot/PopulateContents()
-	for(var/i in 1 to 7)
-		new /obj/item/ammo_casing/shotgun(src)
-
 /obj/item/storage/box/actionfigure
 	name = "box of action figures"
 	desc = "The latest set of collectable action figures."

code/game/objects/items/storage/briefcase.dm

@@ -1,7 +1,7 @@
 /obj/item/storage/briefcase
 	name = "briefcase"
 	desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional."
-	icon = 'icons/obj/storage.dmi' //WS edit - Better briefcases
+	icon = 'icons/obj/storage/storage.dmi'
 	icon_state = "briefcase"
 	lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi'

code/game/objects/items/storage/firstaid.dm

@@ -12,8 +12,9 @@
 /obj/item/storage/firstaid
 	name = "first-aid kit"
 	desc = "It's an emergency medical kit for those serious boo-boos."
-	icon = 'icons/obj/storage.dmi'
 	icon_state = "firstaid"
+	icon = 'icons/obj/storage/medkits.dmi'
+	world_file = 'icons/obj/storage/medkits_world.dmi'
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	drop_sound = 'sound/items/handling/cardboardbox_drop.ogg'
@@ -119,7 +120,7 @@
 	generate_items_inside(items_inside,src)
 
 /obj/item/storage/firstaid/ancient
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	icon_state = "firstaid"
 	desc = "A first aid kit with the ability to heal common types of injuries."