diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index d7715e22b561..fefc0f7fa7b1 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_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 diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 306c3d6b8d50..7fbe2d53475d 100644 --- a/code/datums/traits/negative.dm +++ b/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 diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index 592a4f6364fb..4bb4b5a1d83f 100644 --- a/code/game/objects/items/gift.dm +++ b/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 diff --git a/code/game/objects/items/melee/dualsaber.dm b/code/game/objects/items/melee/dualsaber.dm index 28242c1006a1..2fbb983dca13 100644 --- a/code/game/objects/items/melee/dualsaber.dm +++ b/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 diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index 34219662e53d..f62ffe1d9fd8 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/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 diff --git a/code/game/objects/items/melee/knife.dm b/code/game/objects/items/melee/knife.dm index 15d389477745..06f8c7a526ab 100644 --- a/code/game/objects/items/melee/knife.dm +++ b/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("[user]'s spoon snaps into tiny pieces in their hand.") 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 diff --git a/code/game/objects/items/melee/stunbaton.dm b/code/game/objects/items/melee/stunbaton.dm index 05225d80cff8..96b8471ad140 100644 --- a/code/game/objects/items/melee/stunbaton.dm +++ b/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 diff --git a/code/game/objects/items/melee/sword.dm b/code/game/objects/items/melee/sword.dm index ff384770a318..0e91614ae90a 100644 --- a/code/game/objects/items/melee/sword.dm +++ b/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 diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index 3c8f3ead8709..632d3b5609f7 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/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 diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index e87691b651a9..d8a382cf589c 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/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) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index ce64af1fd205..70164b241086 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/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), \ diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index 67dba503642d..3b138ddd7002 100644 --- a/code/game/objects/items/storage/book.dm +++ b/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' diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 29d2cd22dbbd..c48c12f719ac 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/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." diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index dfc65846bd11..57c6c1dab405 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/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' diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index bac896c0b8d5..275517313a2f 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/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." diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index 6d6690106b4d..6e72bf5a455d 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -3,15 +3,15 @@ desc = "A locked box." icon_state = "lockbox+l" item_state = "syringe_kit" - icon = 'icons/obj/storage.dmi' //WS edit - better briefcases + icon = 'icons/obj/storage/storage.dmi' lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' w_class = WEIGHT_CLASS_BULKY req_access = list(ACCESS_ARMORY) var/broken = FALSE var/open = FALSE - var/icon_locked = "lockbox" //WS edit - fix lockbox sprites - var/icon_closed = "lockbox+l" //WS edit - fix lockbox sprites + var/icon_locked = "lockbox" + var/icon_closed = "lockbox+l" var/icon_broken = "lockbox+b" /obj/item/storage/lockbox/ComponentInitialize() diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index f46d6eb4c2c9..f1140b85f3f2 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -115,9 +115,10 @@ // ----------------------------- // Secure Briefcase // ----------------------------- + /obj/item/storage/secure/briefcase name = "secure briefcase" - icon = 'icons/obj/storage.dmi' //WS edit - better briefcases + icon = 'icons/obj/storage/storage.dmi' icon_state = "secure" item_state = "sec-case" lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi' @@ -158,7 +159,7 @@ /obj/item/storage/secure/safe name = "secure safe" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "safe" icon_opened = "safe0" icon_locking = "safeb" diff --git a/code/game/objects/items/storage/sixpack.dm b/code/game/objects/items/storage/sixpack.dm index 1a229909aa82..f426ba1dbd4e 100644 --- a/code/game/objects/items/storage/sixpack.dm +++ b/code/game/objects/items/storage/sixpack.dm @@ -1,7 +1,7 @@ /obj/item/storage/cans name = "can ring" desc = "Holds up to six drink cans, and select bottles." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "canholder" item_state = "cola" lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index f0e5665b446b..d946514b7622 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -1,6 +1,6 @@ /obj/item/storage name = "storage" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' w_class = WEIGHT_CLASS_NORMAL var/rummage_if_nodrop = TRUE var/component_type = /datum/component/storage/concrete diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index e0768391dae5..afdef643b570 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -1,6 +1,7 @@ /obj/item/storage/toolbox name = "toolbox" desc = "Danger. Very robust." + icon = 'icons/obj/storage/toolbox.dmi' icon_state = "toolbox_default" item_state = "toolbox_default" lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi' @@ -58,12 +59,6 @@ new /obj/item/flashlight/flare(src) new /obj/item/radio(src) -/obj/item/storage/toolbox/emergency/old - name = "rusty red toolbox" - icon_state = "toolbox_red_old" - has_latches = FALSE - material_flags = NONE - /obj/item/storage/toolbox/mechanical name = "mechanical toolbox" icon_state = "blue" @@ -71,7 +66,6 @@ material_flags = NONE /obj/item/storage/toolbox/mechanical/PopulateContents() - //WS Edit - Better Tool sprites if(prob(50)) new /obj/item/wrench(src) else @@ -83,61 +77,6 @@ new /obj/item/analyzer(src) new /obj/item/wirecutters(src) -/obj/item/storage/toolbox/mechanical/old - name = "rusty blue toolbox" - icon_state = "toolbox_blue_old" - has_latches = FALSE - material_flags = NONE - -/obj/item/storage/toolbox/mechanical/old/PopulateContents() - new /obj/item/screwdriver/old(src) - new /obj/item/wrench/old(src) - new /obj/item/weldingtool/old(src) - new /obj/item/crowbar/old(src) - new /obj/item/wirecutters/old(src) - -/obj/item/storage/toolbox/mechanical/old/heirloom - name = "toolbox" //this will be named "X family toolbox" - desc = "It's seen better days." - force = 5 - w_class = WEIGHT_CLASS_NORMAL - -/obj/item/storage/toolbox/mechanical/old/heirloom/PopulateContents() - return - -/obj/item/storage/toolbox/mechanical/old/clean - name = "toolbox" - desc = "A old, blue toolbox, it looks robust." - icon_state = "oldtoolboxclean" - item_state = "toolbox_blue" - has_latches = FALSE - force = 19 - throwforce = 22 - -/obj/item/storage/toolbox/mechanical/old/clean/proc/calc_damage() - var/power = 0 - for (var/obj/item/stack/telecrystal/TC in GetAllContents()) - power += TC.amount - force = 19 + power - throwforce = 22 + power - -/obj/item/storage/toolbox/mechanical/old/clean/attack(mob/target, mob/living/user) - calc_damage() - ..() - -/obj/item/storage/toolbox/mechanical/old/clean/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) - calc_damage() - ..() - -/obj/item/storage/toolbox/mechanical/old/clean/PopulateContents() - new /obj/item/screwdriver/old(src) - new /obj/item/wrench/old(src) - new /obj/item/weldingtool/old(src) - new /obj/item/crowbar/old(src) - new /obj/item/wirecutters/old(src) - new /obj/item/multitool/old(src) - new /obj/item/clothing/gloves/color/yellow(src) - /obj/item/storage/toolbox/electrical name = "electrical toolbox" icon_state = "yellow" diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 6d6d258b5b0c..9a2b098c55d3 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -268,8 +268,8 @@ icon = 'icons/obj/weapon/energy.dmi' icon_state = "sword" item_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' var/active = 0 w_class = WEIGHT_CLASS_SMALL attack_verb = list("attacked", "struck", "hit") @@ -410,8 +410,8 @@ icon = 'icons/obj/weapon/sword.dmi' icon_state = "katana" item_state = "katana" - 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' flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK force = 5 @@ -1073,8 +1073,8 @@ icon = 'icons/obj/wizard.dmi' icon_state = "render" item_state = "cultdagger" - 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' w_class = WEIGHT_CLASS_SMALL /* diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 6e7de98b21de..8fbe9d1bb191 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -16,7 +16,6 @@ /obj/item/clothing/head/soft/black = 2, /obj/item/clothing/shoes/sneakers/black = 2, /obj/item/reagent_containers/glass/rag = 2, - /obj/item/storage/box/beanbag = 1, /obj/item/clothing/suit/armor/vest/alt = 1, /obj/item/circuitboard/machine/dish_drive = 1, /obj/item/clothing/glasses/sunglasses/reagent = 1, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 23aa2df0ab5a..928a6b8e5239 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -289,8 +289,6 @@ /obj/structure/closet/secure_closet/armory2/PopulateContents() ..() - for(var/i in 1 to 3) - new /obj/item/storage/box/rubbershot(src) for(var/i in 1 to 3) new /obj/item/gun/ballistic/shotgun/hellfire(src) @@ -327,11 +325,10 @@ /obj/structure/closet/secure_closet/lethalshots/PopulateContents() ..() for(var/i in 1 to 3) - new /obj/item/storage/box/lethalshot(src) - new /obj/item/ammo_box/magazine/co9mm(src) //WS edit - begin - better safe than sorry new /obj/item/ammo_box/magazine/co9mm(src) new /obj/item/ammo_box/magazine/co9mm(src) - new /obj/item/ammo_box/magazine/co9mm(src) //WS edit - end + new /obj/item/ammo_box/magazine/co9mm(src) + new /obj/item/ammo_box/magazine/co9mm(src) /obj/structure/closet/secure_closet/labor_camp_security name = "labor camp security locker" diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index d6fb69980364..ad30a3e9c524 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -17,7 +17,7 @@ if(src.client.handle_spam_prevention(msg,MUTE_PRAY)) return - var/mutable_appearance/cross = mutable_appearance('icons/obj/storage.dmi', "bible") + var/mutable_appearance/cross = mutable_appearance('icons/obj/storage/storage.dmi', "bible") var/font_color = "purple" var/prayer_type = "PRAYER" var/deity diff --git a/code/modules/antagonists/gang/outfits.dm b/code/modules/antagonists/gang/outfits.dm index 77c091d2126a..ae9de3e0f983 100644 --- a/code/modules/antagonists/gang/outfits.dm +++ b/code/modules/antagonists/gang/outfits.dm @@ -42,8 +42,7 @@ backpack_contents = list(/obj/item/storage/box/handcuffs = 1, /obj/item/storage/box/teargas = 1, /obj/item/storage/box/flashbangs = 1, - /obj/item/shield/riot/tele = 1, - /obj/item/storage/box/lethalshot = 2) + /obj/item/shield/riot/tele = 1) /datum/outfit/families_police/beatcop/swat name = "Families: SWAT Beat Cop" @@ -53,8 +52,7 @@ backpack_contents = list(/obj/item/storage/box/handcuffs = 1, /obj/item/storage/box/teargas = 1, /obj/item/storage/box/flashbangs = 1, - /obj/item/shield/riot/tele = 1, - /obj/item/storage/box/lethalshot = 2) + /obj/item/shield/riot/tele = 1) /datum/outfit/families_police/beatcop/fbi name = "Families: Space FBI Officer" diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index 8d8f47a05f65..05acb3e15b78 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -84,12 +84,6 @@ cost = 1000 contains = list(/obj/item/disk/design_disk/blanks) -/datum/supply_pack/ammo/techshells - name = "Unloaded Shotgun Technological Shells Crate" - desc = "Contains a box of 7 versatile tech shells, capable of producing a variety of deadly effects for any situation. Some assembly required." - cost = 210 - contains = list(/obj/item/storage/box/techshot) - /datum/supply_pack/ammo/rubbershot name = "Rubbershot Crate" desc = "Contains a box of twenty-five rubbershot shells for use in crowd control or training." diff --git a/code/modules/clothing/outfits/ert/inteq_ert.dm b/code/modules/clothing/outfits/ert/inteq_ert.dm index 9fd796d04516..8cbcf4e56b70 100644 --- a/code/modules/clothing/outfits/ert/inteq_ert.dm +++ b/code/modules/clothing/outfits/ert/inteq_ert.dm @@ -28,7 +28,7 @@ suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/compact belt = /obj/item/storage/belt/security/webbing/inteq/alt - backpack_contents = list(/obj/item/storage/box/lethalshot=2, /obj/item/radio=1) + backpack_contents = list(/obj/item/radio=1) /datum/outfit/job/inteq/ert/medic name = "ERT - Inteq Corpsman" diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm index ba883d59f4dd..2461eb9a5ad2 100644 --- a/code/modules/clothing/outfits/factions/independent.dm +++ b/code/modules/clothing/outfits/factions/independent.dm @@ -637,7 +637,6 @@ alt_uniform = /obj/item/clothing/under/rank/civilian/bartender/purple alt_suit = /obj/item/clothing/suit/apron/purple_bartender suit = /obj/item/clothing/suit/armor/vest - backpack_contents = list(/obj/item/storage/box/beanbag=1) shoes = /obj/item/clothing/shoes/laceup accessory = /obj/item/clothing/accessory/waistcoat diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index 1d91a94b766d..7692777fcf08 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -192,7 +192,6 @@ alt_uniform = /obj/item/clothing/under/rank/civilian/bartender/purple alt_suit = /obj/item/clothing/suit/apron/purple_bartender suit = /obj/item/clothing/suit/armor/vest - backpack_contents = list(/obj/item/storage/box/beanbag=1) shoes = /obj/item/clothing/shoes/laceup /datum/outfit/job/syndicate/bartender/post_equip(mob/living/carbon/human/H, visualsOnly) diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm index 3ca5e48930a4..b8cb31e1a895 100644 --- a/code/modules/detectivework/evidence.dm +++ b/code/modules/detectivework/evidence.dm @@ -3,7 +3,7 @@ /obj/item/evidencebag name = "evidence bag" desc = "An empty evidence bag." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "evidenceobj" item_state = "" w_class = WEIGHT_CLASS_TINY diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 29ff8ead2f62..70ef8dd0836f 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -464,16 +464,16 @@ GLOBAL_LIST_INIT(hallucination_list, list( switch(item) if("esword") if(side == "right") - image_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + image_file = 'icons/mob/inhands/weapons/melee/swords_righthand.dmi' else - image_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + image_file = 'icons/mob/inhands/weapons/melee/swords_lefthand.dmi' target.playsound_local(H, 'sound/weapons/saberon.ogg',35,1) A = image(image_file,H,"swordred", layer=ABOVE_MOB_LAYER) if("dual_esword") if(side == "right") - image_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + image_file = 'icons/mob/inhands/weapons/melee/swords_righthand.dmi' else - image_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + image_file = 'icons/mob/inhands/weapons/melee/swords_lefthand.dmi' target.playsound_local(H, 'sound/weapons/saberon.ogg',35,1) A = image(image_file,H,"dualsaberred1", layer=ABOVE_MOB_LAYER) if("taser") diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 0aa4ac7fad38..5a1d72a454c2 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -616,7 +616,7 @@ /obj/item/storage/bottles name = "bottle crate" desc = "A small crate for storing bottles" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "bottlecrate" item_state = "deliverypackage" lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm index c0d985e89d79..8267507193dd 100644 --- a/code/modules/holodeck/items.dm +++ b/code/modules/holodeck/items.dm @@ -15,8 +15,8 @@ desc = "May the force be with you. Sorta." icon = 'icons/obj/weapon/energy.dmi' 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.0 throw_speed = 2 throw_range = 5 diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm index 994f34404efc..279709c34f84 100644 --- a/code/modules/jobs/job_types/bartender.dm +++ b/code/modules/jobs/job_types/bartender.dm @@ -21,7 +21,6 @@ alt_uniform = /obj/item/clothing/under/rank/civilian/bartender/purple alt_suit = /obj/item/clothing/suit/apron/purple_bartender suit = /obj/item/clothing/suit/armor/vest - backpack_contents = list(/obj/item/storage/box/beanbag=1) shoes = /obj/item/clothing/shoes/laceup /datum/outfit/job/bartender/post_equip(mob/living/carbon/human/H, visualsOnly) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index cd913c57fb0a..4abf8067ed80 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -232,8 +232,8 @@ /obj/item/pen/edagger/update_icon_state() if(on) icon_state = item_state = "edagger" - 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' else icon_state = initial(icon_state) //looks like a normal pen when off. item_state = initial(item_state) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 96e027a55476..767b6f7b3fe1 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -1,7 +1,7 @@ /obj/structure/bigDelivery name = "large parcel" desc = "A large delivery parcel." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "deliverycloset" density = TRUE mouse_drag_pointer = MOUSE_ACTIVE_POINTER @@ -165,7 +165,7 @@ /obj/item/smallDelivery name = "parcel" desc = "A brown paper delivery parcel." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "deliverypackage3" item_state = "deliverypackage" var/giftwrapped = 0 diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm index 0747fb746ddd..4754d3a43ad4 100644 --- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm @@ -48,7 +48,7 @@ /obj/structure/cursed_money name = "bag of money" desc = "RICH! YES! YOU KNEW IT WAS WORTH IT! YOU'RE RICH! RICH! RICH!" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "moneybag" anchored = FALSE density = TRUE diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 756d889f5bc5..7c155068b6f6 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -20,7 +20,7 @@ desc = "A wall mounted safe containing space suits. Will only open in emergencies." anchored = TRUE density = FALSE - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "safe" var/unlocked = FALSE @@ -70,7 +70,7 @@ /obj/item/storage/overmap_ship name = "emergency space suits" desc = "A wall mounted safe containing space suits. Will only open in emergencies." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "safe" anchored = TRUE var/unlocked = FALSE diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index 022292c282b8..5db022112850 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -185,22 +185,3 @@ if(prob(60/severity)) to_chat(owner, "Your breathing tube suddenly closes!") owner.losebreath += 2 - -//BOX O' IMPLANTS - -/obj/item/storage/box/cyber_implants - name = "boxed cybernetic implants" - desc = "A sleek, sturdy box." - icon_state = "cyber_implants" - var/list/boxed = list( - /obj/item/autosurgeon/syndicate/thermal_eyes, - /obj/item/autosurgeon/syndicate/xray_eyes, - /obj/item/autosurgeon/syndicate/anti_stun, - /obj/item/autosurgeon/syndicate/reviver) - var/amount = 5 - -/obj/item/storage/box/cyber_implants/PopulateContents() - var/implant - while(contents.len <= amount) - implant = pick(boxed) - new implant(src) diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 5da5f497bda4..0cce8ed43508 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -192,7 +192,7 @@ /obj/item/organ_storage //allows medical cyborgs to manipulate organs without hands name = "organ storage bag" desc = "A container for holding body parts." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "evidenceobj" item_flags = SURGICAL_TOOL diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 0923ba1cc70e..6bedd6903f9e 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -171,13 +171,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 14 // normally 16 include_modes = list(/datum/game_mode/nuclear) -/datum/uplink_item/bundles_TC/cyber_implants - name = "Cybernetic Implants Bundle" - desc = "A random selection of cybernetic implants. Guaranteed 5 high quality implants. Comes with an autosurgeon." - item = /obj/item/storage/box/cyber_implants - cost = 40 - include_modes = list(/datum/game_mode/nuclear) - /datum/uplink_item/bundles_TC/medical name = "Medical bundle" desc = "The support specialist: Aid your fellow operatives with this medical bundle. Contains a tactical medkit, \ @@ -1690,14 +1683,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) restricted_roles = list("Assistant") surplus = 0 -/datum/uplink_item/role_restricted/oldtoolboxclean - name = "Ancient Toolbox" - desc = "An iconic toolbox design notorious with Assistants everywhere, this design was especially made to become more robust the more telecrystals it has inside it! Tools and insulated gloves included." - item = /obj/item/storage/toolbox/mechanical/old/clean - cost = 2 - restricted_roles = list("Assistant") - surplus = 0 - /datum/uplink_item/role_restricted/pie_cannon name = "Banana Cream Pie Cannon" desc = "A special pie cannon for a special clown, this gadget can hold up to 20 pies and automatically fabricates one every two seconds!" diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index 37a51b27bb89..a3c21298d600 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -96,7 +96,6 @@ /obj/item/assembly/flash/handheld = 10, /obj/item/flashlight/seclite = 10, - /obj/item/storage/box/lethalshot = 6, /obj/item/stock_parts/cell/gun = 5, /obj/item/ammo_box/magazine/spitter_9mm = 5, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 2bef026cebff..8e3dc96c6595 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -257,7 +257,6 @@ /obj/item/clothing/head/soft/black = 2, /obj/item/clothing/shoes/sneakers/black = 2, /obj/item/reagent_containers/glass/rag = 2, - /obj/item/storage/box/beanbag = 1, /obj/item/clothing/suit/armor/vest/alt = 1, /obj/item/circuitboard/machine/dish_drive = 1, /obj/item/clothing/glasses/sunglasses/reagent = 1, diff --git a/icons/mob/inhands/weapons/knifes_lefthand.dmi b/icons/mob/inhands/weapons/melee/knives_lefthand.dmi similarity index 100% rename from icons/mob/inhands/weapons/knifes_lefthand.dmi rename to icons/mob/inhands/weapons/melee/knives_lefthand.dmi diff --git a/icons/mob/inhands/weapons/knifes_righthand.dmi b/icons/mob/inhands/weapons/melee/knives_righthand.dmi similarity index 100% rename from icons/mob/inhands/weapons/knifes_righthand.dmi rename to icons/mob/inhands/weapons/melee/knives_righthand.dmi diff --git a/icons/mob/inhands/weapons/melee/swords_lefthand.dmi b/icons/mob/inhands/weapons/melee/swords_lefthand.dmi new file mode 100644 index 000000000000..49732e254e41 Binary files /dev/null and b/icons/mob/inhands/weapons/melee/swords_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/melee/swords_righthand.dmi similarity index 100% rename from icons/mob/inhands/weapons/swords_righthand.dmi rename to icons/mob/inhands/weapons/melee/swords_righthand.dmi diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi index 49732e254e41..75b74b0068fb 100644 Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ diff --git a/icons/obj/storage/medkits.dmi b/icons/obj/storage/medkits.dmi new file mode 100644 index 000000000000..12417b88d61c Binary files /dev/null and b/icons/obj/storage/medkits.dmi differ diff --git a/icons/obj/storage/medkits_world.dmi b/icons/obj/storage/medkits_world.dmi new file mode 100644 index 000000000000..915a45576633 Binary files /dev/null and b/icons/obj/storage/medkits_world.dmi differ diff --git a/icons/obj/storage/storage.dmi b/icons/obj/storage/storage.dmi new file mode 100644 index 000000000000..c8947374f19d Binary files /dev/null and b/icons/obj/storage/storage.dmi differ diff --git a/icons/obj/storage/toolbox.dmi b/icons/obj/storage/toolbox.dmi new file mode 100644 index 000000000000..c17cab26a8a7 Binary files /dev/null and b/icons/obj/storage/toolbox.dmi differ diff --git a/icons/obj/weapon/knife_world.dmi b/icons/obj/weapon/knife_world.dmi new file mode 100644 index 000000000000..55f51e4052d6 Binary files /dev/null and b/icons/obj/weapon/knife_world.dmi differ diff --git a/icons/obj/world/melee.dmi b/icons/obj/world/melee.dmi deleted file mode 100644 index ff8e2114e827..000000000000 Binary files a/icons/obj/world/melee.dmi and /dev/null differ diff --git a/medkits_world.dmi b/medkits_world.dmi new file mode 100644 index 000000000000..d0417ecbe2f5 Binary files /dev/null and b/medkits_world.dmi differ