From fd9f50c552ff117b5f1ee4f431fa2f2d9a418280 Mon Sep 17 00:00:00 2001 From: tattle <66640614+dragomagol@users.noreply.github.com> Date: Wed, 31 Aug 2022 18:29:10 -0700 Subject: [PATCH] [IDB IGNORE] Renames the inhand/misc folder to inhand/items (#69573) Also adds balloons to inhand/items --- code/game/machinery/newscaster/newspaper.dm | 4 ++-- code/game/machinery/syndicatebeacon.dm | 4 ++-- code/game/machinery/syndicatebomb.dm | 4 ++-- code/game/objects/items/AI_modules/_AI_modules.dm | 4 ++-- .../objects/items/circuitboards/circuitboard.dm | 4 ++-- code/game/objects/items/control_wand.dm | 4 ++-- code/game/objects/items/devices/aicard.dm | 4 ++-- .../objects/items/devices/anomaly_neutralizer.dm | 4 ++-- code/game/objects/items/devices/beacon.dm | 4 ++-- code/game/objects/items/devices/chameleonproj.dm | 4 ++-- code/game/objects/items/devices/desynchronizer.dm | 4 ++-- code/game/objects/items/devices/flashlight.dm | 4 ++-- .../objects/items/devices/forcefieldprojector.dm | 4 ++-- code/game/objects/items/devices/lightreplacer.dm | 4 ++-- code/game/objects/items/devices/megaphone.dm | 4 ++-- code/game/objects/items/devices/powersink.dm | 4 ++-- .../game/objects/items/devices/radio/electropack.dm | 4 ++-- .../objects/items/devices/scanners/t_scanner.dm | 4 ++-- code/game/objects/items/devices/swapper.dm | 4 ++-- code/game/objects/items/devices/traitordevices.dm | 4 ++-- code/game/objects/items/food/_food.dm | 4 ++-- code/game/objects/items/grenades/festive.dm | 4 ++-- code/game/objects/items/holosign_creator.dm | 4 ++-- code/game/objects/items/holy_weapons.dm | 4 ++-- code/game/objects/items/implants/implantpad.dm | 4 ++-- code/game/objects/items/implants/implantuplink.dm | 4 ++-- code/game/objects/items/pinpointer.dm | 4 ++-- .../game/objects/items/stacks/sheets/sheet_types.dm | 4 ++-- code/game/objects/items/stacks/sheets/sheets.dm | 4 ++-- code/game/objects/items/stacks/tiles/tile_types.dm | 4 ++-- code/game/objects/items/storage/book.dm | 4 ++-- code/game/objects/items/storage/fancy.dm | 8 ++++---- code/game/objects/items/storage/sixpack.dm | 4 ++-- code/game/objects/items/tcg/tcg.dm | 4 ++-- code/game/objects/items/teleportation.dm | 12 ++++++------ code/game/objects/items/theft_tools.dm | 4 ++-- code/game/objects/items/toys.dm | 8 ++++---- code/game/objects/items/trash.dm | 4 ++-- code/game/objects/items/vending_items.dm | 4 ++-- code/game/objects/items/wall_mounted.dm | 4 ++-- code/game/objects/structures/beds_chairs/chair.dm | 8 ++++---- code/game/objects/structures/bedsheet_bin.dm | 4 ++-- .../antagonists/abductor/equipment/glands/blood.dm | 4 ++-- .../antagonists/abductor/equipment/glands/egg.dm | 4 ++-- code/modules/antagonists/cult/blood_magic.dm | 4 ++-- code/modules/antagonists/cult/cult_items.dm | 4 ++-- .../antagonists/nukeop/equipment/borgchameleon.dm | 4 ++-- .../nukeop/equipment/nuclear_challenge.dm | 4 ++-- .../traitor/objectives/locate_weakpoint.dm | 4 ++-- .../antagonists/wizard/equipment/artefact.dm | 4 ++-- .../antagonists/wizard/equipment/soulstone.dm | 4 ++-- code/modules/assembly/bomb.dm | 4 ++-- code/modules/assembly/holder.dm | 4 ++-- code/modules/assembly/signaler.dm | 4 ++-- .../awaymissions/mission_code/stationCollision.dm | 4 ++-- code/modules/cargo/export_scanner.dm | 4 ++-- code/modules/cargo/supplypod_beacon.dm | 4 ++-- code/modules/detectivework/scanner.dm | 4 ++-- code/modules/experisci/handheld_scanner.dm | 4 ++-- code/modules/explorer_drone/loot.dm | 4 ++-- code/modules/food_and_drinks/pizzabox.dm | 4 ++-- code/modules/holiday/easter.dm | 4 ++-- code/modules/hydroponics/grown/banana.dm | 4 ++-- code/modules/hydroponics/grown/flowers.dm | 8 ++++---- code/modules/library/lib_codex_gigas.dm | 4 ++-- code/modules/mining/aux_base.dm | 4 ++-- code/modules/mining/equipment/wormhole_jaunter.dm | 4 ++-- .../modules/mob/living/silicon/robot/robot_model.dm | 4 ++-- code/modules/mod/mod_core.dm | 4 ++-- .../modular_computers/hardware/network_card.dm | 4 ++-- code/modules/pai/card.dm | 4 ++-- code/modules/paperwork/handlabeler.dm | 4 ++-- code/modules/paperwork/paperbin.dm | 4 ++-- code/modules/photography/camera/camera.dm | 4 ++-- code/modules/photography/camera/film.dm | 4 ++-- code/modules/photography/photos/album.dm | 4 ++-- code/modules/power/cell.dm | 4 ++-- code/modules/power/solar.dm | 6 +++--- .../reagents/reagent_containers/condiment.dm | 4 ++-- .../reagents/reagent_containers/cups/_cup.dm | 4 ++-- code/modules/recycling/sortingmachinery.dm | 8 ++++---- code/modules/religion/religion_structures.dm | 4 ++-- code/modules/research/anomaly/anomaly_core.dm | 4 ++-- code/modules/research/stock_parts.dm | 8 ++++---- code/modules/shuttle/assault_pod.dm | 4 ++-- code/modules/spells/spell_types/touch/_touch.dm | 4 ++-- code/modules/uplink/uplink_devices.dm | 4 ++-- code/modules/vehicles/lavaboat.dm | 4 ++-- code/modules/vehicles/mecha/mecha_parts.dm | 4 ++-- code/modules/wiremod/shell/compact_remote.dm | 4 ++-- code/modules/wiremod/shell/controller.dm | 4 ++-- code/modules/wiremod/shell/keyboard.dm | 4 ++-- code/modules/wiremod/shell/scanner.dm | 4 ++-- icons/mob/inhands/{ => items}/balloons_lefthand.dmi | Bin .../mob/inhands/{ => items}/balloons_righthand.dmi | Bin .../inhands/{misc => items}/bedsheet_lefthand.dmi | Bin .../inhands/{misc => items}/bedsheet_righthand.dmi | Bin .../mob/inhands/{misc => items}/books_lefthand.dmi | Bin .../mob/inhands/{misc => items}/books_righthand.dmi | Bin .../mob/inhands/{misc => items}/chairs_lefthand.dmi | Bin .../inhands/{misc => items}/chairs_righthand.dmi | Bin .../inhands/{misc => items}/devices_lefthand.dmi | Bin .../inhands/{misc => items}/devices_righthand.dmi | Bin .../mob/inhands/{misc => items}/drinks_lefthand.dmi | Bin .../inhands/{misc => items}/drinks_righthand.dmi | Bin .../inhands/{misc => items}/firelance_lefthand.dmi | Bin .../inhands/{misc => items}/firelance_righthand.dmi | Bin icons/mob/inhands/{misc => items}/food_lefthand.dmi | Bin .../mob/inhands/{misc => items}/food_righthand.dmi | Bin .../inhands/{misc => items}/lavaland_lefthand.dmi | Bin .../inhands/{misc => items}/lavaland_righthand.dmi | Bin .../inhands/{misc => items}/megaphone_lefthand.dmi | Bin .../inhands/{misc => items}/megaphone_righthand.dmi | Bin .../mob/inhands/{misc => items}/sheets_lefthand.dmi | Bin .../inhands/{misc => items}/sheets_righthand.dmi | Bin .../mob/inhands/{misc => items}/tiles_lefthand.dmi | Bin .../mob/inhands/{misc => items}/tiles_righthand.dmi | Bin .../inhands/{misc => items}/touchspell_lefthand.dmi | Bin .../{misc => items}/touchspell_righthand.dmi | Bin 119 files changed, 203 insertions(+), 203 deletions(-) rename icons/mob/inhands/{ => items}/balloons_lefthand.dmi (100%) rename icons/mob/inhands/{ => items}/balloons_righthand.dmi (100%) rename icons/mob/inhands/{misc => items}/bedsheet_lefthand.dmi (100%) rename icons/mob/inhands/{misc => items}/bedsheet_righthand.dmi (100%) rename icons/mob/inhands/{misc => items}/books_lefthand.dmi (100%) rename icons/mob/inhands/{misc => items}/books_righthand.dmi (100%) rename icons/mob/inhands/{misc => items}/chairs_lefthand.dmi (100%) rename icons/mob/inhands/{misc => items}/chairs_righthand.dmi (100%) rename icons/mob/inhands/{misc => items}/devices_lefthand.dmi (100%) rename icons/mob/inhands/{misc => items}/devices_righthand.dmi (100%) rename icons/mob/inhands/{misc => items}/drinks_lefthand.dmi (100%) rename icons/mob/inhands/{misc => items}/drinks_righthand.dmi (100%) rename icons/mob/inhands/{misc => items}/firelance_lefthand.dmi (100%) rename icons/mob/inhands/{misc => items}/firelance_righthand.dmi (100%) rename icons/mob/inhands/{misc => items}/food_lefthand.dmi (100%) rename icons/mob/inhands/{misc => items}/food_righthand.dmi (100%) rename icons/mob/inhands/{misc => items}/lavaland_lefthand.dmi (100%) rename icons/mob/inhands/{misc => items}/lavaland_righthand.dmi (100%) rename icons/mob/inhands/{misc => items}/megaphone_lefthand.dmi (100%) rename icons/mob/inhands/{misc => items}/megaphone_righthand.dmi (100%) rename icons/mob/inhands/{misc => items}/sheets_lefthand.dmi (100%) rename icons/mob/inhands/{misc => items}/sheets_righthand.dmi (100%) rename icons/mob/inhands/{misc => items}/tiles_lefthand.dmi (100%) rename icons/mob/inhands/{misc => items}/tiles_righthand.dmi (100%) rename icons/mob/inhands/{misc => items}/touchspell_lefthand.dmi (100%) rename icons/mob/inhands/{misc => items}/touchspell_righthand.dmi (100%) diff --git a/code/game/machinery/newscaster/newspaper.dm b/code/game/machinery/newscaster/newspaper.dm index ecc87c3ff78..eaf694b308a 100644 --- a/code/game/machinery/newscaster/newspaper.dm +++ b/code/game/machinery/newscaster/newspaper.dm @@ -3,8 +3,8 @@ desc = "An issue of The Griffon, the newspaper circulating aboard Nanotrasen Space Stations." icon = 'icons/obj/bureaucracy.dmi' icon_state = "newspaper" - lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/books_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/books_righthand.dmi' w_class = WEIGHT_CLASS_SMALL attack_verb_continuous = list("baps") attack_verb_simple = list("bap") diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 5d97c67afd9..0c75e17709a 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -117,8 +117,8 @@ name = "suspicious beacon" icon = 'icons/obj/device.dmi' icon_state = "beacon" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' desc = "A label on it reads: Warning: Activating this device will send a special beacon to your location." w_class = WEIGHT_CLASS_SMALL var/droptype = /obj/machinery/power/singularity_beacon/syndicate diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 2c9fbf9699c..3d1293e85ca 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -545,8 +545,8 @@ icon = 'icons/obj/assemblies/assemblies.dmi' icon_state = "bigred" inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' w_class = WEIGHT_CLASS_TINY var/timer = 0 var/detonated = 0 diff --git a/code/game/objects/items/AI_modules/_AI_modules.dm b/code/game/objects/items/AI_modules/_AI_modules.dm index c01872d6c93..346b3c12e45 100644 --- a/code/game/objects/items/AI_modules/_AI_modules.dm +++ b/code/game/objects/items/AI_modules/_AI_modules.dm @@ -6,8 +6,8 @@ icon = 'icons/obj/module.dmi' icon_state = "std_mod" inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' desc = "An AI Module for programming laws to an AI." flags_1 = CONDUCT_1 force = 5 diff --git a/code/game/objects/items/circuitboards/circuitboard.dm b/code/game/objects/items/circuitboards/circuitboard.dm index 3238c5d1658..2c70ad34b7c 100644 --- a/code/game/objects/items/circuitboards/circuitboard.dm +++ b/code/game/objects/items/circuitboards/circuitboard.dm @@ -10,8 +10,8 @@ icon = 'icons/obj/module.dmi' icon_state = "circuit_map" inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' custom_materials = list(/datum/material/glass = 1000) w_class = WEIGHT_CLASS_SMALL grind_results = list(/datum/reagent/silicon = 20) diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index 88add4a928c..7fac85e903c 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -5,8 +5,8 @@ /obj/item/door_remote icon_state = "gangtool-white" inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' icon = 'icons/obj/device.dmi' name = "control wand" desc = "Remotely controls airlocks." diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 95408ad2abc..0acdb203acc 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -5,8 +5,8 @@ icon_state = "aicard" // aicard-full inhand_icon_state = "electronic" worn_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' w_class = WEIGHT_CLASS_SMALL slot_flags = ITEM_SLOT_BELT item_flags = NOBLUDGEON diff --git a/code/game/objects/items/devices/anomaly_neutralizer.dm b/code/game/objects/items/devices/anomaly_neutralizer.dm index ee05d3e5a88..279a6a15fe0 100644 --- a/code/game/objects/items/devices/anomaly_neutralizer.dm +++ b/code/game/objects/items/devices/anomaly_neutralizer.dm @@ -5,8 +5,8 @@ icon_state = "memorizer2" inhand_icon_state = "electronic" worn_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' w_class = WEIGHT_CLASS_SMALL slot_flags = ITEM_SLOT_BELT item_flags = NOBLUDGEON diff --git a/code/game/objects/items/devices/beacon.dm b/code/game/objects/items/devices/beacon.dm index 2d21f8a8f59..1a14a6299c9 100644 --- a/code/game/objects/items/devices/beacon.dm +++ b/code/game/objects/items/devices/beacon.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/device.dmi' icon_state = "beacon" inhand_icon_state = "beacon" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' var/enabled = TRUE var/renamed = FALSE diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 0d73b7b8613..e7dd30a0d88 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -7,8 +7,8 @@ slot_flags = ITEM_SLOT_BELT inhand_icon_state = "electronic" worn_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' throwforce = 5 throw_speed = 3 throw_range = 5 diff --git a/code/game/objects/items/devices/desynchronizer.dm b/code/game/objects/items/devices/desynchronizer.dm index 719d502e85f..365473b14eb 100644 --- a/code/game/objects/items/devices/desynchronizer.dm +++ b/code/game/objects/items/devices/desynchronizer.dm @@ -6,8 +6,8 @@ inhand_icon_state = "electronic" w_class = WEIGHT_CLASS_SMALL item_flags = NOBLUDGEON - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' custom_materials = list(/datum/material/iron=250, /datum/material/glass=500) var/max_duration = 3000 var/duration = 300 diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 1b5ec7a44cc..5912e9e09dd 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -6,8 +6,8 @@ icon_state = "flashlight" inhand_icon_state = "flashlight" worn_icon_state = "flashlight" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' w_class = WEIGHT_CLASS_SMALL flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT diff --git a/code/game/objects/items/devices/forcefieldprojector.dm b/code/game/objects/items/devices/forcefieldprojector.dm index 79993a63f7c..0ff6a8eb5a2 100644 --- a/code/game/objects/items/devices/forcefieldprojector.dm +++ b/code/game/objects/items/devices/forcefieldprojector.dm @@ -8,8 +8,8 @@ item_flags = NOBLUDGEON inhand_icon_state = "electronic" worn_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' custom_materials = list(/datum/material/iron=250, /datum/material/glass=500) var/max_shield_integrity = 250 var/shield_integrity = 250 diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 31d25faa385..413d9398e50 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -47,8 +47,8 @@ icon_state = "lightreplacer0" inhand_icon_state = "electronic" worn_icon_state = "light_replacer" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' w_class = WEIGHT_CLASS_SMALL flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 84f77cd8b51..41c569f6af6 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/device.dmi' icon_state = "megaphone" inhand_icon_state = "megaphone" - lefthand_file = 'icons/mob/inhands/misc/megaphone_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/megaphone_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/megaphone_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/megaphone_righthand.dmi' w_class = WEIGHT_CLASS_SMALL siemens_coefficient = 1 var/spamcheck = 0 diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 869215ef5ed..150106e9214 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -14,8 +14,8 @@ icon = 'icons/obj/device.dmi' icon_state = "powersink0" inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' w_class = WEIGHT_CLASS_BULKY flags_1 = CONDUCT_1 item_flags = NO_PIXEL_RANDOM_DROP diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index eb2b80f875f..fb81269f4ed 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/radio.dmi' icon_state = "electropack0" inhand_icon_state = "electropack" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_HUGE diff --git a/code/game/objects/items/devices/scanners/t_scanner.dm b/code/game/objects/items/devices/scanners/t_scanner.dm index 84a7749d35c..a1d58fba9ed 100644 --- a/code/game/objects/items/devices/scanners/t_scanner.dm +++ b/code/game/objects/items/devices/scanners/t_scanner.dm @@ -9,8 +9,8 @@ w_class = WEIGHT_CLASS_SMALL inhand_icon_state = "electronic" worn_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' custom_materials = list(/datum/material/iron=150) /obj/item/t_scanner/suicide_act(mob/living/carbon/user) diff --git a/code/game/objects/items/devices/swapper.dm b/code/game/objects/items/devices/swapper.dm index d0721866bc6..f01e8244be0 100644 --- a/code/game/objects/items/devices/swapper.dm +++ b/code/game/objects/items/devices/swapper.dm @@ -6,8 +6,8 @@ inhand_icon_state = "electronic" w_class = WEIGHT_CLASS_SMALL item_flags = NOBLUDGEON - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' var/cooldown = 300 var/next_use = 0 diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index fe060bf87e0..7ce0bdc758d 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -26,8 +26,8 @@ effective or pretty fucking useless. throw_range = 7 flags_1 = CONDUCT_1 inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' var/times_used = 0 //Number of times it's been used. var/max_uses = 2 diff --git a/code/game/objects/items/food/_food.dm b/code/game/objects/items/food/_food.dm index 59885e89206..add02d616bd 100644 --- a/code/game/objects/items/food/_food.dm +++ b/code/game/objects/items/food/_food.dm @@ -6,8 +6,8 @@ w_class = WEIGHT_CLASS_SMALL icon = 'icons/obj/food/food.dmi' icon_state = null - lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/food_righthand.dmi' obj_flags = UNIQUE_RENAME grind_results = list() ///List of reagents this food gets on creation diff --git a/code/game/objects/items/grenades/festive.dm b/code/game/objects/items/grenades/festive.dm index 17320f8c731..ceed70ecb04 100644 --- a/code/game/objects/items/grenades/festive.dm +++ b/code/game/objects/items/grenades/festive.dm @@ -64,8 +64,8 @@ desc = "Outlawed in most of the sector. Doubles as an excellent finger remover." icon = 'icons/obj/holiday/holiday_misc.dmi' icon_state = "firecracker" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' w_class = WEIGHT_CLASS_SMALL inhand_icon_state = "flare" throw_speed = 3 diff --git a/code/game/objects/items/holosign_creator.dm b/code/game/objects/items/holosign_creator.dm index 92f4c7f2346..243de818ad4 100644 --- a/code/game/objects/items/holosign_creator.dm +++ b/code/game/objects/items/holosign_creator.dm @@ -5,8 +5,8 @@ icon_state = "signmaker" inhand_icon_state = "electronic" worn_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' force = 0 w_class = WEIGHT_CLASS_SMALL throwforce = 0 diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 885644806ea..3efd8e8550b 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -63,8 +63,8 @@ desc = "This hand of yours glows with an awesome power!" icon_state = "disintegrate" inhand_icon_state = "disintegrate" - lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/touchspell_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/touchspell_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/touchspell_righthand.dmi' slot_flags = null item_flags = ABSTRACT | DROPDEL w_class = WEIGHT_CLASS_HUGE diff --git a/code/game/objects/items/implants/implantpad.dm b/code/game/objects/items/implants/implantpad.dm index 7b318ca89ab..cde4dd65147 100644 --- a/code/game/objects/items/implants/implantpad.dm +++ b/code/game/objects/items/implants/implantpad.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/weapons/items_and_weapons.dmi' icon_state = "implantpad-0" inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' throw_speed = 3 throw_range = 5 w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/implants/implantuplink.dm b/code/game/objects/items/implants/implantuplink.dm index e495a1216ab..30fbe6e4291 100644 --- a/code/game/objects/items/implants/implantuplink.dm +++ b/code/game/objects/items/implants/implantuplink.dm @@ -3,8 +3,8 @@ desc = "Sneeki breeki." icon = 'icons/obj/radio.dmi' icon_state = "radio" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' var/starting_tc = 0 /// The uplink flags of the implant uplink inside, only checked during initialisation so modifying it after initialisation will do nothing var/uplink_flag = UPLINK_TRAITORS diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm index b481cc69f6e..f50230ab2c5 100644 --- a/code/game/objects/items/pinpointer.dm +++ b/code/game/objects/items/pinpointer.dm @@ -9,8 +9,8 @@ w_class = WEIGHT_CLASS_SMALL inhand_icon_state = "electronic" worn_icon_state = "pinpointer" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' throw_speed = 3 throw_range = 7 custom_materials = list(/datum/material/iron = 500, /datum/material/glass = 250) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 9d5d1298e0f..ac626ade4b2 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -637,8 +637,8 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \ inhand_icon_state = "sheet-brass" icon = 'icons/obj/stack_objects.dmi' mats_per_unit = list(/datum/material/bronze = MINERAL_MATERIAL_AMOUNT) - lefthand_file = 'icons/mob/inhands/misc/sheets_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/sheets_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/sheets_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/sheets_righthand.dmi' resistance_flags = FIRE_PROOF | ACID_PROOF sheettype = "bronze" force = 5 diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm index 9bf0591c74a..c26ddaeedfe 100644 --- a/code/game/objects/items/stacks/sheets/sheets.dm +++ b/code/game/objects/items/stacks/sheets/sheets.dm @@ -1,7 +1,7 @@ /obj/item/stack/sheet name = "sheet" - lefthand_file = 'icons/mob/inhands/misc/sheets_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/sheets_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/sheets_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/sheets_righthand.dmi' full_w_class = WEIGHT_CLASS_NORMAL force = 5 throwforce = 5 diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 8f8f137a6f8..ff3a752be68 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -7,8 +7,8 @@ name = "broken tile" singular_name = "broken tile" desc = "A broken tile. This should not exist." - lefthand_file = 'icons/mob/inhands/misc/tiles_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/tiles_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/tiles_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/tiles_righthand.dmi' icon = 'icons/obj/tiles.dmi' w_class = WEIGHT_CLASS_NORMAL force = 1 diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index 415d8b4c6e7..f485052c29e 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -30,8 +30,8 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", icon_state = "bible" inhand_icon_state = "bible" worn_icon_state = "bible" - lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/books_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/books_righthand.dmi' var/mob/affecting = null var/deity_name = "Christ" force_string = "holy" diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 433368f935c..b47887f8a31 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -132,8 +132,8 @@ inhand_icon_state = "eggbox" icon_state = "eggbox" base_icon_state = "eggbox" - lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/food_righthand.dmi' name = "egg box" desc = "A carton for containing eggs." spawn_type = /obj/item/food/egg @@ -433,8 +433,8 @@ inhand_icon_state = "chocolatebox" icon_state = "chocolatebox" base_icon_state = "chocolatebox" - lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/food_righthand.dmi' contents_tag = "chocolate" spawn_type = /obj/item/food/tinychocolate spawn_count = 8 diff --git a/code/game/objects/items/storage/sixpack.dm b/code/game/objects/items/storage/sixpack.dm index c0c9af6be57..82f528c1380 100644 --- a/code/game/objects/items/storage/sixpack.dm +++ b/code/game/objects/items/storage/sixpack.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/storage/storage.dmi' icon_state = "canholder" inhand_icon_state = "cola" - lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/food_righthand.dmi' custom_materials = list(/datum/material/plastic = 1200) max_integrity = 500 diff --git a/code/game/objects/items/tcg/tcg.dm b/code/game/objects/items/tcg/tcg.dm index e5c0210bbaa..764cb48de1a 100644 --- a/code/game/objects/items/tcg/tcg.dm +++ b/code/game/objects/items/tcg/tcg.dm @@ -388,8 +388,8 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices) icon = 'icons/obj/toys/tcgmisc.dmi' icon_state = "binder" inhand_icon_state = "album" - lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/books_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/books_righthand.dmi' resistance_flags = FLAMMABLE //burn your enemies' collections, for only you can Collect Them All! w_class = WEIGHT_CLASS_SMALL flags_1 = PREVENT_CONTENTS_EXPLOSION_1 diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index 5badeab736a..8b5b109f9c9 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -19,8 +19,8 @@ flags_1 = CONDUCT_1 w_class = WEIGHT_CLASS_SMALL inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' throw_speed = 3 throw_range = 7 custom_materials = list(/datum/material/iron=400) @@ -104,8 +104,8 @@ icon_state = "hand_tele" inhand_icon_state = "electronic" worn_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 @@ -320,8 +320,8 @@ throw_range = 10 flags_1 = CONDUCT_1 inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' //Uses of the device left var/charges = 4 //The maximum number of stored uses diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm index 19508395f96..c5cd3de9d79 100644 --- a/code/game/objects/items/theft_tools.dm +++ b/code/game/objects/items/theft_tools.dm @@ -46,8 +46,8 @@ icon = 'icons/obj/nuke_tools.dmi' icon_state = "core_container_empty" inhand_icon_state = "tile" - lefthand_file = 'icons/mob/inhands/misc/tiles_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/tiles_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/tiles_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/tiles_righthand.dmi' var/obj/item/nuke_core/core /obj/item/nuke_core_container/Destroy() diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index c54f061f2de..ce7aa0be1df 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -118,8 +118,8 @@ icon = 'icons/obj/toys/balloons.dmi' icon_state = "balloon" inhand_icon_state = "balloon" - lefthand_file = 'icons/mob/inhands/balloons_lefthand.dmi' - righthand_file = 'icons/mob/inhands/balloons_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/balloons_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/balloons_righthand.dmi' w_class = WEIGHT_CLASS_BULKY throwforce = 0 throw_speed = 3 @@ -688,8 +688,8 @@ desc = "A tool to help you write fictional devils!" icon = 'icons/obj/library.dmi' icon_state = "demonomicon" - lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/books_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/books_righthand.dmi' messages = list("You must challenge the devil to a dance-off!", "The devils true name is Ian", "The devil hates salt!", "Would you like infinite power?", "Would you like infinite wisdom?", " Would you like infinite healing?") w_class = WEIGHT_CLASS_SMALL recharge_time = 60 diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index cd589ed7405..bf952b42b65 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -1,8 +1,8 @@ //Added by Jack Rost /obj/item/trash icon = 'icons/obj/janitor.dmi' - lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/food_righthand.dmi' desc = "This is rubbish." w_class = WEIGHT_CLASS_TINY resistance_flags = FLAMMABLE diff --git a/code/game/objects/items/vending_items.dm b/code/game/objects/items/vending_items.dm index 443c48c8507..d67a0e43e74 100644 --- a/code/game/objects/items/vending_items.dm +++ b/code/game/objects/items/vending_items.dm @@ -9,8 +9,8 @@ icon_state = "refill_snack" inhand_icon_state = "restock_unit" desc = "A vending machine restock cart." - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' flags_1 = CONDUCT_1 force = 7 throwforce = 10 diff --git a/code/game/objects/items/wall_mounted.dm b/code/game/objects/items/wall_mounted.dm index 77d929a196b..4aab3898b24 100644 --- a/code/game/objects/items/wall_mounted.dm +++ b/code/game/objects/items/wall_mounted.dm @@ -84,8 +84,8 @@ icon = 'icons/obj/module.dmi' icon_state = "door_electronics" inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' flags_1 = CONDUCT_1 w_class = WEIGHT_CLASS_SMALL custom_materials = list(/datum/material/iron=50, /datum/material/glass=50) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 47241323e9d..e617330bbff 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -310,8 +310,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0) icon = 'icons/obj/chairs.dmi' icon_state = "chair_toppled" inhand_icon_state = "chair" - lefthand_file = 'icons/mob/inhands/misc/chairs_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/chairs_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/chairs_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/chairs_righthand.dmi' w_class = WEIGHT_CLASS_HUGE force = 8 throwforce = 10 @@ -532,8 +532,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0) icon = 'icons/obj/chairs.dmi' icon_state = "folded_chair" inhand_icon_state = "folded_chair" - lefthand_file = 'icons/mob/inhands/misc/chairs_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/chairs_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/chairs_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/chairs_righthand.dmi' w_class = WEIGHT_CLASS_NORMAL force = 7 throw_range = 5 //Lighter Weight --> Flies Farther. diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index bfda2e7fb06..95beabfd488 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -12,8 +12,8 @@ LINEN BINS name = "bedsheet" desc = "A surprisingly soft linen bedsheet." icon = 'icons/obj/bedsheets.dmi' - lefthand_file = 'icons/mob/inhands/misc/bedsheet_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/bedsheet_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/bedsheet_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/bedsheet_righthand.dmi' icon_state = "sheetwhite" inhand_icon_state = "sheetwhite" slot_flags = ITEM_SLOT_NECK diff --git a/code/modules/antagonists/abductor/equipment/glands/blood.dm b/code/modules/antagonists/abductor/equipment/glands/blood.dm index e5ffd025da7..522354fac3a 100644 --- a/code/modules/antagonists/abductor/equipment/glands/blood.dm +++ b/code/modules/antagonists/abductor/equipment/glands/blood.dm @@ -4,8 +4,8 @@ cooldown_high = 1800 uses = -1 icon_state = "egg" - lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/food_righthand.dmi' mind_control_uses = 3 mind_control_duration = 1500 diff --git a/code/modules/antagonists/abductor/equipment/glands/egg.dm b/code/modules/antagonists/abductor/equipment/glands/egg.dm index b8e5fceda0d..938caeeb361 100644 --- a/code/modules/antagonists/abductor/equipment/glands/egg.dm +++ b/code/modules/antagonists/abductor/equipment/glands/egg.dm @@ -4,8 +4,8 @@ cooldown_high = 400 uses = -1 icon_state = "egg" - lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/food_righthand.dmi' mind_control_uses = 2 mind_control_duration = 1800 diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 8c6fbfe8a59..2013182c461 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -325,8 +325,8 @@ name = "\improper magical aura" desc = "A sinister looking aura that distorts the flow of reality around it." icon = 'icons/obj/weapons/items_and_weapons.dmi' - lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/touchspell_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/touchspell_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/touchspell_righthand.dmi' icon_state = "disintegrate" inhand_icon_state = "disintegrate" item_flags = NEEDS_PERMIT | ABSTRACT | DROPDEL diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index e9fa9507a35..67d41d50ef6 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -888,8 +888,8 @@ Striking a noncultist, however, will tear their flesh."} name = "\improper magical aura" desc = "Sinister looking aura that distorts the flow of reality around it." icon = 'icons/obj/weapons/items_and_weapons.dmi' - lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/touchspell_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/touchspell_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/touchspell_righthand.dmi' icon_state = "disintegrate" inhand_icon_state = "disintegrate" item_flags = ABSTRACT | DROPDEL diff --git a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm index 360d664f6bd..816748d1451 100644 --- a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm +++ b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm @@ -5,8 +5,8 @@ flags_1 = CONDUCT_1 item_flags = NOBLUDGEON inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' w_class = WEIGHT_CLASS_SMALL var/friendlyName var/savedName diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm index 9de064e8306..318c4600cdf 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm @@ -10,8 +10,8 @@ GLOBAL_LIST_EMPTY(jam_on_wardec) icon = 'icons/obj/device.dmi' icon_state = "gangtool-red" inhand_icon_state = "radio" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' desc = "Use to send a declaration of hostilities to the target, delaying your shuttle departure for 20 minutes while they prepare for your assault. \ Such a brazen move will attract the attention of powerful benefactors within the Syndicate, who will supply your team with a massive amount of bonus telecrystals. \ Must be used within five minutes, or your benefactors will lose interest." diff --git a/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm b/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm index faac6c3f45c..4baa92ff673 100644 --- a/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm +++ b/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm @@ -132,8 +132,8 @@ icon = 'icons/obj/device.dmi' icon_state = "weakpoint_locator" inhand_icon_state = "weakpoint_locator" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 46baeb75362..8dca1d0a0dd 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -214,8 +214,8 @@ icon = 'icons/obj/wizard.dmi' icon_state = "necrostone" inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' w_class = WEIGHT_CLASS_TINY var/list/spooky_scaries = list() var/unlimited = 0 diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm index eea3bd349b9..e875ca2499b 100644 --- a/code/modules/antagonists/wizard/equipment/soulstone.dm +++ b/code/modules/antagonists/wizard/equipment/soulstone.dm @@ -3,8 +3,8 @@ icon = 'icons/obj/wizard.dmi' icon_state = "soulstone" inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' layer = HIGH_OBJ_LAYER desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefact's power." w_class = WEIGHT_CLASS_TINY diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index f24297d1624..9ef44fc61ae 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -2,8 +2,8 @@ name = "bomb" icon = 'icons/obj/atmospherics/tank.dmi' inhand_icon_state = "assembly" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' throwforce = 5 w_class = WEIGHT_CLASS_NORMAL throw_speed = 2 diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 32191f31da5..fb551a44e41 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -3,8 +3,8 @@ icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = "assembly_holder" inhand_icon_state = "assembly" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' flags_1 = CONDUCT_1 throwforce = 5 w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 6e84d709dd4..5415ec6b5af 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -3,8 +3,8 @@ desc = "Used to remotely activate devices. Allows for syncing when using a secure signaler on another." icon_state = "signaller" inhand_icon_state = "signaler" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' custom_materials = list(/datum/material/iron=400, /datum/material/glass=120) wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE attachable = TRUE diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index 80d3ef0ef98..414484c6dcf 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -29,8 +29,8 @@ B.deity_name = "Narsie" B.icon_state = "melted" B.inhand_icon_state = "melted" - B.lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi' - B.righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi' + B.lefthand_file = 'icons/mob/inhands/items/books_lefthand.dmi' + B.righthand_file = 'icons/mob/inhands/items/books_righthand.dmi' new /obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_bible(B) new /obj/item/pen(B) return INITIALIZE_HINT_QDEL diff --git a/code/modules/cargo/export_scanner.dm b/code/modules/cargo/export_scanner.dm index 26d0422c7f8..16091ee2cb1 100644 --- a/code/modules/cargo/export_scanner.dm +++ b/code/modules/cargo/export_scanner.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/device.dmi' icon_state = "export_scanner" inhand_icon_state = "radio" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' item_flags = NOBLUDGEON w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/cargo/supplypod_beacon.dm b/code/modules/cargo/supplypod_beacon.dm index 746cf8946f0..e1b3bcd71fa 100644 --- a/code/modules/cargo/supplypod_beacon.dm +++ b/code/modules/cargo/supplypod_beacon.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/device.dmi' icon_state = "supplypod_beacon" inhand_icon_state = "radio" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' w_class = WEIGHT_CLASS_SMALL var/obj/machinery/computer/cargo/express/express_console var/linked = FALSE diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm index ad483b67861..8a10a9e615b 100644 --- a/code/modules/detectivework/scanner.dm +++ b/code/modules/detectivework/scanner.dm @@ -10,8 +10,8 @@ w_class = WEIGHT_CLASS_SMALL inhand_icon_state = "electronic" worn_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' flags_1 = CONDUCT_1 item_flags = NOBLUDGEON slot_flags = ITEM_SLOT_BELT diff --git a/code/modules/experisci/handheld_scanner.dm b/code/modules/experisci/handheld_scanner.dm index d3cb2fecf57..648eb0a0c5b 100644 --- a/code/modules/experisci/handheld_scanner.dm +++ b/code/modules/experisci/handheld_scanner.dm @@ -9,8 +9,8 @@ w_class = WEIGHT_CLASS_SMALL icon = 'icons/obj/device.dmi' icon_state = "experiscanner" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' /obj/item/experi_scanner/Initialize(mapload) ..() diff --git a/code/modules/explorer_drone/loot.dm b/code/modules/explorer_drone/loot.dm index 970431360e1..894c6f7edb5 100644 --- a/code/modules/explorer_drone/loot.dm +++ b/code/modules/explorer_drone/loot.dm @@ -143,8 +143,8 @@ GLOBAL_LIST_INIT(adventure_loot_generator_index,generate_generator_index()) icon = 'icons/obj/exploration.dmi' icon_state = "firelance" inhand_icon_state = "firelance" - righthand_file = 'icons/mob/inhands/misc/firelance_righthand.dmi' - lefthand_file = 'icons/mob/inhands/misc/firelance_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/firelance_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/firelance_lefthand.dmi' var/windup_time = 10 SECONDS var/melt_range = 3 var/charge_per_use = 200 diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm index f8176b73e66..a7d5d460a1d 100644 --- a/code/modules/food_and_drinks/pizzabox.dm +++ b/code/modules/food_and_drinks/pizzabox.dm @@ -13,8 +13,8 @@ icon_state = "pizzabox" base_icon_state = "pizzabox" inhand_icon_state = "pizzabox" - lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/food_righthand.dmi' custom_materials = list(/datum/material/cardboard = 2000) var/open = FALSE diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 6da63e39357..fc7489b8330 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -92,8 +92,8 @@ resistance_flags = FLAMMABLE w_class = WEIGHT_CLASS_TINY icon = 'icons/obj/food/food.dmi' - lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/food_righthand.dmi' obj_flags = UNIQUE_RENAME /obj/item/surprise_egg/Initialize(mapload) diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index 76c8633350f..b997cf9a556 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -59,8 +59,8 @@ seed = /obj/item/seeds/banana name = "banana peel" desc = "A peel from a banana." - lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/food_righthand.dmi' icon_state = "banana_peel" inhand_icon_state = "banana_peel" w_class = WEIGHT_CLASS_TINY diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index e09a69d9706..2fc52508cbc 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -199,8 +199,8 @@ name = "pack of moonflower seeds" desc = "These seeds grow into moonflowers." icon_state = "seed-moonflower" - lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/food_righthand.dmi' species = "moonflower" plantname = "Moonflowers" icon_grow = "moonflower-grow" @@ -283,8 +283,8 @@ base_icon_state = "rose" icon_state = "rose" worn_icon_state = "rose" - lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/food_righthand.dmi' slot_flags = ITEM_SLOT_HEAD | ITEM_SLOT_MASK alternate_worn_layer = ABOVE_BODY_FRONT_HEAD_LAYER bite_consumption_mod = 2 diff --git a/code/modules/library/lib_codex_gigas.dm b/code/modules/library/lib_codex_gigas.dm index c7452cf4dcf..b9b1e2fc029 100644 --- a/code/modules/library/lib_codex_gigas.dm +++ b/code/modules/library/lib_codex_gigas.dm @@ -2,8 +2,8 @@ name = "\improper Codex Gigas" desc = "A book documenting the nature of devils." icon_state ="demonomicon" - lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/books_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/books_righthand.dmi' throw_speed = 1 throw_range = 10 resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index 54cb61fda9d..4961a16e003 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -254,8 +254,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32) name = "Landing Field Designator" icon_state = "gangtool-purple" inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' desc = "Deploy to designate the landing zone of the auxiliary base." w_class = WEIGHT_CLASS_SMALL shuttle_id = "colony_drop" diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm index 438ea5d8063..4a1a1b445dc 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -6,8 +6,8 @@ icon_state = "Jaunter" inhand_icon_state = "electronic" worn_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index e607fcaccba..d9f0e239908 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -12,8 +12,8 @@ icon_state = "std_mod" w_class = WEIGHT_CLASS_GIGANTIC inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' flags_1 = CONDUCT_1 ///Host of this model var/mob/living/silicon/robot/robot diff --git a/code/modules/mod/mod_core.dm b/code/modules/mod/mod_core.dm index 79422230f16..cf295ceae59 100644 --- a/code/modules/mod/mod_core.dm +++ b/code/modules/mod/mod_core.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/clothing/modsuit/mod_construction.dmi' icon_state = "mod-core" inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' /// MOD unit we are powering. var/obj/item/mod/control/mod diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm index f9a8e46a882..ea711dddfe1 100644 --- a/code/modules/modular_computers/hardware/network_card.dm +++ b/code/modules/modular_computers/hardware/network_card.dm @@ -64,8 +64,8 @@ long_range = 1 power_usage = 100 // Better range but higher power usage. icon_state = "radio" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' w_class = WEIGHT_CLASS_TINY /obj/item/computer_hardware/network_card/wired diff --git a/code/modules/pai/card.dm b/code/modules/pai/card.dm index d1cde491085..2e4b2b3bee8 100644 --- a/code/modules/pai/card.dm +++ b/code/modules/pai/card.dm @@ -4,10 +4,10 @@ icon = 'icons/obj/aicards.dmi' icon_state = "pai" inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' name = "personal AI device" resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL worn_icon_state = "electronic" diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 96e823039cf..5b80981dc2d 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -121,6 +121,6 @@ desc = "A roll of paper. Use it on a hand labeler to refill it." icon_state = "labeler_refill" inhand_icon_state = "electropack" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' w_class = WEIGHT_CLASS_TINY diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 7f4eeb34e8f..db90ee7cda0 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -6,8 +6,8 @@ icon = 'icons/obj/bureaucracy.dmi' icon_state = "paper_bin0" inhand_icon_state = "sheet-metal" - lefthand_file = 'icons/mob/inhands/misc/sheets_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/sheets_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/sheets_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/sheets_righthand.dmi' throwforce = 0 w_class = WEIGHT_CLASS_NORMAL throw_speed = 3 diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm index 05199f50e49..d174324d1b3 100644 --- a/code/modules/photography/camera/camera.dm +++ b/code/modules/photography/camera/camera.dm @@ -8,8 +8,8 @@ icon_state = "camera" inhand_icon_state = "camera" worn_icon_state = "camera" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' light_system = MOVABLE_LIGHT //Used as a flash here. light_range = 8 light_color = COLOR_WHITE diff --git a/code/modules/photography/camera/film.dm b/code/modules/photography/camera/film.dm index b7564a829f8..2129dbaa289 100644 --- a/code/modules/photography/camera/film.dm +++ b/code/modules/photography/camera/film.dm @@ -7,8 +7,8 @@ desc = "A camera film cartridge. Insert it into a camera to reload it." icon_state = "film" inhand_icon_state = "electropack" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' w_class = WEIGHT_CLASS_TINY resistance_flags = FLAMMABLE custom_materials = list(/datum/material/iron = 10, /datum/material/glass = 10) diff --git a/code/modules/photography/photos/album.dm b/code/modules/photography/photos/album.dm index 437670cd06a..64b6c07748e 100644 --- a/code/modules/photography/photos/album.dm +++ b/code/modules/photography/photos/album.dm @@ -7,8 +7,8 @@ icon = 'icons/obj/weapons/items_and_weapons.dmi' icon_state = "album" inhand_icon_state = "album" - lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/books_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/books_righthand.dmi' resistance_flags = FLAMMABLE w_class = WEIGHT_CLASS_SMALL flags_1 = PREVENT_CONTENTS_EXPLOSION_1 diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 8fbec995937..0254d39c2b6 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -13,8 +13,8 @@ icon = 'icons/obj/power.dmi' icon_state = "cell" inhand_icon_state = "cell" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' force = 5 throwforce = 5 throw_speed = 2 diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 791e69f7df6..872efe0ba14 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -257,8 +257,8 @@ icon = 'icons/obj/solar.dmi' icon_state = "sp_base" inhand_icon_state = "electropack" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' w_class = WEIGHT_CLASS_BULKY // Pretty big! anchored = FALSE var/tracker = 0 @@ -301,7 +301,7 @@ return set_anchored(!anchored) user.visible_message( - span_notice("[user] [anchored ? null : "un"]wrenches the solar assembly [anchored ? "into place" : null]."), + span_notice("[user] [anchored ? null : "un"]wrenches the solar assembly [anchored ? "into place" : null]."), span_notice("You [anchored ? null : "un"]wrench the solar assembly [anchored ? "into place" : null]."), ) W.play_tool_sound(src, 75) diff --git a/code/modules/reagents/reagent_containers/condiment.dm b/code/modules/reagents/reagent_containers/condiment.dm index c79a43d12a7..cc719d275ce 100644 --- a/code/modules/reagents/reagent_containers/condiment.dm +++ b/code/modules/reagents/reagent_containers/condiment.dm @@ -11,8 +11,8 @@ icon = 'icons/obj/food/containers.dmi' icon_state = "emptycondiment" inhand_icon_state = "beer" //Generic held-item sprite until unique ones are made. - lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/food_righthand.dmi' reagent_flags = OPENCONTAINER obj_flags = UNIQUE_RENAME possible_transfer_amounts = list(1, 5, 10, 15, 20, 25, 30, 50) diff --git a/code/modules/reagents/reagent_containers/cups/_cup.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm index 12c1a5d016f..6c104a8010c 100644 --- a/code/modules/reagents/reagent_containers/cups/_cup.dm +++ b/code/modules/reagents/reagent_containers/cups/_cup.dm @@ -7,8 +7,8 @@ spillable = TRUE resistance_flags = ACID_PROOF - lefthand_file = 'icons/mob/inhands/misc/drinks_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/drinks_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/drinks_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/drinks_righthand.dmi' ///Like Edible's food type, what kind of drink is this? var/drink_type = NONE diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index c6d922c2632..43368fd0943 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -248,8 +248,8 @@ var/locked_destination = FALSE //if true, users can't open the destination tag window to prevent changing the tagger's current destination w_class = WEIGHT_CLASS_TINY inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT @@ -312,8 +312,8 @@ icon_state = "salestagger" worn_icon_state = "salestagger" inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' w_class = WEIGHT_CLASS_TINY slot_flags = ITEM_SLOT_BELT ///The account which is receiving the split profits. diff --git a/code/modules/religion/religion_structures.dm b/code/modules/religion/religion_structures.dm index 0d36a1f0f92..0674a840e25 100644 --- a/code/modules/religion/religion_structures.dm +++ b/code/modules/religion/religion_structures.dm @@ -83,8 +83,8 @@ desc = "A wooden totem with strange carvings on it." icon_state = "ritual_totem" inhand_icon_state = "sheet-wood" - lefthand_file = 'icons/mob/inhands/misc/sheets_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/sheets_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/sheets_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/sheets_righthand.dmi' //made out of a single sheet of wood custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT) item_flags = NO_PIXEL_RANDOM_DROP diff --git a/code/modules/research/anomaly/anomaly_core.dm b/code/modules/research/anomaly/anomaly_core.dm index f171c996575..d9235891374 100644 --- a/code/modules/research/anomaly/anomaly_core.dm +++ b/code/modules/research/anomaly/anomaly_core.dm @@ -4,8 +4,8 @@ desc = "The neutralized core of an anomaly. It'd probably be valuable for research." icon_state = "anomaly_core" inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' resistance_flags = FIRE_PROOF var/anomaly_type = /obj/effect/anomaly diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index 33b7789353a..400bbf66089 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -7,8 +7,8 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good icon_state = "RPED" inhand_icon_state = "RPED" worn_icon_state = "RPED" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' w_class = WEIGHT_CLASS_HUGE var/works_from_distance = FALSE var/pshoom_or_beepboopblorpzingshadashwoosh = 'sound/items/rped.ogg' @@ -213,8 +213,8 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good desc = "Special mechanical module made to store, sort, and apply standard machine parts." icon_state = "borgrped" inhand_icon_state = "RPED" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' /proc/cmp_rped_sort(obj/item/A, obj/item/B) return B.get_part_rating() - A.get_part_rating() diff --git a/code/modules/shuttle/assault_pod.dm b/code/modules/shuttle/assault_pod.dm index 02a7c2ae43e..edf33a4133f 100644 --- a/code/modules/shuttle/assault_pod.dm +++ b/code/modules/shuttle/assault_pod.dm @@ -22,8 +22,8 @@ icon = 'icons/obj/device.dmi' icon_state = "gangtool-red" inhand_icon_state = "radio" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' desc = "Used to select a landing zone for assault pods." var/shuttle_id = "steel_rain" var/dwidth = 3 diff --git a/code/modules/spells/spell_types/touch/_touch.dm b/code/modules/spells/spell_types/touch/_touch.dm index 2a35b1e97fd..2e07a6e1cef 100644 --- a/code/modules/spells/spell_types/touch/_touch.dm +++ b/code/modules/spells/spell_types/touch/_touch.dm @@ -220,8 +220,8 @@ name = "\improper outstretched hand" desc = "High Five?" icon = 'icons/obj/weapons/items_and_weapons.dmi' - lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/touchspell_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/touchspell_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/touchspell_righthand.dmi' icon_state = "latexballon" inhand_icon_state = null item_flags = NEEDS_PERMIT | ABSTRACT diff --git a/code/modules/uplink/uplink_devices.dm b/code/modules/uplink/uplink_devices.dm index 1c0a980dc48..5189ac5efa0 100644 --- a/code/modules/uplink/uplink_devices.dm +++ b/code/modules/uplink/uplink_devices.dm @@ -10,8 +10,8 @@ inhand_icon_state = "walkietalkie" worn_icon_state = "radio" desc = "A basic handheld radio that communicates with local telecommunication networks." - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' dog_fashion = /datum/dog_fashion/back flags_1 = CONDUCT_1 diff --git a/code/modules/vehicles/lavaboat.dm b/code/modules/vehicles/lavaboat.dm index 52f20f3ef1f..db62dc5fa70 100644 --- a/code/modules/vehicles/lavaboat.dm +++ b/code/modules/vehicles/lavaboat.dm @@ -21,8 +21,8 @@ icon = 'icons/obj/vehicles.dmi' icon_state = "oar" inhand_icon_state = "oar" - lefthand_file = 'icons/mob/inhands/misc/lavaland_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/lavaland_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/lavaland_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/lavaland_righthand.dmi' force = 12 w_class = WEIGHT_CLASS_NORMAL resistance_flags = LAVA_PROOF | FIRE_PROOF diff --git a/code/modules/vehicles/mecha/mecha_parts.dm b/code/modules/vehicles/mecha/mecha_parts.dm index 9950e78311b..54ab923be1f 100644 --- a/code/modules/vehicles/mecha/mecha_parts.dm +++ b/code/modules/vehicles/mecha/mecha_parts.dm @@ -339,8 +339,8 @@ icon = 'icons/obj/module.dmi' icon_state = "std_mod" inhand_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' flags_1 = CONDUCT_1 force = 5 w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/wiremod/shell/compact_remote.dm b/code/modules/wiremod/shell/compact_remote.dm index 15b80328d5d..bd8c3851fef 100644 --- a/code/modules/wiremod/shell/compact_remote.dm +++ b/code/modules/wiremod/shell/compact_remote.dm @@ -9,8 +9,8 @@ icon_state = "setup_small_simple" inhand_icon_state = "electronic" worn_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' light_system = MOVABLE_LIGHT_DIRECTIONAL light_on = FALSE diff --git a/code/modules/wiremod/shell/controller.dm b/code/modules/wiremod/shell/controller.dm index 190136e692c..7aef7d02f0a 100644 --- a/code/modules/wiremod/shell/controller.dm +++ b/code/modules/wiremod/shell/controller.dm @@ -10,8 +10,8 @@ icon_state = "setup_small_calc" inhand_icon_state = "electronic" worn_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' light_system = MOVABLE_LIGHT_DIRECTIONAL light_on = FALSE diff --git a/code/modules/wiremod/shell/keyboard.dm b/code/modules/wiremod/shell/keyboard.dm index 89616859daa..be7f0a531c8 100644 --- a/code/modules/wiremod/shell/keyboard.dm +++ b/code/modules/wiremod/shell/keyboard.dm @@ -4,8 +4,8 @@ icon_state = "setup_small_keyboard" inhand_icon_state = "electronic" worn_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' light_system = MOVABLE_LIGHT_DIRECTIONAL light_on = FALSE diff --git a/code/modules/wiremod/shell/scanner.dm b/code/modules/wiremod/shell/scanner.dm index 311084fcf12..363eb34e18f 100644 --- a/code/modules/wiremod/shell/scanner.dm +++ b/code/modules/wiremod/shell/scanner.dm @@ -9,8 +9,8 @@ icon_state = "setup_small" inhand_icon_state = "electronic" worn_icon_state = "electronic" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' light_system = MOVABLE_LIGHT_DIRECTIONAL light_on = FALSE diff --git a/icons/mob/inhands/balloons_lefthand.dmi b/icons/mob/inhands/items/balloons_lefthand.dmi similarity index 100% rename from icons/mob/inhands/balloons_lefthand.dmi rename to icons/mob/inhands/items/balloons_lefthand.dmi diff --git a/icons/mob/inhands/balloons_righthand.dmi b/icons/mob/inhands/items/balloons_righthand.dmi similarity index 100% rename from icons/mob/inhands/balloons_righthand.dmi rename to icons/mob/inhands/items/balloons_righthand.dmi diff --git a/icons/mob/inhands/misc/bedsheet_lefthand.dmi b/icons/mob/inhands/items/bedsheet_lefthand.dmi similarity index 100% rename from icons/mob/inhands/misc/bedsheet_lefthand.dmi rename to icons/mob/inhands/items/bedsheet_lefthand.dmi diff --git a/icons/mob/inhands/misc/bedsheet_righthand.dmi b/icons/mob/inhands/items/bedsheet_righthand.dmi similarity index 100% rename from icons/mob/inhands/misc/bedsheet_righthand.dmi rename to icons/mob/inhands/items/bedsheet_righthand.dmi diff --git a/icons/mob/inhands/misc/books_lefthand.dmi b/icons/mob/inhands/items/books_lefthand.dmi similarity index 100% rename from icons/mob/inhands/misc/books_lefthand.dmi rename to icons/mob/inhands/items/books_lefthand.dmi diff --git a/icons/mob/inhands/misc/books_righthand.dmi b/icons/mob/inhands/items/books_righthand.dmi similarity index 100% rename from icons/mob/inhands/misc/books_righthand.dmi rename to icons/mob/inhands/items/books_righthand.dmi diff --git a/icons/mob/inhands/misc/chairs_lefthand.dmi b/icons/mob/inhands/items/chairs_lefthand.dmi similarity index 100% rename from icons/mob/inhands/misc/chairs_lefthand.dmi rename to icons/mob/inhands/items/chairs_lefthand.dmi diff --git a/icons/mob/inhands/misc/chairs_righthand.dmi b/icons/mob/inhands/items/chairs_righthand.dmi similarity index 100% rename from icons/mob/inhands/misc/chairs_righthand.dmi rename to icons/mob/inhands/items/chairs_righthand.dmi diff --git a/icons/mob/inhands/misc/devices_lefthand.dmi b/icons/mob/inhands/items/devices_lefthand.dmi similarity index 100% rename from icons/mob/inhands/misc/devices_lefthand.dmi rename to icons/mob/inhands/items/devices_lefthand.dmi diff --git a/icons/mob/inhands/misc/devices_righthand.dmi b/icons/mob/inhands/items/devices_righthand.dmi similarity index 100% rename from icons/mob/inhands/misc/devices_righthand.dmi rename to icons/mob/inhands/items/devices_righthand.dmi diff --git a/icons/mob/inhands/misc/drinks_lefthand.dmi b/icons/mob/inhands/items/drinks_lefthand.dmi similarity index 100% rename from icons/mob/inhands/misc/drinks_lefthand.dmi rename to icons/mob/inhands/items/drinks_lefthand.dmi diff --git a/icons/mob/inhands/misc/drinks_righthand.dmi b/icons/mob/inhands/items/drinks_righthand.dmi similarity index 100% rename from icons/mob/inhands/misc/drinks_righthand.dmi rename to icons/mob/inhands/items/drinks_righthand.dmi diff --git a/icons/mob/inhands/misc/firelance_lefthand.dmi b/icons/mob/inhands/items/firelance_lefthand.dmi similarity index 100% rename from icons/mob/inhands/misc/firelance_lefthand.dmi rename to icons/mob/inhands/items/firelance_lefthand.dmi diff --git a/icons/mob/inhands/misc/firelance_righthand.dmi b/icons/mob/inhands/items/firelance_righthand.dmi similarity index 100% rename from icons/mob/inhands/misc/firelance_righthand.dmi rename to icons/mob/inhands/items/firelance_righthand.dmi diff --git a/icons/mob/inhands/misc/food_lefthand.dmi b/icons/mob/inhands/items/food_lefthand.dmi similarity index 100% rename from icons/mob/inhands/misc/food_lefthand.dmi rename to icons/mob/inhands/items/food_lefthand.dmi diff --git a/icons/mob/inhands/misc/food_righthand.dmi b/icons/mob/inhands/items/food_righthand.dmi similarity index 100% rename from icons/mob/inhands/misc/food_righthand.dmi rename to icons/mob/inhands/items/food_righthand.dmi diff --git a/icons/mob/inhands/misc/lavaland_lefthand.dmi b/icons/mob/inhands/items/lavaland_lefthand.dmi similarity index 100% rename from icons/mob/inhands/misc/lavaland_lefthand.dmi rename to icons/mob/inhands/items/lavaland_lefthand.dmi diff --git a/icons/mob/inhands/misc/lavaland_righthand.dmi b/icons/mob/inhands/items/lavaland_righthand.dmi similarity index 100% rename from icons/mob/inhands/misc/lavaland_righthand.dmi rename to icons/mob/inhands/items/lavaland_righthand.dmi diff --git a/icons/mob/inhands/misc/megaphone_lefthand.dmi b/icons/mob/inhands/items/megaphone_lefthand.dmi similarity index 100% rename from icons/mob/inhands/misc/megaphone_lefthand.dmi rename to icons/mob/inhands/items/megaphone_lefthand.dmi diff --git a/icons/mob/inhands/misc/megaphone_righthand.dmi b/icons/mob/inhands/items/megaphone_righthand.dmi similarity index 100% rename from icons/mob/inhands/misc/megaphone_righthand.dmi rename to icons/mob/inhands/items/megaphone_righthand.dmi diff --git a/icons/mob/inhands/misc/sheets_lefthand.dmi b/icons/mob/inhands/items/sheets_lefthand.dmi similarity index 100% rename from icons/mob/inhands/misc/sheets_lefthand.dmi rename to icons/mob/inhands/items/sheets_lefthand.dmi diff --git a/icons/mob/inhands/misc/sheets_righthand.dmi b/icons/mob/inhands/items/sheets_righthand.dmi similarity index 100% rename from icons/mob/inhands/misc/sheets_righthand.dmi rename to icons/mob/inhands/items/sheets_righthand.dmi diff --git a/icons/mob/inhands/misc/tiles_lefthand.dmi b/icons/mob/inhands/items/tiles_lefthand.dmi similarity index 100% rename from icons/mob/inhands/misc/tiles_lefthand.dmi rename to icons/mob/inhands/items/tiles_lefthand.dmi diff --git a/icons/mob/inhands/misc/tiles_righthand.dmi b/icons/mob/inhands/items/tiles_righthand.dmi similarity index 100% rename from icons/mob/inhands/misc/tiles_righthand.dmi rename to icons/mob/inhands/items/tiles_righthand.dmi diff --git a/icons/mob/inhands/misc/touchspell_lefthand.dmi b/icons/mob/inhands/items/touchspell_lefthand.dmi similarity index 100% rename from icons/mob/inhands/misc/touchspell_lefthand.dmi rename to icons/mob/inhands/items/touchspell_lefthand.dmi diff --git a/icons/mob/inhands/misc/touchspell_righthand.dmi b/icons/mob/inhands/items/touchspell_righthand.dmi similarity index 100% rename from icons/mob/inhands/misc/touchspell_righthand.dmi rename to icons/mob/inhands/items/touchspell_righthand.dmi