From f13dd85c4ca7486d550b65199d7dfe67b9ef6ee6 Mon Sep 17 00:00:00 2001
From: PyotrIgn <131798882+PyotrIgn@users.noreply.github.com>
Date: Tue, 14 May 2024 23:19:23 +0400
Subject: [PATCH] Revert "Trysort"

---
 .../Objects/Fun => BigBanana}/BigBanana.yml   |    0
 .../Prototypes/ADT/Body/Parts/stepan.yml      |  169 +
 .../ADT/Body/Prototypes/foodbot.yml           |   26 -
 .../Prototypes/ADT/Body/Prototypes/stepan.yml |   28 +
 .../ADT/Catalog/Cargo/cargo_adt.yml           |   42 -
 .../Fills/Backpacks/StarterGear/backpack.yml  |   93 -
 .../ADT/Catalog/Loadout/sponsor.yml           |   19 -
 .../channels.yml}                             |   15 -
 .../Customization/Markings/augbody.yml        |    0
 .../Customization/Markings/augmentsrobot.yml  |    0
 .../Customization/Markings/foxtails.yml       |    0
 .../Mobs => }/Customization/Markings/hair.yml |    0
 .../Mobs => }/Customization/Markings/head.yml |    0
 .../Customization/Markings/headaugs.yml       |    0
 .../Mobs => }/Customization/Markings/tale.yml |    0
 .../Prototypes/ADT/Damage/ADTmodifiers.yml    |   14 -
 .../ADT/{ => Demon}/Body/Organs/demon.yml     |    0
 .../ADT/{ => Demon}/Body/Parts/demon.yml      |    0
 .../ADT/{ => Demon}/Body/Prototypes/demon.yml |    0
 .../Customization/Markings/demon.yml          |    0
 .../player => Demon/Mobs/Player}/demon.yml    |    0
 .../Mobs/Species/demon.yml                    |    0
 .../ADT/{ => Demon}/Species/demon.yml         |    0
 .../ADT/{ => Drask}/Body/Organs/Drask.yml     |    0
 .../ADT/{ => Drask}/Body/Parts/Drask.yml      |    0
 .../ADT/{ => Drask}/Body/Prototypes/Drask.yml |    0
 .../Customization/Markings/Drask.yml          |    0
 .../player => Drask/Mobs/Player}/Drask.yml    |    0
 .../Mobs/Species/Drask.yml                    |    0
 .../{Datasets => Drask}/Names/name_drask.yml  |    0
 .../ADT/{ => Drask}/Species/drask.yml         |    0
 .../Cleanbot modify}/cleanbot.yml             |    0
 .../Drone-Antags}/DroneAntag.yml              |    0
 .../Drone-Antags/DroneAntag_Body.yml}         |    0
 .../Drone-Antags}/DroneAntag_Core.yml         |    0
 .../Drone-Antags}/DroneAntag_IPC.yml          |   16 +
 .../DroneAntag_InventoryTemplate.yml}         |    0
 .../Drone-Antags/DroneAntag_Spawner.yml}      |    0
 .../Drone-Antags/DroneAntag_StartingGear.yml  |  132 +
 .../Drone-Antags/DroneAntag_Turret.yml}       |   20 +-
 .../Drones/Drone-Antags/OLD_DroneAntag.yml    |  761 ++++
 .../Drone-Engineer/Body}/engineeringdrone.yml |    0
 .../Mobs/Player}/engineeringdrone.yml         |    0
 .../Drone-Medical/Body}/medicaldrone.yml      |    0
 .../Entities/Mobs/Player}/medicaldrone.yml    |    0
 .../Drone-Service/Body}/servicedrone.yml      |    0
 .../Entities/Mobs/Player/servicedrone.yml}    |    0
 .../ADT/Drones/Foodbot/Body/foodbot.yml       |   49 +
 .../Entities/Mobs/Player}/servicedrone.yml    |    0
 Resources/Prototypes/ADT/Drones/nar_si.yml    |  431 +++
 .../ADT/Entities/Clothing/Hands/gloves.yml    |   60 -
 .../Entities/Clothing/OuterClothing/armor.yml |   42 -
 .../Entities/Markers/Spawners/ghost_roles.yml |   16 -
 .../ADT/Entities/Mobs/Cyborgs/female_meka.yml |  275 --
 .../ADT/Entities/Mobs/Cyborgs/meka.yml        |  279 --
 .../ADT/Entities/Mobs/NPCs/DroneAntag.yml     |    9 -
 .../Consumable/Food/changeling_lavra.yml      |   31 -
 .../ADT/Entities/Objects/Fun/specialitems.yml |  185 -
 .../ADT/Entities/Objects/Misc/paper.yml       |   66 -
 .../Objects/Specific/Salvage/ore_bag.yml      |   28 -
 .../Ammunition/Cartridges/heavy_rifle.yml     |   18 -
 .../Ammunition/Projectiles/heavy_rifle.yml    |   23 -
 .../external_fax.yml => Fax/ExternalFax.yml}  |    0
 .../ADT/{ => Felinid}/Body/Organs/felinid.yml |    0
 .../{ => Felinid}/Body/Prototypes/felinid.yml |    0
 .../Mobs/Player}/felinid.yml                  |    0
 .../Mobs/Species/felinid.yml                  |    0
 .../ADT/Felinid/Sound/sound_collections.yml   |   35 +
 .../ADT/Felinid/Sound/speech_emote_sounds.yml |   97 +
 .../ADT/Felinid/Sound/speech_emotes.yml       |   66 +
 .../ADT/{ => Felinid}/Species/felinid.yml     |    0
 .../{Catalog => }/Fills/Crates/ADTrewards.yml |    0
 Resources/Prototypes/ADT/GameRules/events.yml |   12 -
 .../Prototypes/ADT/GameRules/midround.yml     |    9 -
 .../ADT/Hydroponics/buckwheat_plant.yml       |   21 +
 .../Prototypes/ADT/Hydroponics/cocoa_tree.yml |   21 +
 .../leaves/mutatedproduct.yml}                |    0
 .../Prototypes/ADT/Hydroponics/pumpkin.yml    |   24 +
 .../Prototypes/ADT/Hydroponics/seeds.yml      |   76 -
 .../{mutations.yml => seeds/mutated.yml}      |    0
 .../ADT/Hydroponics/seeds/seeds.yml           |   29 +
 .../Prototypes/ADT/IPC/sound_collections.yml  |   24 +
 .../ADT/IPC/speech_emote_sounds.yml           |   21 +
 .../Prototypes/ADT/IPC/speech_emotes.yml      |   45 +
 .../ADT/InventoryTemplates/foodbot.yml        |   20 -
 .../ADT/KD/Cargo/GravityForCargo.yml          |   19 +
 Resources/Prototypes/ADT/KD/Cargo/RingBox.yml |    9 +
 .../Prototypes/ADT/KD/Cargo/VectorCrate.yml   |    9 +
 .../Channels/Channels/DroneAntagChannel.yml   |    7 +
 .../KD/Channels/Channels/RoboticChannel.yml   |    6 +
 .../Channels/keys/DroneAntagKey.yml}          |   14 -
 .../ADT/KD/Channels/keys/RoboticKey.yml       |   13 +
 .../Prototypes/ADT/KD/Crates/VectorCrate.yml  |   11 +
 .../Entites/Clothing/Hat}/JayBeret.yml        |    0
 .../KD/Entites/Clothing/gloves/RingBlood.yml  |   14 +
 .../Entites/Clothing/gloves/RingEmerald.yml   |   14 +
 .../KD/Entites/Clothing/gloves/RingPlazma.yml |   14 +
 .../KD/Entites/Clothing/gloves/RingTurk.yml   |   14 +
 .../ADT/KD/Entites/Food/FoodTinMRECooked.yml  |   23 +
 .../Magic => KD/Entites/JessusX}/JessusX.yml  |    0
 .../Entites/Spawns}/UristSpawn.yml            |    0
 .../Entites/Storage}/RingStorage.yml          |    0
 .../Prototypes/ADT/KD/Entites/pen/pen.yml     |   16 +
 .../Prototypes/ADT/KD/FireBorn/FireBorn.yml   |   48 +
 .../ADT/KD/Receipt/Microwave/CookedTin.yml    |    8 +
 .../ADT/KD/gold-staner/gold-staner.yml        |   39 +
 .../NPCs/AshWalker}/AshWalker.yml             |    0
 .../NPCs/AshWalker/AshWalkerEquipment.yml}    |    0
 .../NPCs}/BaseHumLavalandMob.yml              |    0
 .../NPCs => Lavaland/NPCs/Hermit}/Hermit.yml  |    0
 .../NPCs/Hermit/HermitEquipment.yml}          |    0
 .../CC}/Field_Officer_Central_Committee.yml   |   10 +
 .../CC/Officer_Commander.yml}                 |    0
 .../ADT/Lixon/CC/Representative_CC.yml        |   40 +
 .../Lixon/CC/Special_Operations_Officer.yml   |   43 +
 .../ADT/Lixon/CC/VKF_Representative.yml       |   66 +
 .../Insulgon_Items/Holographic_Monocline.yml  |   30 +
 .../Insulgon_Items/White_Diplomat's_suit.yml  |   15 +
 .../ADT/Lixon/Kiirava_Magic_Wand.yml          |   50 +
 .../SecurityPilot.yml => Lixon/PilotSB.yml}   |    0
 .../ADT/Lixon/Storage_Implanter_Informant.yml |   32 +
 .../ADT/Lixon/Wedding_things/Veil.yml         |   10 +
 .../Lixon/Wedding_things/Wedding_dress.yml    |   10 +
 .../ADT/Lixon/Wedding_things/Wedding_ring.yml |   23 +
 .../ADT/Lixon/Yumi_Degurshavs_tail.yml        |   56 +
 .../Janitorial => Lixon/soap}/soap.yml        |    0
 .../Body/Parts/moth.yml                       |    0
 .../Body/Prototypes/moth.yml                  |    0
 .../Damage/modifier_sets.yml                  |    0
 .../Mobs/Customization/Markings/moth.yml      |    0
 .../Entities/Mobs/Player/moth.yml             |    0
 .../Entities/Mobs/Species/moth.yml            |    0
 .../Names/first_female_moth.yml               |    0
 .../Names/first_male_moth.yml                 |    0
 .../Names/last_moth.yml                       |    0
 .../Species/moth.yml                          |    0
 .../ADT/{Entities/Mobs/NPCs => }/Narcotic.yml |   18 +
 .../ADT/{ => Novakid}/Body/Organs/novakid.yml |    0
 .../ADT/{ => Novakid}/Body/Parts/novakid.yml  |    0
 .../{ => Novakid}/Body/Prototypes/novakid.yml |    0
 .../Customization/Markings/novakid.yml        |    0
 .../Mobs/Player}/novakid.yml                  |    0
 .../Mobs/Species/novakid.yml                  |  138 +
 .../Names/first_novakid.yml                   |    0
 .../Names/last_novakid.yml                    |    0
 .../ADT/{ => Novakid}/Species/novakid.yml     |    0
 Resources/Prototypes/ADT/Objectives/base.yml  |   11 -
 .../ADT/Reagents/Consumable/Drink/alcohol.yml |    0
 .../Consumable/Food/buckwheat_solid.yml       |   18 +
 .../Reagents/Consumable/Food/cocoa_solid.yml  |   20 +
 .../Consumable/Food/condensed_milk.yml        |   18 +
 .../ADT/Reagents/Consumable/Food/food.yml     |   58 -
 .../Prototypes/ADT/Reagents/medicine.yml      |   53 -
 .../Prototypes/ADT/Reagents/narcotics.yml     |   45 -
 .../ADT/Reagents/patch_medicine.yml           |   52 +
 Resources/Prototypes/ADT/Reagents/toxins.yml  |   38 -
 .../Graph/{clothing => }/Clothing.yml         |    0
 .../Graph/{structures => }/adtstool.yml       |    0
 .../Graph/{structures => }/adttable.yml       |    0
 .../Graph/{structures => }/bonfire.yml        |    0
 .../Graph/{fun => }/discoball.yml             |    0
 .../Graph/{fun/glassbreak.yml => drinks.yml}  |    0
 .../Graph/{structures => }/fireplace.yml      |    0
 .../Construction/Graph/{food => }/fish.yml    |    0
 .../Construction/Graph/furniture/exist.yml    |    0
 .../gravity_generator_broken.yml              |    0
 .../Construction/Graph/materials/exist.yml    |    0
 .../Construction/Graph/mechs/exist.yml        |    0
 .../Graph/{structures => }/roundtable.yml     |    0
 .../Graph/{fun => }/secretbook.yml            |    0
 .../Construction/Graph/tools/exist.yml        |    0
 .../Construction/Graph/utilities/exist.yml    |    0
 .../Construction/Graph/weapons/exist.yml      |    0
 .../Cooking/buckwheat_kasha_recipe.yml        |   29 +
 .../ADT/Recipes/Cooking/cannabis_white.yml    |    7 +
 .../food.yml => Cooking/choco_bar_recipe.yml} |    0
 .../Recipes/Cooking/choco_drink_recipe.yml    |   17 +
 .../ADT/Recipes/Cooking/croissant_recipe.yml  |   55 +
 .../ADT/Recipes/Cooking/drinks_recipe.yml     |   95 -
 .../ADT/Recipes/Cooking/fishrecipes.yml       |   35 +
 .../ADT/Recipes/Cooking/fried_egg_recipe.yml  |   10 +
 .../ADT/Recipes/Cooking/khachapuri_recipe.yml |   12 +
 .../ADT/Recipes/Cooking/meal_recipe.yml       |  270 --
 .../ADT/Recipes/Cooking/meat_recipe.yml       |   41 +
 .../ADT/Recipes/Cooking/sausage_recipe.yml    |   19 +
 .../ADT/Recipes/Cooking/shawerma_recipe.yml   |   43 +
 .../ADT/Recipes/Cooking/vulpix_recipe.yml     |   10 +
 .../ADT/Recipes/Reactions/cocoa_react.yml     |   11 +
 ...inks.yml => just_kekc_coctails_recipe.yml} |  121 -
 .../ADT/Recipes/Reactions/medicine.yml        |   32 -
 .../ADT/Recipes/Reactions/new_year.yml        |  185 +
 .../Reactions/patch_medicine_recipe.yml       |   30 +
 .../ADT/Recipes/Reactions/toxins.yml          |   16 +-
 .../ADT/{ => Shark}/Body/Organs/Shark.yml     |    0
 .../ADT/{ => Shark}/Body/Parts/Shark.yml      |    0
 .../ADT/{ => Shark}/Body/Prototypes/Shark.yml |    0
 .../Entities/Mobs/Player}/Shark.yml           |    0
 .../Entities/Mobs/Species/Shark.yml           |    0
 .../Names/first_female_shark.yml              |    0
 .../Names/first_male_shark.yml                |    0
 .../{Datasets => Shark}/Names/last_shark.yml  |    0
 .../ADT/{ => Shark}/Species/Shark.yml         |    0
 .../ADT/SoundCollections/emotes.yml           |  105 -
 .../ADT/SoundCollections/screams.yml          |   39 -
 .../Misc => SoundGen}/soundgenerators.yml     |    0
 .../ADT/StartingGear/Events/DroneAntag.yml    |   40 -
 .../Prototypes/ADT/StartingGear/Navi.yml      |   16 -
 .../StartingGear/centcomrepresentativeL.yml   |   13 -
 .../ADT/StartingGear/specialofficer.yml       |   15 -
 .../ADT/{ => Tajaran}/Body/Organs/Tajaran.yml |    0
 .../ADT/{ => Tajaran}/Body/Parts/Tajaran.yml  |    0
 .../{ => Tajaran}/Body/Prototypes/Tajaran.yml |    0
 .../Mobs/Customization/Markings/Tajaran.yml   |    0
 .../Entities/Mobs/Player}/Tajaran.yml         |    0
 .../Entities/Mobs/Species/Tajaran.yml         |    0
 .../Names/first_female_tajaran.yml            |    0
 .../Names/first_male_tajaran.yml              |    0
 .../Names/last_tajaran.yml                    |    0
 .../ADT/{ => Tajaran}/Species/Tajaran.yml     |    0
 .../ADT/Tajaran/Voice/sound_collections.yml   |   45 +
 .../ADT/Tajaran/Voice/speech_emote_sounds.yml |   97 +
 .../ADT/Tajaran/Voice/speech_emotes.yml       |   66 +
 .../base_meka.yml => Tallrobot/base.yml}      |    0
 .../ADT/Tallrobot/fmeka/fmekacargo.yml        |   54 +
 .../ADT/Tallrobot/fmeka/fmekaeng.yml          |   54 +
 .../ADT/Tallrobot/fmeka/fmekajani.yml         |   55 +
 .../ADT/Tallrobot/fmeka/fmekamed.yml          |   54 +
 .../ADT/Tallrobot/fmeka/fmekaserve.yml        |   54 +
 .../ADT/Tallrobot/meka/mekacargo.yml          |   54 +
 .../Prototypes/ADT/Tallrobot/meka/mekaeng.yml |   54 +
 .../ADT/Tallrobot/meka/mekajani.yml           |   59 +
 .../Prototypes/ADT/Tallrobot/meka/mekamed.yml |   54 +
 .../ADT/Tallrobot/meka/mekaserve.yml          |   54 +
 .../Structures/Specific => Tardis}/tardis.yml |    2 +-
 .../Tiles/{plating.yml => halloween_tile.yml} |    0
 .../ADT/{ => Ursus}/Body/Organs/Ursus.yml     |    0
 .../ADT/{ => Ursus}/Body/Parts/Ursus.yml      |    0
 .../ADT/{ => Ursus}/Body/Prototypes/Ursus.yml |    0
 .../Mobs/Customization/Markings/Ursus.yml     |    0
 .../Customization/Markings/Ursus_hair.yml     |    0
 .../Entities/Mobs/Player}/Ursus.yml           |    0
 .../Entities/Mobs/Species/Ursus.yml           |    0
 .../Names/first_female_urs.yml                |    0
 .../Names/first_male_urs.yml                  |    0
 .../Names/last_female_urs.yml                 |    0
 .../Names/last_male_urs.yml                   |    0
 .../ADT/Ursus/Sound/sound_collections.yml     |   19 +
 .../ADT/Ursus/Sound/speech_emote_sounds.yml   |   85 +
 .../ADT/{ => Ursus}/Species/Ursus.yml         |    0
 Resources/Prototypes/ADT/Ursus/faction.yml    |    7 +
 .../ADT/Voice/speech_emote_sounds.yml         |  424 ---
 .../Prototypes/ADT/Voice/speech_emotes.yml    |  180 +-
 .../{ => Vulpkanin}/Body/Organs/Vulpkanin.yml |    0
 .../{ => Vulpkanin}/Body/Parts/Vulpkanin.yml  |    0
 .../Body/Prototypes/Vulpkanin.yml             |    0
 .../Mobs/Customization/Markings/Vulpkanin.yml |    0
 .../Customization/Markings/Vulpkanin_hair.yml | 3136 ++++++++---------
 .../Entities/Mobs/Player}/Vulpkanin.yml       |    0
 .../Entities/Mobs/Species/Vulpkanin.yml       |    0
 .../Names/first_female_vulp.yml               |    0
 .../Names/first_male_vulp.yml                 |    0
 .../Names/last_vulp.yml                       |    0
 .../ADT/{ => Vulpkanin}/Species/Vulpkanin.yml |    0
 .../alert_changeling.yml}                     |    0
 .../{Actions => changeling}/changeling.yml    |   67 -
 .../{Catalog => changeling}/ling_catalog.yml  |    0
 .../changeling.yml => changeling/mobs.yml}    |  158 +-
 .../objectives_changeling.yml}                |   12 +
 .../role_changeling.yml}                      |    0
 Resources/Prototypes/ADT/ling_unturnable.yml  |   78 +
 .../ADT/{Polymorphs => }/polymorphs.yml       |    0
 .../wizard.yml => wizard/abilities.yml}       |    0
 .../Magic/books.yml => wizard/spellbook.yml}  |    0
 .../wizard.yml => wizard/wizard_catalog.yml}  |    0
 274 files changed, 6069 insertions(+), 4598 deletions(-)
 rename Resources/Prototypes/ADT/{Entities/Objects/Fun => BigBanana}/BigBanana.yml (100%)
 create mode 100644 Resources/Prototypes/ADT/Body/Parts/stepan.yml
 delete mode 100644 Resources/Prototypes/ADT/Body/Prototypes/foodbot.yml
 create mode 100644 Resources/Prototypes/ADT/Body/Prototypes/stepan.yml
 delete mode 100644 Resources/Prototypes/ADT/Catalog/Loadout/sponsor.yml
 rename Resources/Prototypes/ADT/{radio_channels.yml => CollectiveMind/channels.yml} (69%)
 rename Resources/Prototypes/ADT/{Entities/Mobs => }/Customization/Markings/augbody.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs => }/Customization/Markings/augmentsrobot.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs => }/Customization/Markings/foxtails.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs => }/Customization/Markings/hair.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs => }/Customization/Markings/head.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs => }/Customization/Markings/headaugs.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs => }/Customization/Markings/tale.yml (100%)
 rename Resources/Prototypes/ADT/{ => Demon}/Body/Organs/demon.yml (100%)
 rename Resources/Prototypes/ADT/{ => Demon}/Body/Parts/demon.yml (100%)
 rename Resources/Prototypes/ADT/{ => Demon}/Body/Prototypes/demon.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs => Demon}/Customization/Markings/demon.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs/player => Demon/Mobs/Player}/demon.yml (100%)
 rename Resources/Prototypes/ADT/{Entities => Demon}/Mobs/Species/demon.yml (100%)
 rename Resources/Prototypes/ADT/{ => Demon}/Species/demon.yml (100%)
 rename Resources/Prototypes/ADT/{ => Drask}/Body/Organs/Drask.yml (100%)
 rename Resources/Prototypes/ADT/{ => Drask}/Body/Parts/Drask.yml (100%)
 rename Resources/Prototypes/ADT/{ => Drask}/Body/Prototypes/Drask.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs => Drask}/Customization/Markings/Drask.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs/player => Drask/Mobs/Player}/Drask.yml (100%)
 rename Resources/Prototypes/ADT/{Entities => Drask}/Mobs/Species/Drask.yml (100%)
 rename Resources/Prototypes/ADT/{Datasets => Drask}/Names/name_drask.yml (100%)
 rename Resources/Prototypes/ADT/{ => Drask}/Species/drask.yml (100%)
 rename Resources/Prototypes/ADT/{Body/Prototypes => Drones/Cleanbot modify}/cleanbot.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs/Species => Drones/Drone-Antags}/DroneAntag.yml (100%)
 rename Resources/Prototypes/ADT/{Body/Prototypes/DroneAntags.yml => Drones/Drone-Antags/DroneAntag_Body.yml} (100%)
 rename Resources/Prototypes/ADT/{Entities/Objects/Specific => Drones/Drone-Antags}/DroneAntag_Core.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs/Species => Drones/Drone-Antags}/DroneAntag_IPC.yml (98%)
 rename Resources/Prototypes/ADT/{InventoryTemplates/DroneAntag.yml => Drones/Drone-Antags/DroneAntag_InventoryTemplate.yml} (100%)
 rename Resources/Prototypes/ADT/{Entities/Markers/Spawners/drones.yml => Drones/Drone-Antags/DroneAntag_Spawner.yml} (100%)
 create mode 100644 Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_StartingGear.yml
 rename Resources/Prototypes/ADT/{ai_faction.yml => Drones/Drone-Antags/DroneAntag_Turret.yml} (51%)
 create mode 100644 Resources/Prototypes/ADT/Drones/Drone-Antags/OLD_DroneAntag.yml
 rename Resources/Prototypes/ADT/{Body/Prototypes => Drones/Drone-Engineer/Body}/engineeringdrone.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs/player => Drones/Drone-Engineer/Entities/Mobs/Player}/engineeringdrone.yml (100%)
 rename Resources/Prototypes/ADT/{Body/Prototypes => Drones/Drone-Medical/Body}/medicaldrone.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs/player => Drones/Drone-Medical/Entities/Mobs/Player}/medicaldrone.yml (100%)
 rename Resources/Prototypes/ADT/{Body/Prototypes => Drones/Drone-Service/Body}/servicedrone.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs/player/servicedrone_alt.yml => Drones/Drone-Service/Entities/Mobs/Player/servicedrone.yml} (100%)
 create mode 100644 Resources/Prototypes/ADT/Drones/Foodbot/Body/foodbot.yml
 rename Resources/Prototypes/ADT/{Entities/Mobs/player => Drones/Foodbot/Entities/Mobs/Player}/servicedrone.yml (100%)
 create mode 100644 Resources/Prototypes/ADT/Drones/nar_si.yml
 delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml
 delete mode 100644 Resources/Prototypes/ADT/Entities/Markers/Spawners/ghost_roles.yml
 delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/female_meka.yml
 delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/meka.yml
 delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/NPCs/DroneAntag.yml
 delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/changeling_lavra.yml
 delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/specialitems.yml
 delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Specific/Salvage/ore_bag.yml
 delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
 delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
 rename Resources/Prototypes/ADT/{Entities/Structures/Machines/external_fax.yml => Fax/ExternalFax.yml} (100%)
 rename Resources/Prototypes/ADT/{ => Felinid}/Body/Organs/felinid.yml (100%)
 rename Resources/Prototypes/ADT/{ => Felinid}/Body/Prototypes/felinid.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs/player => Felinid/Mobs/Player}/felinid.yml (100%)
 rename Resources/Prototypes/ADT/{Entities => Felinid}/Mobs/Species/felinid.yml (100%)
 create mode 100644 Resources/Prototypes/ADT/Felinid/Sound/sound_collections.yml
 create mode 100644 Resources/Prototypes/ADT/Felinid/Sound/speech_emote_sounds.yml
 create mode 100644 Resources/Prototypes/ADT/Felinid/Sound/speech_emotes.yml
 rename Resources/Prototypes/ADT/{ => Felinid}/Species/felinid.yml (100%)
 rename Resources/Prototypes/ADT/{Catalog => }/Fills/Crates/ADTrewards.yml (100%)
 delete mode 100644 Resources/Prototypes/ADT/GameRules/events.yml
 delete mode 100644 Resources/Prototypes/ADT/GameRules/midround.yml
 create mode 100644 Resources/Prototypes/ADT/Hydroponics/buckwheat_plant.yml
 create mode 100644 Resources/Prototypes/ADT/Hydroponics/cocoa_tree.yml
 rename Resources/Prototypes/ADT/{Entities/Objects/Specific/Hydroponics/leaves.yml => Hydroponics/leaves/mutatedproduct.yml} (100%)
 create mode 100644 Resources/Prototypes/ADT/Hydroponics/pumpkin.yml
 delete mode 100644 Resources/Prototypes/ADT/Hydroponics/seeds.yml
 rename Resources/Prototypes/ADT/Hydroponics/{mutations.yml => seeds/mutated.yml} (100%)
 create mode 100644 Resources/Prototypes/ADT/Hydroponics/seeds/seeds.yml
 create mode 100644 Resources/Prototypes/ADT/IPC/sound_collections.yml
 create mode 100644 Resources/Prototypes/ADT/IPC/speech_emote_sounds.yml
 create mode 100644 Resources/Prototypes/ADT/IPC/speech_emotes.yml
 delete mode 100644 Resources/Prototypes/ADT/InventoryTemplates/foodbot.yml
 create mode 100644 Resources/Prototypes/ADT/KD/Cargo/GravityForCargo.yml
 create mode 100644 Resources/Prototypes/ADT/KD/Cargo/RingBox.yml
 create mode 100644 Resources/Prototypes/ADT/KD/Cargo/VectorCrate.yml
 create mode 100644 Resources/Prototypes/ADT/KD/Channels/Channels/DroneAntagChannel.yml
 create mode 100644 Resources/Prototypes/ADT/KD/Channels/Channels/RoboticChannel.yml
 rename Resources/Prototypes/ADT/{Entities/Objects/Device/EncryptionKey.yml => KD/Channels/keys/DroneAntagKey.yml} (51%)
 create mode 100644 Resources/Prototypes/ADT/KD/Channels/keys/RoboticKey.yml
 create mode 100644 Resources/Prototypes/ADT/KD/Crates/VectorCrate.yml
 rename Resources/Prototypes/ADT/{Entities/Clothing/Head/Hats => KD/Entites/Clothing/Hat}/JayBeret.yml (100%)
 create mode 100644 Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingBlood.yml
 create mode 100644 Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingEmerald.yml
 create mode 100644 Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingPlazma.yml
 create mode 100644 Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingTurk.yml
 create mode 100644 Resources/Prototypes/ADT/KD/Entites/Food/FoodTinMRECooked.yml
 rename Resources/Prototypes/ADT/{Entities/Objects/Magic => KD/Entites/JessusX}/JessusX.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Markers/Spawners => KD/Entites/Spawns}/UristSpawn.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Objects/Misc => KD/Entites/Storage}/RingStorage.yml (100%)
 create mode 100644 Resources/Prototypes/ADT/KD/Entites/pen/pen.yml
 create mode 100644 Resources/Prototypes/ADT/KD/FireBorn/FireBorn.yml
 create mode 100644 Resources/Prototypes/ADT/KD/Receipt/Microwave/CookedTin.yml
 create mode 100644 Resources/Prototypes/ADT/KD/gold-staner/gold-staner.yml
 rename Resources/Prototypes/ADT/{Entities/Mobs/NPCs => Lavaland/NPCs/AshWalker}/AshWalker.yml (100%)
 rename Resources/Prototypes/ADT/{StartingGear/ashwalker.yml => Lavaland/NPCs/AshWalker/AshWalkerEquipment.yml} (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs/Species => Lavaland/NPCs}/BaseHumLavalandMob.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs/NPCs => Lavaland/NPCs/Hermit}/Hermit.yml (100%)
 rename Resources/Prototypes/ADT/{StartingGear/hermit.yml => Lavaland/NPCs/Hermit/HermitEquipment.yml} (100%)
 rename Resources/Prototypes/ADT/{StartingGear => Lixon/CC}/Field_Officer_Central_Committee.yml (74%)
 rename Resources/Prototypes/ADT/{StartingGear/officercommand.yml => Lixon/CC/Officer_Commander.yml} (100%)
 create mode 100644 Resources/Prototypes/ADT/Lixon/CC/Representative_CC.yml
 create mode 100644 Resources/Prototypes/ADT/Lixon/CC/Special_Operations_Officer.yml
 create mode 100644 Resources/Prototypes/ADT/Lixon/CC/VKF_Representative.yml
 create mode 100644 Resources/Prototypes/ADT/Lixon/Insulgon_Items/Holographic_Monocline.yml
 create mode 100644 Resources/Prototypes/ADT/Lixon/Insulgon_Items/White_Diplomat's_suit.yml
 create mode 100644 Resources/Prototypes/ADT/Lixon/Kiirava_Magic_Wand.yml
 rename Resources/Prototypes/ADT/{StartingGear/SecurityPilot.yml => Lixon/PilotSB.yml} (100%)
 create mode 100644 Resources/Prototypes/ADT/Lixon/Storage_Implanter_Informant.yml
 create mode 100644 Resources/Prototypes/ADT/Lixon/Wedding_things/Veil.yml
 create mode 100644 Resources/Prototypes/ADT/Lixon/Wedding_things/Wedding_dress.yml
 create mode 100644 Resources/Prototypes/ADT/Lixon/Wedding_things/Wedding_ring.yml
 create mode 100644 Resources/Prototypes/ADT/Lixon/Yumi_Degurshavs_tail.yml
 rename Resources/Prototypes/ADT/{Entities/Objects/Specific/Janitorial => Lixon/soap}/soap.yml (100%)
 rename Resources/Prototypes/ADT/{Moth(Must resolved,then deleted) => Moth(Disabled)}/Body/Parts/moth.yml (100%)
 rename Resources/Prototypes/ADT/{Moth(Must resolved,then deleted) => Moth(Disabled)}/Body/Prototypes/moth.yml (100%)
 rename Resources/Prototypes/ADT/{Moth(Must resolved,then deleted) => Moth(Disabled)}/Damage/modifier_sets.yml (100%)
 rename Resources/Prototypes/ADT/{Moth(Must resolved,then deleted) => Moth(Disabled)}/Entities/Mobs/Customization/Markings/moth.yml (100%)
 rename Resources/Prototypes/ADT/{Moth(Must resolved,then deleted) => Moth(Disabled)}/Entities/Mobs/Player/moth.yml (100%)
 rename Resources/Prototypes/ADT/{Moth(Must resolved,then deleted) => Moth(Disabled)}/Entities/Mobs/Species/moth.yml (100%)
 rename Resources/Prototypes/ADT/{Moth(Must resolved,then deleted) => Moth(Disabled)}/Names/first_female_moth.yml (100%)
 rename Resources/Prototypes/ADT/{Moth(Must resolved,then deleted) => Moth(Disabled)}/Names/first_male_moth.yml (100%)
 rename Resources/Prototypes/ADT/{Moth(Must resolved,then deleted) => Moth(Disabled)}/Names/last_moth.yml (100%)
 rename Resources/Prototypes/ADT/{Moth(Must resolved,then deleted) => Moth(Disabled)}/Species/moth.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs/NPCs => }/Narcotic.yml (94%)
 rename Resources/Prototypes/ADT/{ => Novakid}/Body/Organs/novakid.yml (100%)
 rename Resources/Prototypes/ADT/{ => Novakid}/Body/Parts/novakid.yml (100%)
 rename Resources/Prototypes/ADT/{ => Novakid}/Body/Prototypes/novakid.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs => Novakid}/Customization/Markings/novakid.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs/player => Novakid/Mobs/Player}/novakid.yml (100%)
 rename Resources/Prototypes/ADT/{Entities => Novakid}/Mobs/Species/novakid.yml (53%)
 rename Resources/Prototypes/ADT/{Datasets => Novakid}/Names/first_novakid.yml (100%)
 rename Resources/Prototypes/ADT/{Datasets => Novakid}/Names/last_novakid.yml (100%)
 rename Resources/Prototypes/ADT/{ => Novakid}/Species/novakid.yml (100%)
 delete mode 100644 Resources/Prototypes/ADT/Objectives/base.yml
 delete mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Drink/alcohol.yml
 create mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Food/buckwheat_solid.yml
 create mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Food/cocoa_solid.yml
 create mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Food/condensed_milk.yml
 delete mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Food/food.yml
 create mode 100644 Resources/Prototypes/ADT/Reagents/patch_medicine.yml
 rename Resources/Prototypes/ADT/Recipes/Construction/Graph/{clothing => }/Clothing.yml (100%)
 rename Resources/Prototypes/ADT/Recipes/Construction/Graph/{structures => }/adtstool.yml (100%)
 rename Resources/Prototypes/ADT/Recipes/Construction/Graph/{structures => }/adttable.yml (100%)
 rename Resources/Prototypes/ADT/Recipes/Construction/Graph/{structures => }/bonfire.yml (100%)
 rename Resources/Prototypes/ADT/Recipes/Construction/Graph/{fun => }/discoball.yml (100%)
 rename Resources/Prototypes/ADT/Recipes/Construction/Graph/{fun/glassbreak.yml => drinks.yml} (100%)
 rename Resources/Prototypes/ADT/Recipes/Construction/Graph/{structures => }/fireplace.yml (100%)
 rename Resources/Prototypes/ADT/Recipes/Construction/Graph/{food => }/fish.yml (100%)
 delete mode 100644 Resources/Prototypes/ADT/Recipes/Construction/Graph/furniture/exist.yml
 rename Resources/Prototypes/ADT/Recipes/Construction/Graph/{machines => }/gravity_generator_broken.yml (100%)
 delete mode 100644 Resources/Prototypes/ADT/Recipes/Construction/Graph/materials/exist.yml
 delete mode 100644 Resources/Prototypes/ADT/Recipes/Construction/Graph/mechs/exist.yml
 rename Resources/Prototypes/ADT/Recipes/Construction/Graph/{structures => }/roundtable.yml (100%)
 rename Resources/Prototypes/ADT/Recipes/Construction/Graph/{fun => }/secretbook.yml (100%)
 delete mode 100644 Resources/Prototypes/ADT/Recipes/Construction/Graph/tools/exist.yml
 delete mode 100644 Resources/Prototypes/ADT/Recipes/Construction/Graph/utilities/exist.yml
 delete mode 100644 Resources/Prototypes/ADT/Recipes/Construction/Graph/weapons/exist.yml
 create mode 100644 Resources/Prototypes/ADT/Recipes/Cooking/buckwheat_kasha_recipe.yml
 create mode 100644 Resources/Prototypes/ADT/Recipes/Cooking/cannabis_white.yml
 rename Resources/Prototypes/ADT/Recipes/{Reactions/food.yml => Cooking/choco_bar_recipe.yml} (100%)
 create mode 100644 Resources/Prototypes/ADT/Recipes/Cooking/choco_drink_recipe.yml
 create mode 100644 Resources/Prototypes/ADT/Recipes/Cooking/croissant_recipe.yml
 delete mode 100644 Resources/Prototypes/ADT/Recipes/Cooking/drinks_recipe.yml
 create mode 100644 Resources/Prototypes/ADT/Recipes/Cooking/fishrecipes.yml
 create mode 100644 Resources/Prototypes/ADT/Recipes/Cooking/fried_egg_recipe.yml
 create mode 100644 Resources/Prototypes/ADT/Recipes/Cooking/khachapuri_recipe.yml
 delete mode 100644 Resources/Prototypes/ADT/Recipes/Cooking/meal_recipe.yml
 create mode 100644 Resources/Prototypes/ADT/Recipes/Cooking/meat_recipe.yml
 create mode 100644 Resources/Prototypes/ADT/Recipes/Cooking/sausage_recipe.yml
 create mode 100644 Resources/Prototypes/ADT/Recipes/Cooking/shawerma_recipe.yml
 create mode 100644 Resources/Prototypes/ADT/Recipes/Cooking/vulpix_recipe.yml
 create mode 100644 Resources/Prototypes/ADT/Recipes/Reactions/cocoa_react.yml
 rename Resources/Prototypes/ADT/Recipes/Reactions/{drinks.yml => just_kekc_coctails_recipe.yml} (67%)
 create mode 100644 Resources/Prototypes/ADT/Recipes/Reactions/new_year.yml
 create mode 100644 Resources/Prototypes/ADT/Recipes/Reactions/patch_medicine_recipe.yml
 rename Resources/Prototypes/ADT/{ => Shark}/Body/Organs/Shark.yml (100%)
 rename Resources/Prototypes/ADT/{ => Shark}/Body/Parts/Shark.yml (100%)
 rename Resources/Prototypes/ADT/{ => Shark}/Body/Prototypes/Shark.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs/player => Shark/Entities/Mobs/Player}/Shark.yml (100%)
 rename Resources/Prototypes/ADT/{ => Shark}/Entities/Mobs/Species/Shark.yml (100%)
 rename Resources/Prototypes/ADT/{Datasets => Shark}/Names/first_female_shark.yml (100%)
 rename Resources/Prototypes/ADT/{Datasets => Shark}/Names/first_male_shark.yml (100%)
 rename Resources/Prototypes/ADT/{Datasets => Shark}/Names/last_shark.yml (100%)
 rename Resources/Prototypes/ADT/{ => Shark}/Species/Shark.yml (100%)
 delete mode 100644 Resources/Prototypes/ADT/SoundCollections/emotes.yml
 delete mode 100644 Resources/Prototypes/ADT/SoundCollections/screams.yml
 rename Resources/Prototypes/ADT/{Entities/Objects/Misc => SoundGen}/soundgenerators.yml (100%)
 delete mode 100644 Resources/Prototypes/ADT/StartingGear/Events/DroneAntag.yml
 delete mode 100644 Resources/Prototypes/ADT/StartingGear/Navi.yml
 delete mode 100644 Resources/Prototypes/ADT/StartingGear/centcomrepresentativeL.yml
 delete mode 100644 Resources/Prototypes/ADT/StartingGear/specialofficer.yml
 rename Resources/Prototypes/ADT/{ => Tajaran}/Body/Organs/Tajaran.yml (100%)
 rename Resources/Prototypes/ADT/{ => Tajaran}/Body/Parts/Tajaran.yml (100%)
 rename Resources/Prototypes/ADT/{ => Tajaran}/Body/Prototypes/Tajaran.yml (100%)
 rename Resources/Prototypes/ADT/{ => Tajaran}/Entities/Mobs/Customization/Markings/Tajaran.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs/player => Tajaran/Entities/Mobs/Player}/Tajaran.yml (100%)
 rename Resources/Prototypes/ADT/{ => Tajaran}/Entities/Mobs/Species/Tajaran.yml (100%)
 rename Resources/Prototypes/ADT/{Datasets => Tajaran}/Names/first_female_tajaran.yml (100%)
 rename Resources/Prototypes/ADT/{Datasets => Tajaran}/Names/first_male_tajaran.yml (100%)
 rename Resources/Prototypes/ADT/{Datasets => Tajaran}/Names/last_tajaran.yml (100%)
 rename Resources/Prototypes/ADT/{ => Tajaran}/Species/Tajaran.yml (100%)
 create mode 100644 Resources/Prototypes/ADT/Tajaran/Voice/sound_collections.yml
 create mode 100644 Resources/Prototypes/ADT/Tajaran/Voice/speech_emote_sounds.yml
 create mode 100644 Resources/Prototypes/ADT/Tajaran/Voice/speech_emotes.yml
 rename Resources/Prototypes/ADT/{Entities/Mobs/Cyborgs/base_meka.yml => Tallrobot/base.yml} (100%)
 create mode 100644 Resources/Prototypes/ADT/Tallrobot/fmeka/fmekacargo.yml
 create mode 100644 Resources/Prototypes/ADT/Tallrobot/fmeka/fmekaeng.yml
 create mode 100644 Resources/Prototypes/ADT/Tallrobot/fmeka/fmekajani.yml
 create mode 100644 Resources/Prototypes/ADT/Tallrobot/fmeka/fmekamed.yml
 create mode 100644 Resources/Prototypes/ADT/Tallrobot/fmeka/fmekaserve.yml
 create mode 100644 Resources/Prototypes/ADT/Tallrobot/meka/mekacargo.yml
 create mode 100644 Resources/Prototypes/ADT/Tallrobot/meka/mekaeng.yml
 create mode 100644 Resources/Prototypes/ADT/Tallrobot/meka/mekajani.yml
 create mode 100644 Resources/Prototypes/ADT/Tallrobot/meka/mekamed.yml
 create mode 100644 Resources/Prototypes/ADT/Tallrobot/meka/mekaserve.yml
 rename Resources/Prototypes/ADT/{Entities/Structures/Specific => Tardis}/tardis.yml (99%)
 rename Resources/Prototypes/ADT/Tiles/{plating.yml => halloween_tile.yml} (100%)
 rename Resources/Prototypes/ADT/{ => Ursus}/Body/Organs/Ursus.yml (100%)
 rename Resources/Prototypes/ADT/{ => Ursus}/Body/Parts/Ursus.yml (100%)
 rename Resources/Prototypes/ADT/{ => Ursus}/Body/Prototypes/Ursus.yml (100%)
 rename Resources/Prototypes/ADT/{ => Ursus}/Entities/Mobs/Customization/Markings/Ursus.yml (100%)
 rename Resources/Prototypes/ADT/{ => Ursus}/Entities/Mobs/Customization/Markings/Ursus_hair.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs/player => Ursus/Entities/Mobs/Player}/Ursus.yml (100%)
 rename Resources/Prototypes/ADT/{ => Ursus}/Entities/Mobs/Species/Ursus.yml (100%)
 rename Resources/Prototypes/ADT/{Datasets => Ursus}/Names/first_female_urs.yml (100%)
 rename Resources/Prototypes/ADT/{Datasets => Ursus}/Names/first_male_urs.yml (100%)
 rename Resources/Prototypes/ADT/{Datasets => Ursus}/Names/last_female_urs.yml (100%)
 rename Resources/Prototypes/ADT/{Datasets => Ursus}/Names/last_male_urs.yml (100%)
 create mode 100644 Resources/Prototypes/ADT/Ursus/Sound/sound_collections.yml
 create mode 100644 Resources/Prototypes/ADT/Ursus/Sound/speech_emote_sounds.yml
 rename Resources/Prototypes/ADT/{ => Ursus}/Species/Ursus.yml (100%)
 create mode 100644 Resources/Prototypes/ADT/Ursus/faction.yml
 delete mode 100644 Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml
 rename Resources/Prototypes/ADT/{ => Vulpkanin}/Body/Organs/Vulpkanin.yml (100%)
 rename Resources/Prototypes/ADT/{ => Vulpkanin}/Body/Parts/Vulpkanin.yml (100%)
 rename Resources/Prototypes/ADT/{ => Vulpkanin}/Body/Prototypes/Vulpkanin.yml (100%)
 rename Resources/Prototypes/ADT/{ => Vulpkanin}/Entities/Mobs/Customization/Markings/Vulpkanin.yml (100%)
 rename Resources/Prototypes/ADT/{ => Vulpkanin}/Entities/Mobs/Customization/Markings/Vulpkanin_hair.yml (96%)
 rename Resources/Prototypes/ADT/{Entities/Mobs/player => Vulpkanin/Entities/Mobs/Player}/Vulpkanin.yml (100%)
 rename Resources/Prototypes/ADT/{ => Vulpkanin}/Entities/Mobs/Species/Vulpkanin.yml (100%)
 rename Resources/Prototypes/ADT/{Datasets => Vulpkanin}/Names/first_female_vulp.yml (100%)
 rename Resources/Prototypes/ADT/{Datasets => Vulpkanin}/Names/first_male_vulp.yml (100%)
 rename Resources/Prototypes/ADT/{Datasets => Vulpkanin}/Names/last_vulp.yml (100%)
 rename Resources/Prototypes/ADT/{ => Vulpkanin}/Species/Vulpkanin.yml (100%)
 rename Resources/Prototypes/ADT/{Alerts/changeling.yml => changeling/alert_changeling.yml} (100%)
 rename Resources/Prototypes/ADT/{Actions => changeling}/changeling.yml (85%)
 rename Resources/Prototypes/ADT/{Catalog => changeling}/ling_catalog.yml (100%)
 rename Resources/Prototypes/ADT/{Entities/Mobs/player/changeling.yml => changeling/mobs.yml} (57%)
 rename Resources/Prototypes/ADT/{Objectives/changeling.yml => changeling/objectives_changeling.yml} (93%)
 rename Resources/Prototypes/ADT/{Roles/Antags/changeling.yml => changeling/role_changeling.yml} (100%)
 create mode 100644 Resources/Prototypes/ADT/ling_unturnable.yml
 rename Resources/Prototypes/ADT/{Polymorphs => }/polymorphs.yml (100%)
 rename Resources/Prototypes/ADT/{Actions/wizard.yml => wizard/abilities.yml} (100%)
 rename Resources/Prototypes/ADT/{Entities/Objects/Magic/books.yml => wizard/spellbook.yml} (100%)
 rename Resources/Prototypes/ADT/{Catalog/wizard.yml => wizard/wizard_catalog.yml} (100%)

diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/BigBanana.yml b/Resources/Prototypes/ADT/BigBanana/BigBanana.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Objects/Fun/BigBanana.yml
rename to Resources/Prototypes/ADT/BigBanana/BigBanana.yml
diff --git a/Resources/Prototypes/ADT/Body/Parts/stepan.yml b/Resources/Prototypes/ADT/Body/Parts/stepan.yml
new file mode 100644
index 00000000000..9706e3fea60
--- /dev/null
+++ b/Resources/Prototypes/ADT/Body/Parts/stepan.yml
@@ -0,0 +1,169 @@
+#- type: entity
+#  id: PartStepan
+#  parent: BaseItem
+#  name: "Stepan body part"
+#  abstract: true
+#  components:
+#  - type: Damageable
+#    damageContainer: Inorganic
+#  - type: BodyPart
+#  - type: ContainerContainer
+#    containers:
+#      bodypart: !type:Container
+#        ents: []
+#  - type: StaticPrice
+#    price: 25
+#  - type: Tag
+#    tags:
+#      - Trash
+#  - type: PhysicalComposition
+#    materialComposition:
+#      Steel: 25
+      
+#- type: entity
+#  id: TorsoStepan
+#  name: "Stepan torso"
+#  parent: PartHuman
+#  components:
+#  - type: Sprite
+#    netsync: false
+#    sprite: Mobs/Species/Human/parts.rsi
+#    state: "torso_m"
+#  - type: Icon
+#    sprite: Mobs/Species/Human/parts.rsi
+#    state: "torso_m"
+#  - type: BodyPart
+#    partType: Torso
+
+#- type: entity
+#  id: LeftArmStepan
+#  name: "left Stepan arm"
+#  parent: PartStepan
+#  components:
+#  - type: Sprite
+#    netsync: false
+#    sprite: Mobs/Silicon/drone.rsi
+#    state: "l_hand"
+#  - type: Icon
+#    sprite: Mobs/Silicon/drone.rsi
+#    state: "l_hand"
+#  - type: BodyPart
+#    partType: Hand
+#    symmetry: Left
+#  - type: Tag
+#    tags:
+#    - Trash
+#    - BorgArm
+
+#- type: entity
+#  id: LeftHandStepan
+#  name: "left Stepan hand"
+#  parent: PartStepan
+#  components:
+#  - type: Sprite
+#    netsync: false
+#    sprite: Mobs/Species/Human/parts.rsi
+#    state: "l_hand"
+#  - type: Icon
+#    sprite: Mobs/Species/Human/parts.rsi
+#    state: "l_hand"
+#  - type: BodyPart
+#    partType: Hand
+#    symmetry: Left
+
+#- type: entity
+#  id: RightArmStepan
+#  name: "right Stepan arm"
+#  parent: PartStepan
+#  components:
+#  - type: Sprite
+#    netsync: false
+#    sprite: Mobs/Silicon/drone.rsi
+#    state: "r_hand"
+#  - type: Icon
+#    sprite: Mobs/Silicon/drone.rsi
+#    state: "r_hand"
+#  - type: BodyPart
+#    partType: Hand
+#    symmetry: Right
+#  - type: Tag
+#    tags:
+#    - Trash
+#    - BorgArm
+
+#- type: entity
+#  id: RightHandStepan
+#  name: "right Stepan hand"
+#  parent: PartStepan
+#  components:
+#  - type: Sprite
+#    netsync: false
+#    sprite: Mobs/Species/Human/parts.rsi
+#    state: "r_hand"
+#  - type: Icon
+#    sprite: Mobs/Species/Human/parts.rsi
+#    state: "r_hand"
+#  - type: BodyPart
+#    partType: Hand
+#    symmetry: Right
+
+#- type: entity
+#  id: LeftLegStepan
+#  name: "left Stepan leg"
+#  parent: PartStepan
+#  components:
+#  - type: Sprite
+#    netsync: false
+#    sprite: Mobs/Silicon/borg.rsi
+#    state: "l_leg"
+#  - type: Icon
+#    sprite: Mobs/Silicon/borg.rsi
+#    state: "l_leg"
+#  - type: BodyPart
+#    partType: Leg
+#    symmetry: Left
+#  - type: Tag
+#    tags:
+#    - Trash
+#    - BorgLeg
+#    - BorgLeftLeg
+
+#- type: entity
+#  id: RightLegStepan
+#  name: "right Stepan leg"
+#  parent: PartStepan
+#  components:
+#  - type: Sprite
+#    netsync: false
+#    sprite: Mobs/Silicon/borg.rsi
+#    state: "r_leg"
+#  - type: Icon
+#    sprite: Mobs/Silicon/borg.rsi
+#    state: "r_leg"
+#  - type: BodyPart
+#    partType: Leg
+#    symmetry: Right
+#  - type: Tag
+#    tags:
+#    - Trash
+#    - BorgLeg
+#    - BorgRightLeg
+
+#- type: entity
+#  id: LightHeadStepan
+#  name: "Stepan head"
+#  parent: PartStepan
+#  components:
+#  - type: Sprite
+#    netsync: false
+#    sprite: Objects/Specific/Borg/head.rsi
+#    state: "light_borg_head"
+#  - type: Icon
+#    sprite: Objects/Specific/Borg/head.rsi
+#    state: "light_borg_head"
+#  - type: BodyPart
+#    partType: Head
+#  - type: Tag
+#    tags:
+#    - Trash
+#    - BorgHead
diff --git a/Resources/Prototypes/ADT/Body/Prototypes/foodbot.yml b/Resources/Prototypes/ADT/Body/Prototypes/foodbot.yml
deleted file mode 100644
index 97b070b111c..00000000000
--- a/Resources/Prototypes/ADT/Body/Prototypes/foodbot.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- type: body
-  id: foodDistributorBots
-  name: "foodDistributor"
-  root: torso
-  slots:
-    head:
-      part: HeadReptilian
-      connections:
-      - torso
-    torso:
-      part: TorsoReptilian
-      connections:
-      - left arm
-      - right arm
-    right arm:
-      part: RightArmReptilian
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmReptilian
-      connections:
-      - left hand
-    right hand:
-      part: RightHandReptilian
-    left hand:
-      part: LeftHandReptilian
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Body/Prototypes/stepan.yml b/Resources/Prototypes/ADT/Body/Prototypes/stepan.yml
new file mode 100644
index 00000000000..58dfadb65c0
--- /dev/null
+++ b/Resources/Prototypes/ADT/Body/Prototypes/stepan.yml
@@ -0,0 +1,28 @@
+#- type: body
+#  id: Stepanda
+#  name: "Stepanda"
+#  root: torso
+#  slots:
+#    head:
+#      part: HeadHuman (HeadStepan)
+#      connections:
+#      - torso
+#    torso:
+#      part: TorsoStepan
+#      connections:
+#      - left manipulator
+#      - right manipulator
+#      - support module
+#      - special module
+#    right arm:
+#      part: RightArmHuman
+#      connections:
+#      - right hand
+#    left arm:
+#      part: LeftArmStepan
+#      connections:
+#      - left hand
+#    right hand:
+#      part: RightHandHuman
+#    left hand:
+#      part: LeftHandHuman
diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_adt.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_adt.yml
index 70d82c431e1..c850c7a2290 100644
--- a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_adt.yml
+++ b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_adt.yml
@@ -59,45 +59,3 @@
     contents:
       - id: ADTPatchPackFilled
         amount: 4
-
-- type: entity
-  id: CrateArmoryVector
-  name: vector crate (rubber)
-  parent: CrateWeaponSecure
-  components:
-  - type: StorageFill
-    contents:
-      - id: WeaponSubMachineGunVectorRubber
-        amount: 2
-      - id: MagazineMagnumSubMachineGunRubber
-        amount: 6
-
-- type: cargoProduct
-  id: GravityGeneratorMini
-  icon:
-    sprite: Structures/Machines/gravity_generator_mini.rsi
-    state: on
-  product: GravityGeneratorMini
-  cost: 4000
-  category: cargoproduct-category-name-shuttle
-  group: market
-
-- type: cargoProduct
-  id: CargoGravityGenerator
-  icon:
-    sprite: Structures/Machines/gravity_generator.rsi
-    state: on
-  product: CrateEngineeringGravityGenerator
-  cost: 20000
-  category: cargoproduct-category-name-shuttle
-  group: market
-
-- type: cargoProduct
-  id: FunRingBox
-  icon:
-    sprite: ADT/KD/RingBox.rsi
-    state: box
-  product: RingBox
-  cost: 8000
-  category: cargoproduct-category-name-fun
-  group: market
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index da9350ac907..c3fac40c2d0 100644
--- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -53,96 +53,3 @@
       - id: BoxSurvivalMedical
       - id: JawsOfLife
       - id: SpaceCash500
-
-- type: entity
-  parent: ClothingBackpack
-  id: ClothingBackpackFilled_VKF_R
-  noSpawn: true
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: RubberStampCentcom
-      - id: BoxFolderGreyFilled
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTLeader
-  id: ClothingBackpackERTLeaderFilled_SOO
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: RubberStampCentcom
-        #- id: BoxMagazineMagnumSubMachineGunHighVelocity
-        - id: WeaponSubMachineGunVector
-
-
-
-- type: entity
-  parent: ClothingBackpack
-  id: ClothingBackpackFilled_CC_R
-  noSpawn: true
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampIAA
-      - id: BoxFolderRedFilled
-
-
-- type: entity
-  parent: ClothingBackpack
-  id: ClothingBackpackFilled_CC_FO
-  noSpawn: true
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampCentcom
-      - id: BoxFolderRedFilled
-
-
-- type: entity
-  parent: ClothingBackpack
-  id: ClothingBackpackAntagDroneMiner
-  name: backpack antag drone miner
-  components:
-    - type: Sprite
-      sprite: ADT/Clothing/Back/ertleader_cyb.rsi # invisible sprite
-    - type: Unremoveable
-    - type: StorageFill
-      contents:
-        - id: MiningDrill
-        - id: WeaponProtoKineticAccelerator
-        - id: JawsOfLife
-        - id: PowerDrill
-
-- type: entity
-  parent: ClothingBackpack
-  id: ClothingBackpackAntagDroneEngineer
-  name: backpack antag drone engineer
-  components:
-    - type: Sprite
-      sprite: ADT/Clothing/Back/ertleader_cyb.rsi # invisible sprite
-    - type: Unremoveable
-    - type: StorageFill
-      contents:
-        - id: WelderIndustrial
-        - id: JawsOfLife
-        - id: PowerDrill
-        - id: Multitool
-        - id: trayScanner
-
-- type: entity
-  parent: ClothingBackpack
-  id: ClothingBackpackAntagDroneCharger
-  name: backpack antag drone charger
-  components:
-    - type: Sprite
-      sprite: ADT/Clothing/Back/ertleader_cyb.rsi # invisible sprite
-    - type: Unremoveable
-    - type: StorageFill
-      contents:
-        - id: JawsOfLife
-        - id: WeaponLaserGun
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Catalog/Loadout/sponsor.yml b/Resources/Prototypes/ADT/Catalog/Loadout/sponsor.yml
deleted file mode 100644
index fa8d49aa76b..00000000000
--- a/Resources/Prototypes/ADT/Catalog/Loadout/sponsor.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-- type: loadout
-  id: LixonLoadout
-  entity: ADTWeaponMinigunL
-  sponsorOnly: true
-
-- type: loadout
-  id: ADTHolographicMonoclineInsulgonLoadout
-  entity: ADTHolographicMonoclineL
-  sponsorOnly: true
-
-- type: loadout
-  id: ADTClothingUniformsJumpsuitInsulgonLoadout
-  entity: ADTClothingUniformsJumpsuitWhiteDiplomatSuitL
-  sponsorOnly: true
-
-- type: loadout
-  id: GoldStanerLoadout
-  entity: WeaponDisablerIdan
-  sponsorOnly: true
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/radio_channels.yml b/Resources/Prototypes/ADT/CollectiveMind/channels.yml
similarity index 69%
rename from Resources/Prototypes/ADT/radio_channels.yml
rename to Resources/Prototypes/ADT/CollectiveMind/channels.yml
index 5a45f167d78..ffc8ccc77ce 100644
--- a/Resources/Prototypes/ADT/radio_channels.yml
+++ b/Resources/Prototypes/ADT/CollectiveMind/channels.yml
@@ -1,18 +1,3 @@
-- type: radioChannel
-  id: ADTSilicon
-  name: Синтетики
-  keycode: 'б'
-  frequency: 1300
-  color: "#7df9ff"
-
-- type: radioChannel
-  id: ADTDroneAntagChannel
-  name: Дроны
-  keycode: 'й'
-  frequency: 1301
-  color: "#c21919"
-  longRange: true
-
 - type: radioChannel
   id: DionsCollectiveMind
   name: collective-mind-dionas
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/augbody.yml b/Resources/Prototypes/ADT/Customization/Markings/augbody.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/augbody.yml
rename to Resources/Prototypes/ADT/Customization/Markings/augbody.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/augmentsrobot.yml b/Resources/Prototypes/ADT/Customization/Markings/augmentsrobot.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/augmentsrobot.yml
rename to Resources/Prototypes/ADT/Customization/Markings/augmentsrobot.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/foxtails.yml b/Resources/Prototypes/ADT/Customization/Markings/foxtails.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/foxtails.yml
rename to Resources/Prototypes/ADT/Customization/Markings/foxtails.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/hair.yml b/Resources/Prototypes/ADT/Customization/Markings/hair.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/hair.yml
rename to Resources/Prototypes/ADT/Customization/Markings/hair.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/head.yml b/Resources/Prototypes/ADT/Customization/Markings/head.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/head.yml
rename to Resources/Prototypes/ADT/Customization/Markings/head.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/headaugs.yml b/Resources/Prototypes/ADT/Customization/Markings/headaugs.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/headaugs.yml
rename to Resources/Prototypes/ADT/Customization/Markings/headaugs.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/tale.yml b/Resources/Prototypes/ADT/Customization/Markings/tale.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/tale.yml
rename to Resources/Prototypes/ADT/Customization/Markings/tale.yml
diff --git a/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml b/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml
index 9408299ee8c..e7c9b0066d4 100644
--- a/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml
+++ b/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml
@@ -95,17 +95,3 @@
   id: AshWalker # Груба кожа = умно ящериц
   coefficients:
     Blunt: 0.8
-
-- type: damageModifierSet
-  id: ADTAntagDroneIPCDamageModSet
-  coefficients:
-    Blunt: 0.75
-    Slash: 0.75
-    Piercing: 0.55
-    Heat: 0.80
-    #Explosive: 0.25
-    Structural: 0
-    # zap
-    Shock: 0.5
-    Cold: 0
-    Caustic: 0.3
diff --git a/Resources/Prototypes/ADT/Body/Organs/demon.yml b/Resources/Prototypes/ADT/Demon/Body/Organs/demon.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Organs/demon.yml
rename to Resources/Prototypes/ADT/Demon/Body/Organs/demon.yml
diff --git a/Resources/Prototypes/ADT/Body/Parts/demon.yml b/Resources/Prototypes/ADT/Demon/Body/Parts/demon.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Parts/demon.yml
rename to Resources/Prototypes/ADT/Demon/Body/Parts/demon.yml
diff --git a/Resources/Prototypes/ADT/Body/Prototypes/demon.yml b/Resources/Prototypes/ADT/Demon/Body/Prototypes/demon.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Prototypes/demon.yml
rename to Resources/Prototypes/ADT/Demon/Body/Prototypes/demon.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml b/Resources/Prototypes/ADT/Demon/Customization/Markings/demon.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml
rename to Resources/Prototypes/ADT/Demon/Customization/Markings/demon.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/demon.yml b/Resources/Prototypes/ADT/Demon/Mobs/Player/demon.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/player/demon.yml
rename to Resources/Prototypes/ADT/Demon/Mobs/Player/demon.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/demon.yml b/Resources/Prototypes/ADT/Demon/Mobs/Species/demon.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Species/demon.yml
rename to Resources/Prototypes/ADT/Demon/Mobs/Species/demon.yml
diff --git a/Resources/Prototypes/ADT/Species/demon.yml b/Resources/Prototypes/ADT/Demon/Species/demon.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Species/demon.yml
rename to Resources/Prototypes/ADT/Demon/Species/demon.yml
diff --git a/Resources/Prototypes/ADT/Body/Organs/Drask.yml b/Resources/Prototypes/ADT/Drask/Body/Organs/Drask.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Organs/Drask.yml
rename to Resources/Prototypes/ADT/Drask/Body/Organs/Drask.yml
diff --git a/Resources/Prototypes/ADT/Body/Parts/Drask.yml b/Resources/Prototypes/ADT/Drask/Body/Parts/Drask.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Parts/Drask.yml
rename to Resources/Prototypes/ADT/Drask/Body/Parts/Drask.yml
diff --git a/Resources/Prototypes/ADT/Body/Prototypes/Drask.yml b/Resources/Prototypes/ADT/Drask/Body/Prototypes/Drask.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Prototypes/Drask.yml
rename to Resources/Prototypes/ADT/Drask/Body/Prototypes/Drask.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Drask.yml b/Resources/Prototypes/ADT/Drask/Customization/Markings/Drask.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Drask.yml
rename to Resources/Prototypes/ADT/Drask/Customization/Markings/Drask.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/Drask.yml b/Resources/Prototypes/ADT/Drask/Mobs/Player/Drask.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/player/Drask.yml
rename to Resources/Prototypes/ADT/Drask/Mobs/Player/Drask.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/Drask.yml b/Resources/Prototypes/ADT/Drask/Mobs/Species/Drask.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Species/Drask.yml
rename to Resources/Prototypes/ADT/Drask/Mobs/Species/Drask.yml
diff --git a/Resources/Prototypes/ADT/Datasets/Names/name_drask.yml b/Resources/Prototypes/ADT/Drask/Names/name_drask.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Datasets/Names/name_drask.yml
rename to Resources/Prototypes/ADT/Drask/Names/name_drask.yml
diff --git a/Resources/Prototypes/ADT/Species/drask.yml b/Resources/Prototypes/ADT/Drask/Species/drask.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Species/drask.yml
rename to Resources/Prototypes/ADT/Drask/Species/drask.yml
diff --git a/Resources/Prototypes/ADT/Body/Prototypes/cleanbot.yml b/Resources/Prototypes/ADT/Drones/Cleanbot modify/cleanbot.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Prototypes/cleanbot.yml
rename to Resources/Prototypes/ADT/Drones/Cleanbot modify/cleanbot.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/DroneAntag.yml b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Species/DroneAntag.yml
rename to Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag.yml
diff --git a/Resources/Prototypes/ADT/Body/Prototypes/DroneAntags.yml b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_Body.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Prototypes/DroneAntags.yml
rename to Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_Body.yml
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/DroneAntag_Core.yml b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_Core.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Objects/Specific/DroneAntag_Core.yml
rename to Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_Core.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/DroneAntag_IPC.yml b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_IPC.yml
similarity index 98%
rename from Resources/Prototypes/ADT/Entities/Mobs/Species/DroneAntag_IPC.yml
rename to Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_IPC.yml
index 8443ae3c57e..4f4aa3cfb93 100644
--- a/Resources/Prototypes/ADT/Entities/Mobs/Species/DroneAntag_IPC.yml
+++ b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_IPC.yml
@@ -558,6 +558,22 @@
 # damage modifier set
 
 
+- type: damageModifierSet
+  id: ADTAntagDroneIPCDamageModSet
+  coefficients:
+    Blunt: 0.75
+    Slash: 0.75
+    Piercing: 0.55
+    Heat: 0.80
+    #Explosive: 0.25
+    Structural: 0
+    # zap
+    Shock: 0.5
+    Cold: 0
+    Caustic: 0.3
+
+
+
 # IPC DRONE NAME IDENTIFIER
 
 
diff --git a/Resources/Prototypes/ADT/InventoryTemplates/DroneAntag.yml b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_InventoryTemplate.yml
similarity index 100%
rename from Resources/Prototypes/ADT/InventoryTemplates/DroneAntag.yml
rename to Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_InventoryTemplate.yml
diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/drones.yml b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_Spawner.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Markers/Spawners/drones.yml
rename to Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_Spawner.yml
diff --git a/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_StartingGear.yml b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_StartingGear.yml
new file mode 100644
index 00000000000..ddb951027e3
--- /dev/null
+++ b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_StartingGear.yml
@@ -0,0 +1,132 @@
+- type: entity
+  name: ore bag
+  id: OreBagAntagDrone
+  parent: BaseStorageItem
+  suffix: Antag Drone
+  components:
+  - type: MagnetPickup
+  - type: Sprite
+    sprite: Objects/Specific/Mining/ore_bag.rsi
+    state: icon
+  - type: Clothing
+    sprite: ADT/Clothing/Back/ertleader_cyb.rsi # invisible sprite
+    quickEquip: false
+    slots:
+    - belt
+  - type: Item
+    size: Ginormous
+  - type: Storage
+    maxItemSize: Normal
+    grid:
+    - 0,0,9,3
+    quickInsert: true
+    areaInsert: true
+    whitelist:
+      tags:
+        - ArtifactFragment
+        - Ore
+  - type: Dumpable
+
+- type: entity
+  parent: ClothingBackpack
+  id: ClothingBackpackAntagDroneMiner
+  name: backpack antag drone miner
+  components:
+    - type: Sprite
+      sprite: ADT/Clothing/Back/ertleader_cyb.rsi # invisible sprite
+    - type: Unremoveable
+    - type: StorageFill
+      contents:
+        - id: MiningDrill
+        - id: WeaponProtoKineticAccelerator
+        - id: JawsOfLife
+        - id: PowerDrill
+
+- type: entity
+  parent: ClothingBackpack
+  id: ClothingBackpackAntagDroneEngineer
+  name: backpack antag drone engineer
+  components:
+    - type: Sprite
+      sprite: ADT/Clothing/Back/ertleader_cyb.rsi # invisible sprite
+    - type: Unremoveable
+    - type: StorageFill
+      contents:
+        - id: WelderIndustrial
+        - id: JawsOfLife
+        - id: PowerDrill
+        - id: Multitool
+        - id: trayScanner
+
+- type: entity
+  parent: ClothingBackpack
+  id: ClothingBackpackAntagDroneCharger
+  name: backpack antag drone charger
+  components:
+    - type: Sprite
+      sprite: ADT/Clothing/Back/ertleader_cyb.rsi # invisible sprite
+    - type: Unremoveable
+    - type: StorageFill
+      contents:
+        - id: JawsOfLife
+        - id: WeaponLaserGun
+
+- type: startingGear
+  id: ADTAntagDroneGearMiner
+  equipment:
+    back: ClothingBackpackAntagDroneMiner
+    belt: OreBagAntagDrone
+  # inhand:
+  #   - MiningDrill
+  #   - WeaponProtoKineticAccelerator
+  #   - JawsOfLife
+  #   - PowerDrill
+  #   - OreBag
+
+- type: startingGear
+  id: ADTAntagDroneGearEngineer
+  equipment:
+    back: ClothingBackpackAntagDroneEngineer
+    belt: OreBagAntagDrone
+  # inhand:
+  #   - WelderIndustrial
+  #   - JawsOfLife
+  #   - PowerDrill
+  #   - Multitool
+  #   - trayScanner
+  #   - OreBag
+
+- type: startingGear
+  id: ADTAntagDroneGearCharger
+  equipment:
+    back: ClothingBackpackAntagDroneCharger
+    belt: OreBagAntagDrone
+  # inhand:
+  #   - JawsOfLife
+
+- type: startingGear
+  id: ADTAntagDroneGearIPC
+  equipment:
+    suitstorage: ADTWeaponLasgunSALR36
+    pocket1: ADTPowerCellLasgun
+    pocket2: ADTPowerCellLasgun
+    outerClothing: ClothingOuterArmorIPCAntagDrone
+
+- type: entity
+  parent: ClothingOuterBaseLarge
+  id: ClothingOuterArmorIPCAntagDrone
+  name: IPC antag drone armor
+  suffix: Drone Antag
+  components:
+    - type: Sprite
+      sprite: Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi
+    - type: Clothing
+      sprite: ADT/Clothing/Back/ertleader_cyb.rsi # invisible sprite
+    - type: Unremoveable
+    - type: Armor
+      modifiers:
+        coefficients:
+          Radiation: 0.15
+          Stun: 0.5
+    - type: ExplosionResistance
+      damageCoefficient: 0.75
diff --git a/Resources/Prototypes/ADT/ai_faction.yml b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_Turret.yml
similarity index 51%
rename from Resources/Prototypes/ADT/ai_faction.yml
rename to Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_Turret.yml
index 857dab7de71..081d5212868 100644
--- a/Resources/Prototypes/ADT/ai_faction.yml
+++ b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_Turret.yml
@@ -1,11 +1,3 @@
-- type: npcFaction
-  id: Ursus
-  hostile:
-  - Syndicate
-  - Xeno
-  - Zombie
-  - Revolutionary
-
 - type: npcFaction
   id: DroneAntag
   hostile:
@@ -20,4 +12,14 @@
   - NanoTrasen
   - PetsNT
   - Dragon
-  - Ursus
\ No newline at end of file
+  - Ursus
+
+- type: entity
+  parent: BaseWeaponTurret
+  id: ADTWeaponTurretDroneAntag
+  suffix: Drone Antag
+  components:
+    - type: NpcFactionMember
+      factions:
+        - DroneAntag
+
diff --git a/Resources/Prototypes/ADT/Drones/Drone-Antags/OLD_DroneAntag.yml b/Resources/Prototypes/ADT/Drones/Drone-Antags/OLD_DroneAntag.yml
new file mode 100644
index 00000000000..97d05385cf6
--- /dev/null
+++ b/Resources/Prototypes/ADT/Drones/Drone-Antags/OLD_DroneAntag.yml
@@ -0,0 +1,761 @@
+# - type: entity
+#   save: false
+#   abstract: true
+#   id: ADTDroneAntagBaseOLD
+#   components:
+#   - type: MindContainer
+#   - type: InputMover
+#   - type: MobMover
+#   - type: Reactive
+#     groups:
+#       Acidic: [Touch]
+#   - type: Input
+#     context: "human"
+#   - type: DamageOnHighSpeedImpact
+#     damage:
+#       types:
+#         Blunt: 5
+#     soundHit:
+#       collection: MetalThud
+#   - type: Clickable
+#   - type: Damageable
+#     damageContainer: Inorganic
+#   - type: Bloodstream
+#     bloodReagent: Oil
+#     bloodlossDamage:
+#       types:
+#         Bloodloss:
+#           1
+#     bloodlossHealDamage:
+#       types:
+#         Bloodloss:
+#           -1
+#   - type: InteractionOutline
+#   - type: Fixtures
+#     fixtures:
+#       fix1:
+#         shape:
+#           # Circles, cuz rotation of rectangles looks very bad
+#           !type:PhysShapeCircle
+#           radius: 0.35
+#         density: 50
+#         mask:
+#         - MobMask
+#         layer:
+#         - MobLayer
+#   - type: MovementSpeedModifier
+#     baseWalkSpeed : 4
+#     baseSprintSpeed : 3
+#   - type: Sprite
+#     noRot: true
+#     drawdepth: Mobs
+#   - type: Physics
+#     bodyType: KinematicController
+#   - type: Hands
+#     showInHands: false
+#   - type: Body
+#     prototype: Drone
+#   - type: IntrinsicRadioReceiver
+#   - type: IntrinsicRadioTransmitter
+#     channels:
+#     - ADTDroneAntag
+#     - Common
+#   - type: ActiveRadio
+#     channels:
+#     - ADTDroneAntag
+#     - Common
+#   - type: DoAfter
+#   - type: Pullable
+#   - type: Examiner
+#   - type: Puller
+#   - type: StandingState
+#   - type: Alerts
+#   - type: Tag
+#     tags:
+#       - ShoesRequiredStepTriggerImmune
+#   # Frontier - languages mechanic
+#   - type: LanguageSpeaker
+#     speaks:
+#     - BorgTalk
+#     understands:
+#     - GalacticCommon
+#     - BorgTalk
+#     - SolCommon
+
+# - type: entity
+#   name: drone miner
+#   id: ADTDroneAntagMinerOLD
+#   parent: ADTDroneAntagBase
+#   components:
+#   - type: Drone
+#   - type: NameIdentifier
+#     group: ADTDroneAntag
+#   - type: Inventory
+#     templateId: drone
+#   - type: InventorySlots
+#   - type: Strippable
+#   - type: UserInterface
+#     interfaces:
+#     - key: enum.StrippingUiKey.Key
+#       type: StrippableBoundUserInterface
+#   #   - key: enum.SiliconLawsUiKey.Key
+#   #     type: SiliconLawBoundUserInterface
+#   # - type: SiliconLawBound
+#   # - type: SiliconLawProvider
+#   #   laws: Drone
+#   - type: MovementSpeedModifier
+#     baseWalkSpeed : 5
+#     baseSprintSpeed : 5
+#   - type: MobState
+#     allowedStates:
+#       - Alive
+#       - Dead
+#   - type: MobThresholds
+#     thresholds:
+#       0: Alive
+#       125: Dead
+#   - type: NoSlip
+#   - type: StatusEffects
+#     allowed:
+#     - Stun
+#   - type: Temperature
+#     heatDamageThreshold: 5000
+#     currentTemperature: 310.15
+#     specificHeat: 42
+#     heatDamage:
+#       types:
+#         Heat : 1 #per second, scales with temperature & other constants
+#   - type: Sprite
+#     drawdepth: Mobs
+#     layers:
+#     - state: mineshell
+#       sprite: ADT/Mobs/Silicon/AntagDrones/drone-miner.rsi
+#       map: ["base"]
+#   - type: MovementIgnoreGravity
+#   - type: IntrinsicRadioTransmitter
+#     channels:
+#     - ADTDroneAntag
+#     - Common
+#   - type: ActiveRadio
+#     channels:
+#     - ADTDroneAntag
+#     - Common
+#   - type: Fixtures
+#     fixtures:
+#       fix1:
+#         shape:
+#           !type:PhysShapeCircle
+#           radius: 0.35
+#         density: 50
+#         mask:
+#         - FlyingMobMask
+#         layer:
+#         - FlyingMobLayer
+#   - type: Appearance
+#   - type: GenericVisualizer
+#     visuals:
+#       enum.DroneVisuals.Status:
+#         base:
+#           Off: { state: mineshell }
+#           On: { state: minedrone }
+# #  - type: ReplacementAccent
+# #    accent: silicon
+#   - type: Actions
+#   - type: UnpoweredFlashlight
+#   - type: PointLight
+#     enabled: false
+#     color: "#d7f705"
+#     radius: 7
+#     energy: 1
+#     mask: /Textures/Effects/LightMasks/cone.png
+#     autoRot: true
+#   - type: Tag
+#     tags:
+#       - ShoesRequiredStepTriggerImmune
+#       - CannotSuicide
+#   - type: StaticPrice
+#     price: 250
+#   # Frontier - languages mechanic
+#   - type: LanguageSpeaker
+#     speaks:
+#     - BorgTalk
+#     understands:
+#     - GalacticCommon
+#     - BorgTalk
+#     - SolCommon
+#   - type: CombatMode
+#   - type: MeleeWeapon
+#     hidden: true
+#     damage:
+#       groups:
+#         Brute: 5
+#   - type: EyeProtection
+#     protectionTime: 12
+#   - type: TypingIndicator
+#     proto: robot
+#   - type: Speech
+#     speechSounds: Pai
+#   - type: ZombieImmune
+#   - type: Repairable
+#     fuelcost: 15
+#     doAfterDelay: 5
+#   - type: Hands
+#     showInHands: false
+#   - type: Body
+#     prototype: Human
+
+
+
+# - type: entity
+#   name: drone soldier
+#   id: ADTDroneAntagEngineerOLD
+#   parent: ADTDroneAntagBase
+#   components:
+#   - type: Drone
+#   - type: NameIdentifier
+#     group: ADTDroneAntag
+#   - type: Inventory
+#     templateId: drone
+#   - type: InventorySlots
+#   - type: Strippable
+#   - type: UserInterface
+#     interfaces:
+#     - key: enum.StrippingUiKey.Key
+#       type: StrippableBoundUserInterface
+#   #   - key: enum.SiliconLawsUiKey.Key
+#   #     type: SiliconLawBoundUserInterface
+#   # - type: SiliconLawBound
+#   # - type: SiliconLawProvider
+#   #   laws: Drone
+#   - type: MovementSpeedModifier
+#     baseWalkSpeed : 5
+#     baseSprintSpeed : 5
+#   - type: MobState
+#     allowedStates:
+#       - Alive
+#       - Dead
+#   - type: MobThresholds
+#     thresholds:
+#       0: Alive
+#       125: Dead
+#   - type: NoSlip
+#   - type: StatusEffects
+#     allowed:
+#     - Stun
+#   - type: Temperature
+#     heatDamageThreshold: 5000
+#     currentTemperature: 310.15
+#     specificHeat: 42
+#     heatDamage:
+#       types:
+#         Heat : 1 #per second, scales with temperature & other constants
+#   # - type: Sprite
+#   #   drawdepth: Mobs
+#   #   layers:
+#   #   - state: engshell
+#   #     sprite: ADT/Mobs/Silicon/AntagDrones/drone-engineer.rsi
+#   #     map: ["base"]
+#   - type: Sprite
+#     drawdepth: Mobs
+#     layers:
+#     - state: engshell
+#       sprite: ADT/Mobs/Silicon/AntagDrones/drone-engineer.rsi
+#       map: ["base"]
+#   - type: MovementIgnoreGravity
+#   - type: IntrinsicRadioTransmitter
+#     channels:
+#     - ADTDroneAntag
+#     - Common
+#   - type: ActiveRadio
+#     channels:
+#     - ADTDroneAntag
+#     - Common
+#   - type: Fixtures
+#     fixtures:
+#       fix1:
+#         shape:
+#           !type:PhysShapeCircle
+#           radius: 0.35
+#         density: 50
+#         mask:
+#         - FlyingMobMask
+#         layer:
+#         - FlyingMobLayer
+#   - type: Appearance
+#   - type: GenericVisualizer
+#     visuals:
+#       enum.DroneVisuals.Status:
+#         base:
+#           Off: { state: engshell }
+#           On: { state: engdrone }
+#   # - type: ReplacementAccent
+#   #   accent: silicon
+#   - type: Actions
+#   - type: UnpoweredFlashlight
+#   - type: PointLight
+#     enabled: false
+#     color: "#d7f705"
+#     radius: 7
+#     energy: 1
+#     mask: /Textures/Effects/LightMasks/cone.png
+#     autoRot: true
+#   - type: Tag
+#     tags:
+#       - ShoesRequiredStepTriggerImmune
+#       - CannotSuicide
+#   - type: StaticPrice
+#     price: 250
+#   # Frontier - languages mechanic
+#   - type: LanguageSpeaker
+#     speaks:
+#     - BorgTalk
+#     understands:
+#     - GalacticCommon
+#     - BorgTalk
+#     - SolCommon
+#   - type: CombatMode
+#   - type: MeleeWeapon
+#     hidden: true
+#     damage:
+#       groups:
+#         Brute: 5
+#   - type: EyeProtection
+#     protectionTime: 12
+#   - type: TypingIndicator
+#     proto: robot
+#   - type: Speech
+#     speechSounds: Pai
+#   - type: ZombieImmune
+#   - type: Repairable
+#     fuelcost: 15
+#     doAfterDelay: 5
+#   - type: Hands
+#     showInHands: false
+#   - type: Body
+#     prototype: Human
+
+
+
+# - type: entity
+#   name: drone sodlier
+#   id: ADTDroneAntagChargerOLD
+#   parent: ADTDroneAntagBase
+#   components:
+#   - type: Drone
+#   - type: NameIdentifier
+#     group: ADTDroneAntag
+#   - type: Inventory
+#     templateId: drone
+#   - type: InventorySlots
+#   - type: Strippable
+#   - type: UserInterface
+#     interfaces:
+#     - key: enum.StrippingUiKey.Key
+#       type: StrippableBoundUserInterface
+#   #   - key: enum.SiliconLawsUiKey.Key
+#   #     type: SiliconLawBoundUserInterface
+#   # - type: SiliconLawBound
+#   # - type: SiliconLawProvider
+#   #   laws: Drone
+#   - type: MovementSpeedModifier
+#     baseWalkSpeed : 5
+#     baseSprintSpeed : 5
+#   - type: MobState
+#     allowedStates:
+#       - Alive
+#       - Dead
+#   - type: MobThresholds
+#     thresholds:
+#       0: Alive
+#       125: Dead
+#   - type: NoSlip
+#   - type: StatusEffects
+#     allowed:
+#     - Stun
+#   - type: Temperature
+#     heatDamageThreshold: 5000
+#     currentTemperature: 310.15
+#     specificHeat: 42
+#     heatDamage:
+#       types:
+#         Heat : 1 #per second, scales with temperature & other constants
+#   - type: Sprite
+#     drawdepth: Mobs
+#     layers:
+#     - state: chargeshell
+#       sprite: ADT/Mobs/Silicon/AntagDrones/drone-charger.rsi
+#       map: ["base"]
+#   - type: MovementIgnoreGravity
+#   - type: IntrinsicRadioTransmitter
+#     channels:
+#     - ADTDroneAntag
+#     - Common
+#   - type: ActiveRadio
+#     channels:
+#     - ADTDroneAntag
+#     - Common
+#   - type: Fixtures
+#     fixtures:
+#       fix1:
+#         shape:
+#           !type:PhysShapeCircle
+#           radius: 0.35
+#         density: 50
+#         mask:
+#         - FlyingMobMask
+#         layer:
+#         - FlyingMobLayer
+#   - type: Appearance
+#   - type: GenericVisualizer
+#     visuals:
+#       enum.DroneVisuals.Status:
+#         base:
+#           Off: { state: chargeshell }
+#           On: { state: chargedrone }
+# #  - type: ReplacementAccent
+# #    accent: silicon
+#   - type: Actions
+#   - type: UnpoweredFlashlight
+#   - type: PointLight
+#     enabled: false
+#     color: "#d7f705"
+#     radius: 7
+#     energy: 1
+#     mask: /Textures/Effects/LightMasks/cone.png
+#     autoRot: true
+#   - type: Tag
+#     tags:
+#       - ShoesRequiredStepTriggerImmune
+#       - CannotSuicide
+#   - type: StaticPrice
+#     price: 250
+#   # Frontier - languages mechanic
+#   - type: LanguageSpeaker
+#     speaks:
+#     - BorgTalk
+#     understands:
+#     - GalacticCommon
+#     - BorgTalk
+#     - SolCommon
+#   - type: CombatMode
+#   - type: MeleeWeapon
+#     hidden: true
+#     damage:
+#       groups:
+#         Brute: 5
+#   - type: EyeProtection
+#     protectionTime: 12
+#   - type: TypingIndicator
+#     proto: robot
+#   - type: Speech
+#     speechSounds: Pai
+#   - type: ZombieImmune
+#   - type: Repairable
+#     fuelcost: 15
+#     doAfterDelay: 5
+#   - type: Hands
+#     showInHands: false
+#   - type: Body
+#     prototype: Human
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# OLD DRONE BASE
+
+
+# - type: entity
+#   abstract: true
+#   id: ADTDroneAntagBase
+#   components:
+#   - type: MindContainer
+#   - type: InputMover
+#   - type: MobMover
+#   - type: Clickable
+#   - type: CombatMode
+#   - type: InteractionOutline
+#   - type: DoAfter
+#   - type: Pullable
+#   - type: Examiner
+#   - type: Puller
+#   - type: StandingState
+#   - type: Alerts
+#   - type: Rotatable
+#   - type: RotationVisuals
+#   - type: FloatingVisuals
+#   - type: Reactive
+#     groups:
+#       Acidic: [Touch]
+#   - type: Input
+#     context: "human"
+#   - type: DamageOnHighSpeedImpact
+#     damage:
+#       types:
+#         Blunt: 5
+#     soundHit:
+#       collection: MetalThud
+#   - type: Damageable
+#     damageContainer: Inorganic
+#   - type: Bloodstream
+#     bloodReagent: Oil
+#     bloodlossDamage:
+#       types:
+#         Bloodloss:
+#           1
+#     bloodlossHealDamage:
+#       types:
+#         Bloodloss:
+#           -1
+#   - type: Fixtures
+#     fixtures:
+#       fix1:
+#         shape:
+#           # Circles, cuz rotation of rectangles looks very bad
+#           !type:PhysShapeCircle
+#           radius: 0.35
+#         density: 50
+#         mask:
+#         - MobMask
+#         layer:
+#         - MobLayer
+#   - type: MovementSpeedModifier
+#     baseWalkSpeed : 4
+#     baseSprintSpeed : 3
+#   - type: EyeProtection
+#     protectionTime: 12
+#   - type: Sprite
+#     noRot: true
+#     drawdepth: Mobs
+#   - type: Physics
+#     bodyType: KinematicController
+#   - type: Hands
+#     showInHands: false
+#   - type: Body
+#     prototype: Drone
+#   - type: IntrinsicRadioReceiver
+#   - type: IntrinsicRadioTransmitter
+#     channels:
+#     - ADTDroneAntag
+#     - Common
+#   - type: ActiveRadio
+#     channels:
+#     - ADTDroneAntag
+#     - Common
+#   - type: Tag
+#     tags:
+#       - ShoesRequiredStepTriggerImmune
+#       - CannotSuicide
+#       - DoorBumpOpener
+#   - type: Access
+#     tags:
+#     - External
+#   - type: TypingIndicator
+#   proto: robot
+#   - type: Speech
+#   speechSounds: Pai
+#   # Frontier - languages mechanic
+#   - type: LanguageSpeaker
+#     speaks:
+#     - BorgTalk
+#     understands:
+#     - GalacticCommon
+#     - BorgTalk
+#     - SolCommon
+
+
+# OLD FIRST DRONE
+
+
+# - type: entity
+#   name: drone miner
+#   id: ADTDroneAntagMiner
+#   parent: ADTDroneAntagBase
+#   components:
+#   - type: NameIdentifier
+#     group: ADTDroneAntag
+#   - type: Inventory
+#     templateId: drone
+#   - type: InventorySlots
+#   - type: MovementSpeedModifier
+#     baseWalkSpeed : 5
+#     baseSprintSpeed : 5
+#   - type: MobState
+#     allowedStates:
+#       - Alive
+#       - Dead
+#   - type: ZombieImmune
+#   - type: MobThresholds
+#     thresholds:
+#       0: Alive
+#       125: Dead
+#   - type: NoSlip
+#   - type: StatusEffects
+#     allowed:
+#     - SlowedDown
+#   - type: SlowOnDamage
+#     speedModifierThresholds:
+#       80: 0.5
+#   - type: Temperature
+#     heatDamageThreshold: 5000
+#     currentTemperature: 310.15
+#     specificHeat: 42
+#     heatDamage:
+#       types:
+#         Heat : 1 #per second, scales with temperature & other constants
+#   - type: Sprite
+#     drawdepth: Mobs
+#     netsync: true
+#     layers:
+#     - state: mineshell
+#       sprite: ADT/Mobs/Silicon/AntagDrones/drone-miner.rsi
+#       map: ["base"]
+#   - type: MovementIgnoreGravity
+#   - type: IntrinsicRadioTransmitter
+#     channels:
+#     - ADTDroneAntag
+#     - Common
+#   - type: ActiveRadio
+#     channels:
+#     - ADTDroneAntag
+#     - Common
+#   - type: Fixtures
+#     fixtures:
+#       fix1:
+#         shape:
+#           !type:PhysShapeCircle
+#           radius: 0.35
+#         density: 50
+#         mask:
+#         - FlyingMobMask
+#         layer:
+#         - FlyingMobLayer
+#   - type: Appearance
+#   - type: GenericVisualizer
+#     visuals:
+#       enum.DroneVisuals.Status:
+#         base:
+#           Off: { state: mineshell }
+#           On: { state: minedrone }
+# #  - type: ReplacementAccent
+# #    accent: silicon
+#   - type: Repairable
+#     fuelcost: 15
+#     doAfterDelay: 5
+#   - type: Actions
+#   - type: UnpoweredFlashlight
+#   - type: PointLight
+#     enabled: false
+#     radius: 3.5
+#     softness: 1
+#     mask: /Textures/Effects/LightMasks/cone.png
+#     autoRot: true
+#   - type: StaticPrice
+#     price: 250
+#   # Frontier - languages mechanic
+#   - type: LanguageSpeaker
+#     speaks:
+#     - BorgTalk
+#     understands:
+#     - GalacticCommon
+#     - BorgTalk
+#     - SolCommon
+
+
+# IPC DRONE
+
+
+# - type: entity
+#   name: drone soldier
+#   id: ADTDroneIPCAntag
+#   parent: ADTDroneAntagBase
+#   components:
+#   - type: MobThresholds
+#   thresholds:
+#     0: Alive
+#     100: Critical
+#     200: Dead
+
+
+# DRONE NAME IDENTIFIER
+
+
+# - type: nameIdentifierGroup
+#   id: ADTDroneAntag
+#   prefix: SD
+#   fullName: true
+#   minValue: 10000
+#   maxValue: 99999
+
+
+# IPC DRONE NAME IDENTIFIER
+
+
+# - type: nameIdentifierGroup
+#   id: ADTIPCAntag
+#   prefix: BF
+#   fullName: true
+#   minValue: 10000
+#   maxValue: 99999
+
+
+# DRONE RADIO CHANNEL
+
+
+# - type: radioChannel
+#   id: ADTDroneAntagChannel
+#   name: Дроны
+#   keycode: 'й'
+#   frequency: 1301
+#   color: "#690e0e"
+
+
+# DRONE ENCRYPTION KEY
+
+
+# - type: entity
+#   parent: EncryptionKey
+#   id: ADTEncryptionKeyDroneAntag
+#   name: Ключ к каналу дронов
+#   description: Ключ к доступу каналов дронов.
+#   components:
+#   - type: EncryptionKey
+#     channels:
+#     - ADTDroneAntag
+#     - Common
+#     defaultChannel: ADTDroneAntag
+#   - type: Sprite
+#     layers:
+#     - state: crypt_silver
+#     - state: rd_label
+
+
+
+
diff --git a/Resources/Prototypes/ADT/Body/Prototypes/engineeringdrone.yml b/Resources/Prototypes/ADT/Drones/Drone-Engineer/Body/engineeringdrone.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Prototypes/engineeringdrone.yml
rename to Resources/Prototypes/ADT/Drones/Drone-Engineer/Body/engineeringdrone.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/engineeringdrone.yml b/Resources/Prototypes/ADT/Drones/Drone-Engineer/Entities/Mobs/Player/engineeringdrone.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/player/engineeringdrone.yml
rename to Resources/Prototypes/ADT/Drones/Drone-Engineer/Entities/Mobs/Player/engineeringdrone.yml
diff --git a/Resources/Prototypes/ADT/Body/Prototypes/medicaldrone.yml b/Resources/Prototypes/ADT/Drones/Drone-Medical/Body/medicaldrone.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Prototypes/medicaldrone.yml
rename to Resources/Prototypes/ADT/Drones/Drone-Medical/Body/medicaldrone.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/medicaldrone.yml b/Resources/Prototypes/ADT/Drones/Drone-Medical/Entities/Mobs/Player/medicaldrone.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/player/medicaldrone.yml
rename to Resources/Prototypes/ADT/Drones/Drone-Medical/Entities/Mobs/Player/medicaldrone.yml
diff --git a/Resources/Prototypes/ADT/Body/Prototypes/servicedrone.yml b/Resources/Prototypes/ADT/Drones/Drone-Service/Body/servicedrone.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Prototypes/servicedrone.yml
rename to Resources/Prototypes/ADT/Drones/Drone-Service/Body/servicedrone.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/servicedrone_alt.yml b/Resources/Prototypes/ADT/Drones/Drone-Service/Entities/Mobs/Player/servicedrone.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/player/servicedrone_alt.yml
rename to Resources/Prototypes/ADT/Drones/Drone-Service/Entities/Mobs/Player/servicedrone.yml
diff --git a/Resources/Prototypes/ADT/Drones/Foodbot/Body/foodbot.yml b/Resources/Prototypes/ADT/Drones/Foodbot/Body/foodbot.yml
new file mode 100644
index 00000000000..591547d0a9e
--- /dev/null
+++ b/Resources/Prototypes/ADT/Drones/Foodbot/Body/foodbot.yml
@@ -0,0 +1,49 @@
+- type: body
+  id: foodDistributorBots
+  name: "foodDistributor"
+  root: torso
+  slots:
+    head:
+      part: HeadReptilian
+      connections:
+      - torso
+    torso:
+      part: TorsoReptilian
+      connections:
+      - left arm
+      - right arm
+    right arm:
+      part: RightArmReptilian
+      connections:
+      - right hand
+    left arm:
+      part: LeftArmReptilian
+      connections:
+      - left hand
+    right hand:
+      part: RightHandReptilian
+    left hand:
+      part: LeftHandReptilian
+
+
+
+- type: inventoryTemplate
+  id: foodDistributorBots
+  slots:
+    - name: outerClothing
+      slotTexture: suit
+      slotFlags: OUTERCLOTHING
+      slotGroup: MainHotbar
+      stripTime: 6
+      uiWindowPos: 1,2
+      strippingWindowPos: 1,2
+      displayName: Suit
+
+    - name: back
+      slotTexture: back
+      slotFlags: BACK
+      slotGroup: MainHotbar
+      stripTime: 6
+      uiWindowPos: 3,0
+      strippingWindowPos: 0,5
+      displayName: Back
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/servicedrone.yml b/Resources/Prototypes/ADT/Drones/Foodbot/Entities/Mobs/Player/servicedrone.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/player/servicedrone.yml
rename to Resources/Prototypes/ADT/Drones/Foodbot/Entities/Mobs/Player/servicedrone.yml
diff --git a/Resources/Prototypes/ADT/Drones/nar_si.yml b/Resources/Prototypes/ADT/Drones/nar_si.yml
new file mode 100644
index 00000000000..d22f789eb6c
--- /dev/null
+++ b/Resources/Prototypes/ADT/Drones/nar_si.yml
@@ -0,0 +1,431 @@
+#- type: entity
+#  name: Robot Nar Si
+#  id: ADTNarSi
+#  parent: PlayerSiliconBase
+#  components:
+#  - type: InteractionOutline
+#  - type: InnateTool
+#    tools:
+#      - id: UnholyHalberd
+#      - id: ADTNarSiSpawnSpellbook
+#      - id: ADTNarsiFireballSpellbook
+#  - type: UserInterface
+#    interfaces:
+#    - key: enum.StrippingUiKey.Key
+#      type: StrippableBoundUserInterface
+#  - type: GhostTakeoverAvailable
+#  - type: MovementSpeedModifier
+#    baseWalkSpeed : 3
+#    baseSprintSpeed : 2
+#  - type: MobState
+#    allowedStates:
+#      - Alive
+#      - Dead
+#  - type: MobThresholds
+#    thresholds:
+#      0: Alive
+#      800: Dead
+#  - type: Sprite
+#    drawdepth: Mobs
+#    netsync: false
+#    sprite: ADT/Mobs/nar.rsi
+#    state: mech_narsi
+#  - type: MovementIgnoreGravity
+#  - type: Fixtures
+#    fixtures:
+#      fix1:
+#        shape:
+#          !type:PhysShapeCircle
+#          radius: 1
+#        density: 160
+#        mask:
+#        - LargeMobMask
+#        layer:
+#        - MobLayer
+#  - type: Appearance
+#    #rotate: true // Error: /Prototypes/ADT/Drones/nar_si.yml(46,5)  Field "rotate" not found in "Robust.Shared.GameObjects.AppearanceComponent". Error: /Prototypes/ADT/Drones/nar_si.yml(47,5)  Field "states" not found in "Robust.Shared.GameObjects.AppearanceComponent".
+#    #states:
+#    #  Alive:
+#    #    Base: mech_narsi
+#    #  Dead:
+#    #    Base: died_mech_narsi
+#  - type: CombatMode
+#  - type: Armor
+#    modifiers:
+#      coefficients:
+#        Blunt: 0.75
+#        Slash: 0.75
+#        Piercing: 0.75
+#        Heat: 0.75
+#        Radiation: 0
+#
+##Spawn Demons Start
+#- type: entity
+#  id: ADTNarSiSpawnSpellbook
+#  name: spawn spellbook
+#  parent: BaseSpellbook
+#  components:
+#    - type: Spellbook
+#      instantSpells:
+#        FlashRune: -1
+#      worldSpells:
+#        SpawnNarsiSpell: -1
+#
+#- type: worldTargetAction
+#  id: SpawnNarsiSpell
+#  name: action-name-spell-summon-demons
+#  description: action-description-spell-summon-demons
+#  useDelay: 10
+#  range: 4
+#  itemIconStyle: BigAction
+#  icon:
+#    sprite: Objects/Magic/magicactions.rsi
+#    state: spell_default
+#  serverEvent: !type:WorldSpawnSpellEvent
+#    prototypes:
+#      - id: ADTBlodyEyesDemon
+#        amount: 1
+#      - id: ADTBunchDemonicEyesDemon
+#        amount: 3
+#      #- id: ADTDemonicEyeDemon
+#      #  amount: 4
+#    offsetVector2: 0, 1
+#    speech: action-speech-spell-summon-demons
+#
+##BaseNarSiDemons
+#- type: entity
+#  parent: SimpleMobBase
+#  id: ADTBaseMobNarsiDemon
+#  name: narsi demon
+#  description: narsi demon
+#  abstract: true
+#  components:
+#  - type: HTN
+#    rootTask: SimpleHostileCompound
+#  - type: NpcFactionMember
+#    factions:
+#    - SimpleHostile
+#  - type: Tag
+#    tags:
+#    - DoorBumpOpener
+#    - Flesh
+#  - type: Sprite
+#    drawdepth: Mobs
+#    sprite: ADT/Mobs/Aliens/nar_si_demons.rsi
+#  - type: MovementAlwaysTouching
+#  - type: MovementSpeedModifier
+#    baseWalkSpeed: 1
+#    baseSprintSpeed: 1.5
+#  - type: MobState
+#    allowedStates:
+#    - Alive
+#    - Dead
+#  - type: MobThresholds
+#    thresholds:
+#      0: Alive
+#      75: Dead
+#  - type: Stamina
+#    excess: 50
+#  - type: Appearance
+#  - type: Butcherable
+#    spawned:
+#    - id: FoodMeat
+#      amount: 1
+#  - type: Bloodstream
+#    bloodMaxVolume: 100
+#  - type: CombatMode
+#  - type: MeleeWeapon
+#    hidden: true
+#    soundHit:
+#        path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
+#    angle: 0
+#    animation: WeaponArcClaw
+#    damage:
+#      types:
+#        Slash: 3
+#  - type: ReplacementAccent
+#    accent: genericAggressive
+#
+#- type: entity
+#  parent: SimpleMobBase
+#  id: ADTBaseMobNarsiBigDemon
+#  name: narsi demon
+#  description: narsi demon
+#  abstract: true
+#  components:
+#  - type: HTN
+#    rootTask: SimpleHostileCompound
+#  - type: NpcFactionMember
+#    factions:
+#    - SimpleHostile
+#  - type: Tag
+#    tags:
+#    - DoorBumpOpener
+#    - Flesh
+#  - type: Sprite
+#    drawdepth: Mobs
+#    sprite: ADT/Mobs/Aliens/nar_si_big_demons.rsi
+#  - type: MovementAlwaysTouching
+#  - type: MovementSpeedModifier
+#    baseWalkSpeed: 1
+#    baseSprintSpeed: 1.5
+#  - type: MobState
+#    allowedStates:
+#    - Alive
+#    - Dead
+#  - type: MobThresholds
+#    thresholds:
+#      0: Alive
+#      75: Dead
+#  - type: Stamina
+#    excess: 50
+#  - type: Appearance
+#  - type: Butcherable
+#    spawned:
+#    - id: FoodMeat
+#      amount: 1
+#  - type: Bloodstream
+#    bloodMaxVolume: 100
+#  - type: CombatMode
+#  - type: MeleeWeapon
+#    hidden: true
+#    soundHit:
+#        path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
+#    angle: 0
+#    animation: WeaponArcClaw
+#    damage:
+#      types:
+#        Slash: 3
+#  - type: ReplacementAccent
+#    accent: genericAggressive
+#
+#- type: entity
+#  parent: ADTBaseMobNarsiDemon
+#  id: ADTBlodyEyesDemon
+#  name: Bloody eye demon
+#  description: Dark matter whose eyes randomly pop out of the body. They all seem to be following you...
+#  components:
+#  - type: Sprite
+#    layers:
+#    - map: [ "enum.DamageStateVisualLayers.Base" ]
+#      state: blody_eyes
+#    scale: 1.4, 1.4
+#  - type: DamageStateVisuals
+#    states:
+#      Alive:
+#        Base: blody_eyes
+#      Critical:
+#        Base: blody_eyes_dead
+#      Dead:
+#        Base: blody_eyes_dead
+#  - type: MobThresholds
+#    thresholds:
+#      0: Alive
+#      450: Dead
+#  - type: MeleeWeapon
+#    hidden: true
+#    soundHit:
+#        path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
+#    angle: 0
+#    animation: WeaponArcClaw
+#    damage:
+#      types:
+#        Slash: 25
+#
+#- type: entity
+#  parent: ADTBaseMobNarsiDemon
+#  id: ADTBunchDemonicEyesDemon
+#  name: Pile of demonic eyes
+#  description: A multi eyepiece that follows your every move... Doesn't look friendly.
+#  components:
+#  - type: Sprite
+#    layers:
+#    - map: [ "enum.DamageStateVisualLayers.Base" ]
+#      state: bunch_demonic_eyes
+#  - type: DamageStateVisuals
+#    states:
+#      Alive:
+#        Base: bunch_demonic_eyes
+#      Critical:
+#        Base: bunch_demonic_eyes_dead
+#      Dead:
+#        Base: bunch_demonic_eyes_dead
+#    scale: 1.2, 1.2
+#  - type: MobThresholds
+#    thresholds:
+#      0: Alive
+#      150: Dead
+#  - type: MeleeWeapon
+#    hidden: true
+#    soundHit:
+#        path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
+#    angle: 0
+#    animation: WeaponArcClaw
+#    damage:
+#      types:
+#        Slash: 10
+#
+##- type: entity
+##  parent: ADTBaseMobNarsiDemon
+##  id: ADTDemonicEyeDemon
+##  name: demonic eye
+##  description: A clot of darkness and blood, longing for your death.
+##  components:
+##  - type: Sprite
+##    layers:
+##    - map: [ "enum.DamageStateVisualLayers.Base" ]
+##      state: demonic_eye
+##  - type: DamageStateVisuals
+##    states:
+##      Alive:
+##        Base: demonic_eye
+##      Critical:
+##        Base: demonic_eye_dead
+##      Dead:
+##        Base: demonic_eye_dead
+##  - type: MobThresholds
+##    thresholds:
+##      0: Alive
+##      50: Dead
+##  - type: MeleeWeapon
+##    hidden: true
+##    soundHit:
+##        path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
+##    angle: 0
+##    animation: WeaponArcClaw
+##    damage:
+##      types:
+##        Slash: 5
+#
+#- type: entity
+#  parent: ADTBaseMobNarsiBigDemon
+#  id: ADTBloodyMouthDemon
+#  name: Bloody mouth
+#  description: The personification of the gluttony of the dark god....
+#  components:
+#  - type: Sprite
+#    layers:
+#    - map: [ "enum.DamageStateVisualLayers.Base" ]
+#      state: demonic_mouth
+#  - type: DamageStateVisuals
+#    states:
+#      Alive:
+#        Base: demonic_mouth
+#      Critical:
+#        Base: demonic_mouth_dead
+#      Dead:
+#        Base: demonic_mouth_dead
+#  - type: MobThresholds
+#    thresholds:
+#      0: Alive
+#      450: Dead
+#  - type: MeleeWeapon
+#    hidden: true
+#    soundHit:
+#        path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
+#    angle: 0
+#    animation: WeaponArcClaw
+#    damage:
+#      types:
+#        Slash: 25
+#
+#- type: entity
+#  parent: ADTBaseMobNarsiBigDemon
+#  id: ADTDarkRattlesnakeDemon
+#  name: Dark rattlesnake
+#  description: A hissing abyss that awaits the awakening of its master....
+#  components:
+#  - type: Sprite
+#    layers:
+#    - map: [ "enum.DamageStateVisualLayers.Base" ]
+#      state: dark_rattlesnake
+#  - type: DamageStateVisuals
+#    states:
+#      Alive:
+#        Base: dark_rattlesnake
+#      Critical:
+#        Base: dark_rattlesnake_dead
+#      Dead:
+#        Base: dark_rattlesnake_dead
+#  - type: MovementSpeedModifier
+#    baseWalkSpeed: 1.5
+#    baseSprintSpeed: 2.5
+#  - type: MobThresholds
+#    thresholds:
+#      0: Alive
+#      350: Dead
+#  - type: MeleeWeapon
+#    hidden: true
+#    soundHit:
+#        path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
+#    angle: 0
+#    animation: WeaponArcClaw
+#    damage:
+#      types:
+#        Slash: 15
+#        Poison: 5
+#
+#- type: entity
+#  parent: ADTBaseMobNarsiBigDemon
+#  id: ADTBloodyArmySoldierDemon
+#  name: Soldier of the bloody army
+#  description: Loyal servant of the Nar'Si. Will fight to destroy the world until he himself is destroyed.
+#  components:
+#  - type: Sprite
+#    layers:
+#    - map: [ "enum.DamageStateVisualLayers.Base" ]
+#      state: bloody_army_soldier
+#  - type: DamageStateVisuals
+#    states:
+#      Alive:
+#        Base: bloody_army_soldier
+#      Critical:
+#        Base: bloody_army_soldier_dead
+#      Dead:
+#        Base: bloody_army_soldier_dead
+#  - type: MobThresholds
+#    thresholds:
+#      0: Alive
+#      750: Dead
+#  - type: MeleeWeapon
+#    hidden: true
+#    soundHit:
+#        path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
+#    angle: 0
+#    animation: WeaponArcClaw
+#    damage:
+#      types:
+#        Slash: 35
+##Spawn Demons End
+#
+#- type: entity
+#  id: ADTNarsiFireballSpellbook
+#  name: fireball spellbook
+#  parent: BaseSpellbook
+#  components:
+#  - type: Sprite
+#    netsync: false
+#    sprite: Objects/Magic/spellbooks.rsi
+#    layers:
+#    - state: bookfireball
+#  - type: Spellbook
+#    worldSpells:
+#      ADTFireball: -1
+#
+#- type: worldTargetAction
+#  id: ADTFireball
+#  name: action-name-spell-fireball
+#  description: action-description-spell-fireball
+#  useDelay: 0.1
+#  itemIconStyle: BigAction
+#  checkCanAccess: false
+#  range: 60
+#  sound: !type:SoundPathSpecifier
+#    path: /Audio/Magic/fireball.ogg
+#  icon:
+#    sprite: Objects/Magic/magicactions.rsi
+#    state: fireball
+#  serverEvent: !type:ProjectileSpellEvent
+#    prototype: ProjectileFireball
+#    posData: !type:TargetCasterPos
+#    speech: action-speech-spell-fireball
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml
index d9ac4afd255..eee79aa18a6 100644
--- a/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml
@@ -344,63 +344,3 @@
     pryPowered: true
   - type: Fiber
     fiberMaterial: fibers-crusher
-
-- type: entity
-  parent: ClothingHandsBase
-  id: ClothingHandsRingBlood
-  name: blood ring
-  description: Good ring.
-  components:
-  - type: Sprite
-    sprite: ADT/KD/RingBlood.rsi
-  - type: Clothing
-    sprite: ADT/KD/RingBlood.rsi
-  - type: Item
-    size: Tiny
-  - type: StaticPrice
-    price: 1000
-    
-- type: entity
-  parent: ClothingHandsBase
-  id: ClothingHandsRingEmerald
-  name: emerald ring
-  description: Good ring.
-  components:
-  - type: Sprite
-    sprite: ADT/KD/RingEmerald.rsi
-  - type: Clothing
-    sprite: ADT/KD/RingEmerald.rsi
-  - type: Item
-    size: Tiny
-  - type: StaticPrice
-    price: 1000
-
-- type: entity
-  parent: ClothingHandsBase
-  id: ClothingHandsRingPlazma
-  name: plazma ring
-  description: Good ring.
-  components:
-  - type: Sprite
-    sprite: ADT/KD/RingPlazma.rsi
-  - type: Clothing
-    sprite: ADT/KD/RingPlazma.rsi
-  - type: Item
-    size: Tiny
-  - type: StaticPrice
-    price: 1000
-
-- type: entity
-  parent: ClothingHandsBase
-  id: ClothingHandsRingTurk
-  name: turk ring
-  description: Good ring.
-  components:
-  - type: Sprite
-    sprite: ADT/KD/RingTurk.rsi
-  - type: Clothing
-    sprite: ADT/KD/RingTurk.rsi
-  - type: Item
-    size: Tiny
-  - type: StaticPrice
-    price: 1000
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml
deleted file mode 100644
index 75c3f92be77..00000000000
--- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-- type: entity
-  parent: ClothingOuterStorageBase
-  id: ADTClothingOuterVestWebL
-  name: web vest
-  description: A synthetic armor vest. This one has added webbing and ballistic plates.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Vests/webvest.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Vests/webvest.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.6 #ballistic plates = better protection
-        Slash: 0.6
-        Piercing: 0.3
-        Heat: 0.9
-  - type: ExplosionResistance
-    damageCoefficient: 0.9
-  - type: StorageFill
-    contents:
-      - id: WeaponPulsePistol
-
-- type: entity
-  parent: ClothingOuterBaseLarge
-  id: ClothingOuterArmorIPCAntagDrone
-  name: IPC antag drone armor
-  suffix: Drone Antag
-  components:
-    - type: Sprite
-      sprite: Corvax/Clothing/OuterClothing/Armor/centcom_naval_carapace.rsi
-    - type: Clothing
-      sprite: ADT/Clothing/Back/ertleader_cyb.rsi # invisible sprite
-    - type: Unremoveable
-    - type: Armor
-      modifiers:
-        coefficients:
-          Radiation: 0.15
-          Stun: 0.5
-    - type: ExplosionResistance
-      damageCoefficient: 0.75
diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/ghost_roles.yml
deleted file mode 100644
index 6ed97067c27..00000000000
--- a/Resources/Prototypes/ADT/Entities/Markers/Spawners/ghost_roles.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-- type: entity
-  parent: MarkerBase
-  id: SpawnPointGhostLing
-  name: changeling spawn point
-  components:
-  - type: GhostRole
-    name: ghost-role-information-ling-name
-    description: ghost-role-information-ling-description
-    rules: ghost-role-information-ling-rules
-  - type: GhostRoleMobSpawner
-    prototype: ChangelingHeadslugMidround
-  - type: Sprite
-    sprite: ADT/Mobs/Aliens/headslug.rsi
-    layers:
-    - map: ["enum.DamageStateVisualLayers.Base"]
-      state: headslug
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/female_meka.yml b/Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/female_meka.yml
deleted file mode 100644
index 057bb68d9cf..00000000000
--- a/Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/female_meka.yml
+++ /dev/null
@@ -1,275 +0,0 @@
-- type: entity
-  id: ADTTallRobotFMekaCargo
-  parent: ADTTallRobotFMekaBase
-  name: cargo cyborg
-  components:
-  - type: Sprite
-    sprite: ADT/Mobs/Silicon/Bots/tallrobot/fmekacargo.rsi
-    layers:
-    - state: fmekacargo
-      map: ["enum.DamageStateVisualLayers.Base"]
-    - state: fmekacargoe
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: fmekacargoer
-      shader: unshaded
-      visible: false
-    - state: robot_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: BorgChassis
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleCargo
-    hasMindState: fmekacargoe
-    noMindState: fmekacargoer
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: fmekacargo
-      Critical:
-        Base: fmekacargo-wreck
-      Dead:
-        Base: fmekacargo-wreck
-  - type: Construction
-    node: mining
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Supply
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Supply
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgTall
-  
-- type: entity
-  id: ADTTallRobotFMekaEng
-  parent: ADTTallRobotFMekaBase
-  name: eng cyborg
-  components:
-  - type: Sprite
-    sprite: ADT/Mobs/Silicon/Bots/tallrobot/fmekaeng.rsi
-    layers:
-    - state: fmekaeng
-      map: ["enum.DamageStateVisualLayers.Base"]
-    - state: fmekaenge
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: fmekaenger
-      shader: unshaded
-      visible: false
-    - state: robot_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: BorgChassis
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleEngineering
-    hasMindState: fmekaenge
-    noMindState: fmekaenger
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: fmekaeng
-      Critical:
-        Base: fmekaeng-wreck
-      Dead:
-        Base: fmekaeng-wreck
-  - type: Construction
-    node: engineer
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Engineering
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Engineering
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Engineering"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgTall
-
-- type: entity
-  id: ADTTallRobotFMekaJani
-  parent: ADTTallRobotFMekaBase
-  name: service cyborg
-  components:
-  - type: Sprite
-    sprite: ADT/Mobs/Silicon/Bots/tallrobot/fmekajani.rsi
-    layers:
-    - state: fmekajani
-      map: ["enum.DamageStateVisualLayers.Base"]
-    - state: fmekajanie
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: fmekajanier
-      shader: unshaded
-      visible: false
-    - state: robot_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: BorgChassis
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleService
-      - BorgModuleJanitor
-    hasMindState: fmekajanie
-    noMindState: fmekajanier
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: fmekajani
-      Critical:
-        Base: fmekajani-wreck
-      Dead:
-        Base: fmekajani-wreck
-  - type: Construction
-    node: service
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Service
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Service
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Service"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgTall
-
-- type: entity
-  id: ADTTallRobotFMekaMed
-  parent: ADTTallRobotFMekaBase
-  name: med cyborg
-  components:
-  - type: Sprite
-    sprite: ADT/Mobs/Silicon/Bots/tallrobot/fmekamed.rsi
-    layers:
-    - state: fmekamed
-      map: ["enum.DamageStateVisualLayers.Base"]
-    - state: fmekamed_e
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: fmekamed_e_r
-      shader: unshaded
-      visible: false
-    - state: robot_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: BorgChassis
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleMedical
-    hasMindState: fmekamed_e
-    noMindState: fmekamed_e_r
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: fmekamed
-      Critical:
-        Base: fmekamed-wreck
-      Dead:
-        Base: fmekamed-wreck
-  - type: Construction
-    node: service
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Medical
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Medical
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Medical"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgTall
-    
-- type: entity
-  id: ADTTallRobotFMekaServe
-  parent: ADTTallRobotFMekaBase
-  name: service cyborg
-  components:
-  - type: Sprite
-    sprite: ADT/Mobs/Silicon/Bots/tallrobot/fmekaserve.rsi
-    layers:
-    - state: fmekaserv
-      map: ["enum.DamageStateVisualLayers.Base"]
-    - state: fmekaserv_e
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: fmekaserv_e_r
-      shader: unshaded
-      visible: false
-    - state: robot_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: BorgChassis
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleService
-    hasMindState: fmekaserv_e
-    noMindState: fmekaserv_e_r
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: fmekaserv
-      Critical:
-        Base: fmekaserv-wreck
-      Dead:
-        Base: fmekaserv-wreck
-  - type: Construction
-    node: service
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Service
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Service
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Service"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgTall
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/meka.yml b/Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/meka.yml
deleted file mode 100644
index 726b3be12d5..00000000000
--- a/Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/meka.yml
+++ /dev/null
@@ -1,279 +0,0 @@
-- type: entity
-  id: ADTTallRobotMekaCargo
-  parent: ADTTallRobotMekaBase
-  name: cargo cyborg
-  components:
-  - type: Sprite
-    sprite: ADT/Mobs/Silicon/Bots/tallrobot/mekacargo.rsi
-    layers:
-    - state: mekacargo
-      map: ["enum.DamageStateVisualLayers.Base"]
-    - state: mekacargo_e
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: mekacargo_e_r
-      shader: unshaded
-      visible: false
-    - state: robot_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: BorgChassis
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleCargo
-    hasMindState: mekacargo_e
-    noMindState: mekacargo_e_r
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: mekacargo
-      Critical:
-        Base: mekacargo-tipped
-      Dead:
-        Base: mekacargo-tipped
-  - type: Construction
-    node: mining
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Supply
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Supply
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgTall
-
-- type: entity
-  id: ADTTallRobotMekaEng
-  parent: ADTTallRobotMekaBase
-  name: eng cyborg
-  components:
-  - type: Sprite
-    sprite: ADT/Mobs/Silicon/Bots/tallrobot/mekaeng.rsi
-    layers:
-    - state: mekaengi
-      map: ["enum.DamageStateVisualLayers.Base"]
-    - state: mekaengi_e
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: mekaengi_e_r
-      shader: unshaded
-      visible: false
-    - state: robot_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: BorgChassis
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleEngineering
-    hasMindState: mekaengi_e
-    noMindState: mekaengi_e_r
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: mekaengi
-      Critical:
-        Base: mekaengi-tipped
-      Dead:
-        Base: mekaengi-tipped
-  - type: Construction
-    node: engineer
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Engineering
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Engineering
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Engineering"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgTall
-
-- type: entity
-  id: ADTTallRobotMekaJani
-  parent: ADTTallRobotMekaBase
-  name: service cyborg
-  components:
-  - type: Sprite
-    sprite: ADT/Mobs/Silicon/Bots/tallrobot/mekajani.rsi
-    layers:
-    - state: mekajani
-      map: ["enum.DamageStateVisualLayers.Base"]
-    - state: mekajanitipped
-      visible: false
-    - state: mekajanie
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: mekajanier
-      shader: unshaded
-      visible: false
-    - state: mekajanirest
-      visible: false
-    - state: robot_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: BorgChassis
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleService
-      - BorgModuleJanitor
-    hasMindState: mekajanie
-    noMindState: mekajanier
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: mekajani
-      Critical:
-        Base: mekajanitipped
-      Dead:
-        Base: mekajanitipped
-  - type: Construction
-    node: service
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Service
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Service
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Service"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgTall
-
-- type: entity
-  id: ADTTallRobotMekaMed
-  parent: ADTTallRobotMekaBase
-  name: med cyborg
-  components:
-  - type: Sprite
-    sprite: ADT/Mobs/Silicon/Bots/tallrobot/mekamed.rsi
-    layers:
-    - state: mekamed
-      map: ["enum.DamageStateVisualLayers.Base"]
-    - state: mekamed_e
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: mekamed_e_r
-      shader: unshaded
-      visible: false
-    - state: robot_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: BorgChassis
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleMedical
-    hasMindState: mekamed_e
-    noMindState: mekamed_e_r
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: mekamed
-      Critical:
-        Base: mekamed-tipped
-      Dead:
-        Base: mekamed-tipped
-  - type: Construction
-    node: service
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Medical
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Medical
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Medical"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgTall
-
-- type: entity
-  id: ADTTallRobotMekaServe
-  parent: ADTTallRobotMekaBase
-  name: service cyborg
-  components:
-  - type: Sprite
-    sprite: ADT/Mobs/Silicon/Bots/tallrobot/mekaserve.rsi
-    layers:
-    - state: mekaserve
-      map: ["enum.DamageStateVisualLayers.Base"]
-    - state: mekaserve_e
-      map: ["enum.BorgVisualLayers.Light"]
-      shader: unshaded
-      visible: false
-    - state: mekaserve_e_r
-      shader: unshaded
-      visible: false
-    - state: robot_l
-      shader: unshaded
-      map: ["light"]
-      visible: false
-  - type: BorgChassis
-    moduleWhitelist:
-      tags:
-      - BorgModuleGeneric
-      - BorgModuleService
-    hasMindState: mekaserve_e
-    noMindState: mekaserve_e_r
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: mekaserve
-      Critical:
-        Base: mekaserve-tipped
-      Dead:
-        Base: mekaserve-tipped
-  - type: Construction
-    node: service
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Service
-    - Binary
-    - Common
-    - Science
-  - type: ActiveRadio
-    channels:
-    - Service
-    - Binary
-    - Common
-    - Science
-  - type: AccessReader
-    access: [["Service"], ["Command"], ["Research"]]
-  - type: Inventory
-    templateId: borgTall
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/DroneAntag.yml b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/DroneAntag.yml
deleted file mode 100644
index d4cf94acf80..00000000000
--- a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/DroneAntag.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: entity
-  parent: BaseWeaponTurret
-  id: ADTWeaponTurretDroneAntag
-  suffix: Drone Antag
-  components:
-    - type: NpcFactionMember
-      factions:
-        - DroneAntag
-
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/changeling_lavra.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/changeling_lavra.yml
deleted file mode 100644
index f5f1287408b..00000000000
--- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/changeling_lavra.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-- type: entity
-  name: synthetic changeling larva
-  parent: FoodBreadSliceBase
-  id: ADTLingLarva
-  description: No... Don't do it...
-  components:
-  - type: Food
-  - type: Item
-    sprite: ADT/Objects/Specific/genо_larva_white.rsi
-    inhandVisuals:
-      left:
-      - state: inhand-left
-      right:
-      - state: inhand-right
-  - type: Sprite
-    sprite: ADT/Objects/Specific/genо_larva_white.rsi
-    layers:
-    - state: icon
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 4
-        reagents:
-        - ReagentId: ADTLingEggs
-          Quantity: 4 # Just using the same values as the bun values, since the recipe for taco shells is roughly the same as buns.
-  - type: Tag
-    tags:
-    - ADTCarnivoreFriendlyFood
-  - type: FlavorProfile
-    flavors:
-      - terrible
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/specialitems.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/specialitems.yml
deleted file mode 100644
index eba9d9b996c..00000000000
--- a/Resources/Prototypes/ADT/Entities/Objects/Fun/specialitems.yml
+++ /dev/null
@@ -1,185 +0,0 @@
-
-# Сборище чего-то у чего трудно определить категорию так как являются имеными предметами
-- type: entity
-  name: Yumi Degurshav's tail.
-  id: ADTWeaponMinigunL
-  parent: BaseWeaponHeavyMachineGun
-  description: "Improved minigun model with reduced magazine, increased damage and toxic effect. Made by a brilliant beastman girl. P.S. This weapon saved her life when escaping from the captivity of the cultists."
-  components:
-  - type: Sprite
-    sprite: ADT/Objects/Weapons/Guns/HMGs/yumidegurshavstail.rsi
-    layers:
-    - state: icon
-      map: ["enum.GunVisualLayers.Base"]
-  - type: Item
-    size: Tiny
-    sprite: ADT/Objects/Weapons/Guns/HMGs/yumidegurshavstail.rsi
-  - type: Gun
-    fireRate: 30
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/minigun.ogg
-  - type: BallisticAmmoProvider
-    proto: ADTCartridgeMinigun
-    capacity: 150
-  - type: MagazineVisuals
-    magState: mag
-    steps: 4
-    zeroVisible: true
-  - type: Appearance
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-        ents: []
-
-- type: entity
-  name: Kiirava magic wand.
-  id: ADTKiiravamagicwand
-  parent: BaseWeaponHeavyMachineGun
-  description: "Improved minigun model with reduced magazine, increased damage and toxic effect. Made by a brilliant beastman girl. P.S. This weapon saved her life when escaping from the captivity of the cultists."
-  components:
-  - type: Sprite
-    sprite: ADT/Objects/Weapons/Guns/kiiravamagicwand.rsi
-    layers:
-    - state: icon
-      map: ["enum.GunVisualLayers.Base"]
-  - type: Item
-    size: Tiny
-    sprite: ADT/Objects/Weapons/Guns/kiiravamagicwand.rsi
-  - type: Gun
-    fireRate: 1
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/Magic/staff_healing.ogg
-  - type: BallisticAmmoProvider
-    proto: ADTCartridgeMinigun
-    capacity: 1500
-  - type: MagazineVisuals
-    magState: mag
-    steps: 4
-    zeroVisible: true
-  - type: Appearance
-  - type: ContainerContainer
-    containers:
-      ballistic-ammo: !type:Container
-        ents: []
-
-- type: entity
-  name: Holographic monocline
-  parent: BaseItem
-  id: ADTHolographicMonoclineL
-  description: This device was implanted in Inna from birth, has amazing sharpness and ephemeral pain.
-  components:
-  - type: Sharp
-  - type: Sprite
-    sprite: ADT/Objects/Weapons/Melee/holographic-monocline.rsi
-    state: icon
-  - type: MeleeWeapon
-    attackRate: 0.75
-    damage:
-      types:
-        Slash: 10
-        Piercing: 5
-        Radiation: 10
-  - type: Item
-    size: Normal
-    sprite: ADT/Objects/Weapons/Melee/holographic-monocline.rsi
-  - type: Tool
-    qualities:
-      - Prying
-  - type: IgniteOnMeleeHit
-    fireStacks: 1
-
-- type: entity
-  parent: ClothingUniformBase
-  id: ADTClothingUniformsJumpsuitWhiteDiplomatSuitL
-  name: White diplomat suit
-  description: Exquisite white suit worn by NanoTrasen diplomats.
-  components:
-  - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi
-  - type: Clothing
-    sprite: ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi
-
-- type: entity
-  name: станнер Эйдана
-  parent: BaseWeaponBatterySmall
-  id: WeaponDisablerIdan
-  description: На вкус как бикаридин.
-  components:
-    - type: Tag
-      tags:
-        - Taser
-    - type: Sprite
-      sprite: ADT/Memes/gold-staner.rsi
-      layers:
-        - state: base
-          map: ["enum.GunVisualLayers.Base"]
-        - state: mag-unshaded-0
-          map: ["enum.GunVisualLayers.MagUnshaded"]
-          shader: unshaded
-    - type: Clothing
-      sprite: ADT/Memes/gold-staner.rsi
-      quickEquip: false
-      slots:
-        - Belt
-    - type: Gun
-      fireRate: 2
-      soundGunshot:
-        path: /Audio/Animals/cat_meow.ogg
-    - type: ProjectileBatteryAmmoProvider
-      proto: BulletDisabler
-      fireCost: 100
-    - type: MagazineVisuals
-      magState: mag
-      steps: 5
-      zeroVisible: true
-    - type: Appearance
-
-# Очень странный предмет,ума не приложу когда его запихнуть
-- type: entity
-  name: fire born
-  parent: BaseItem
-  id: FireBorn
-  description: born fire
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: ADT/KD/fireborn.rsi
-    layers:
-        - state: fire_extinguisher_closed
-          map: [ "enabled" ]
-  - type: Item
-    sprite: ADT/KD/fireborn.rsi
-    size: Normal
-  - type: SolutionContainerManager
-    solutions:
-      spray:
-        maxVol: 1000
-        reagents:
-        - ReagentId: Phlogiston
-          Quantity: 100
-        - ReagentId: Napalm
-          Quantity: 900
-  - type: RefillableSolution
-    solution: spray
-  - type: DrainableSolution
-    solution: spray
-  #- type: ItemCooldown
-  - type: Spray
-    spraySound:
-      path: /Audio/Effects/extinguish.ogg
-    sprayedPrototype: ExtinguisherSpray
-    vaporAmount: 3
-    vaporSpread: 90
-    sprayVelocity: 2.0
-    sprayTimeAlive: 1.5
-    transferAmount: 5
-    impulse: 50.0
-  - type: FireExtinguisher
-    hasSafety: true
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.FireExtinguisherVisuals.Safety:
-        enabled:
-          True: { state: fire_extinguisher_closed }
-          False: { state: fire_extinguisher_open }
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/paper.yml
index b838ab97743..5bb9b2df201 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/paper.yml
@@ -146,69 +146,3 @@
   - type: StorageFill
     contents:
       - id: ADTPaperValentineRed
-
-- type: entity
-  id: BoxFolderGreyFilled
-  parent: BoxFolderBase
-  suffix: Red
-  components:
-    - type: StorageFill
-      contents:
-      - id: Paper
-        amount: 10
-    - type: Sprite
-      sprite: Objects/Misc/bureaucracy.rsi
-      layers:
-      - state: folder-colormap
-        color: "#999999"
-      - state: folder-base
-
-- type: entity
-  id: BoxFolderBlueFilled
-  parent: BoxFolderBase
-  suffix: Blue
-  components:
-    - type: StorageFill
-      contents:
-      - id: Paper
-        amount: 10
-    - type: Sprite
-      sprite: Objects/Misc/bureaucracy.rsi
-      layers:
-      - state: folder-colormap
-        color: "#355d99"
-      - state: folder-base
-
-- type: entity
-  id: BoxFolderRedFilled
-  parent: BoxFolderBase
-  suffix: Red
-  components:
-    - type: StorageFill
-      contents:
-      - id: Paper
-        amount: 10
-    - type: Sprite
-      sprite: Objects/Misc/bureaucracy.rsi
-      layers:
-      - state: folder-colormap
-        color: "#cc2323"
-      - state: folder-base
-
-- type: entity
-  name: creator pen
-  parent: BaseItem
-  id: PenCreator
-  description: creator's pen
-  components:
-  - type: Tag
-    tags:
-    - Write
-  - type: Sprite
-    sprite: ADT/KD/pen.rsi
-    state: pen
-  - type: Item
-    sprite: ADT/KD/pen.rsi
-    heldPrefix: pen
-    size: Tiny
-
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Salvage/ore_bag.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Salvage/ore_bag.yml
deleted file mode 100644
index f7a8dec88f3..00000000000
--- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Salvage/ore_bag.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-- type: entity
-  name: ore bag
-  id: OreBagAntagDrone
-  parent: BaseStorageItem
-  suffix: Antag Drone
-  components:
-  - type: MagnetPickup
-  - type: Sprite
-    sprite: Objects/Specific/Mining/ore_bag.rsi
-    state: icon
-  - type: Clothing
-    sprite: ADT/Clothing/Back/ertleader_cyb.rsi # invisible sprite
-    quickEquip: false
-    slots:
-    - belt
-  - type: Item
-    size: Ginormous
-  - type: Storage
-    maxItemSize: Normal
-    grid:
-    - 0,0,9,3
-    quickInsert: true
-    areaInsert: true
-    whitelist:
-      tags:
-        - ArtifactFragment
-        - Ore
-  - type: Dumpable
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
deleted file mode 100644
index 9c0fba0eedf..00000000000
--- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-- type: entity
-  id: ADTCartridgeMinigun
-  name: cartridge (.10 rifle)
-  parent: BaseCartridgeHeavyRifle
-  components:
-  - type: CartridgeAmmo
-    proto: ADTBulletMinigun
-    deleteOnSpawn: true
-
-- type: entity
-  id: ADTCartridgeWand
-  name: cartridge (.10 rifle)
-  parent: BaseCartridgeHeavyRifle
-  components:
-  - type: CartridgeAmmo
-    proto: ADTBulletWand
-    deleteOnSpawn: true
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
deleted file mode 100644
index e9002c43f50..00000000000
--- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-- type: entity
-  id: ADTBulletMinigun
-  name: minigun bullet (.10 rifle)
-  parent: BulletHeavyRifle
-  noSpawn: true
-  components:
-  - type: Projectile
-    damage:
-      types:
-        Piercing: 6
-        Poison: 1
-
-- type: entity
-  id: ADTBulletWand
-  name: minigun bullet (.10 rifle)
-  parent: BulletHeavyRifle
-  noSpawn: true
-  components:
-  - type: Projectile
-    damage:
-      types:
-        Slash: 50
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Machines/external_fax.yml b/Resources/Prototypes/ADT/Fax/ExternalFax.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Structures/Machines/external_fax.yml
rename to Resources/Prototypes/ADT/Fax/ExternalFax.yml
diff --git a/Resources/Prototypes/ADT/Body/Organs/felinid.yml b/Resources/Prototypes/ADT/Felinid/Body/Organs/felinid.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Organs/felinid.yml
rename to Resources/Prototypes/ADT/Felinid/Body/Organs/felinid.yml
diff --git a/Resources/Prototypes/ADT/Body/Prototypes/felinid.yml b/Resources/Prototypes/ADT/Felinid/Body/Prototypes/felinid.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Prototypes/felinid.yml
rename to Resources/Prototypes/ADT/Felinid/Body/Prototypes/felinid.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/felinid.yml b/Resources/Prototypes/ADT/Felinid/Mobs/Player/felinid.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/player/felinid.yml
rename to Resources/Prototypes/ADT/Felinid/Mobs/Player/felinid.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/ADT/Felinid/Mobs/Species/felinid.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Species/felinid.yml
rename to Resources/Prototypes/ADT/Felinid/Mobs/Species/felinid.yml
diff --git a/Resources/Prototypes/ADT/Felinid/Sound/sound_collections.yml b/Resources/Prototypes/ADT/Felinid/Sound/sound_collections.yml
new file mode 100644
index 00000000000..fe9bfc5ff75
--- /dev/null
+++ b/Resources/Prototypes/ADT/Felinid/Sound/sound_collections.yml
@@ -0,0 +1,35 @@
+- type: soundCollection
+  id: FelinidScreams
+  files:
+  - /Audio/ADT/Felinid/cat_scream1.ogg
+  - /Audio/ADT/Felinid/cat_scream2.ogg
+  - /Audio/ADT/Felinid/cat_scream3.ogg
+
+- type: soundCollection
+  id: FelinidHisses
+  files:
+  - /Audio/ADT/Felinid/cat_hiss1.ogg
+  - /Audio/ADT/Felinid/cat_hiss2.ogg
+
+- type: soundCollection
+  id: FelinidMeows
+  files:
+  - /Audio/ADT/Felinid/cat_meow1.ogg
+  - /Audio/ADT/Felinid/cat_meow2.ogg
+  - /Audio/ADT/Felinid/cat_meow3.ogg
+
+- type: soundCollection
+  id: FelinidMews
+  files:
+  - /Audio/ADT/Felinid/cat_mew1.ogg
+  - /Audio/ADT/Felinid/cat_mew2.ogg
+
+- type: soundCollection
+  id: FelinidGrowls
+  files:
+  - /Audio/ADT/Felinid/cat_growl1.ogg
+
+- type: soundCollection
+  id: FelinidPurrs
+  files:
+  - /Audio/ADT/Felinid/cat_purr1.ogg
diff --git a/Resources/Prototypes/ADT/Felinid/Sound/speech_emote_sounds.yml b/Resources/Prototypes/ADT/Felinid/Sound/speech_emote_sounds.yml
new file mode 100644
index 00000000000..d10b2e092e5
--- /dev/null
+++ b/Resources/Prototypes/ADT/Felinid/Sound/speech_emote_sounds.yml
@@ -0,0 +1,97 @@
+- type: emoteSounds
+  id: MaleFelinid
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: FelinidScreams
+    Laugh:
+      collection: MaleLaugh
+    Hiss:
+      collection: FelinidHisses
+    Meow:
+      collection: FelinidMeows
+    Mew:
+      collection: FelinidMews
+    Growl:
+      collection: FelinidGrowls
+    Purr:
+      collection: FelinidPurrs
+    Sneeze:
+      collection: MaleSneezes
+    Cough:
+      collection: MaleCoughs
+    MonkeyScreeches:
+      collection: MonkeyScreeches
+    RobotBeep:
+      collection: RobotBeeps
+    Yawn:
+      collection: MaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: BikeHorn
+    Sigh:
+      collection: MaleSigh
+    Crying:
+      collection: MaleCry
+    Whistle:
+      collection: Whistles
+    # ADT-Apathy Sounds. 
+    Scream-apathy:
+      collection: FelinidScreams
+    Laugh-apathy:
+      collection: MaleLaugh 
+    Sigh-apathy:
+      collection: MaleSigh
+    Crying-apathy:
+      collection: MaleCry
+
+- type: emoteSounds
+  id: FemaleFelinid
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: FelinidScreams
+    Laugh:
+      collection: FemaleLaugh
+    Sneeze:
+      collection: FemaleSneezes
+    Cough:
+      collection: FemaleCoughs
+    Hiss:
+      collection: FelinidHisses
+    Meow:
+      collection: FelinidMeows
+    Mew:
+      collection: FelinidMews
+    Growl:
+      collection: FelinidGrowls
+    Purr:
+      collection: FelinidPurrs
+    MonkeyScreeches:
+      collection: MonkeyScreeches
+    RobotBeep:
+      collection: RobotBeeps
+    Yawn:
+      collection: FemaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: CluwneHorn
+    Sigh:
+      collection: FemaleSigh
+    Crying:
+      collection: FemaleCry
+    Whistle:
+      collection: Whistles
+    # ADT-Apathy Sounds. 
+    Scream-apathy:
+      collection: FelinidScreams
+    Laugh-apathy:
+      collection: FemaleLaugh 
+    Sigh-apathy:
+      collection: FemaleSigh
+    Crying-apathy:
+      collection: FemaleCry
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Felinid/Sound/speech_emotes.yml b/Resources/Prototypes/ADT/Felinid/Sound/speech_emotes.yml
new file mode 100644
index 00000000000..8f9da3c4d7a
--- /dev/null
+++ b/Resources/Prototypes/ADT/Felinid/Sound/speech_emotes.yml
@@ -0,0 +1,66 @@
+## vocal emotes
+- type: emote
+  id: Hiss
+  category: Vocal
+  chatMessages: [шипит]
+  chatTriggers:
+    - шипит
+    - шипит.
+    - шипит!
+
+- type: emote
+  id: Meow
+  category: Vocal
+  chatMessages: [мяукает]
+  chatTriggers:
+    - мяу
+    - мяукнул
+    - мяукнул.
+    - мяукнул!
+    - мяукнула
+    - мяукнула.
+    - мяукнула!
+    - мяукает
+    - мяукает.
+    - мяукает!
+
+- type: emote
+  id: Mew
+  category: Vocal
+  chatMessages: [мякает]
+  chatTriggers:
+    - мя
+    - мякает
+    - мякает.
+    - мякает!
+    - ня
+    - мякает?
+    - mews.
+    - mews!
+    - mewing
+    - mewed
+
+- type: emote
+  id: Growl
+  category: Vocal
+  chatMessages: [growls]
+  chatTriggers:
+    - рычит
+    - ррр
+    - growl
+    - growls
+    - growls.
+    - growls!
+    - growling
+    - growled
+
+- type: emote
+  id: Purr
+  category: Vocal
+  chatMessages: [мурчит]
+  chatTriggers:
+    - мур
+    - мурчит
+    - мурчит.
+    - мурчит!
+
diff --git a/Resources/Prototypes/ADT/Species/felinid.yml b/Resources/Prototypes/ADT/Felinid/Species/felinid.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Species/felinid.yml
rename to Resources/Prototypes/ADT/Felinid/Species/felinid.yml
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/ADTrewards.yml b/Resources/Prototypes/ADT/Fills/Crates/ADTrewards.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Catalog/Fills/Crates/ADTrewards.yml
rename to Resources/Prototypes/ADT/Fills/Crates/ADTrewards.yml
diff --git a/Resources/Prototypes/ADT/GameRules/events.yml b/Resources/Prototypes/ADT/GameRules/events.yml
deleted file mode 100644
index 8d7793a82c1..00000000000
--- a/Resources/Prototypes/ADT/GameRules/events.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: entity
-  parent: BaseGameRule
-  id: MidroundChangelingSpawn
-  noSpawn: true
-  components:
-  - type: StationEvent
-    weight: 10
-    duration: 1
-    earliestStart: 30
-    minimumPlayers: 40
-  - type: RandomSpawnRule
-    prototype: SpawnPointGhostLing
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/GameRules/midround.yml b/Resources/Prototypes/ADT/GameRules/midround.yml
deleted file mode 100644
index 8c46c2b9e30..00000000000
--- a/Resources/Prototypes/ADT/GameRules/midround.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: entity
-  noSpawn: true
-  parent: BaseGameRule
-  id: LingMidround
-  components:
-  - type: GenericAntagRule
-    agentName: ling-round-end-agent-name  
-    objectives:
-    - EscapeLingShuttleObjective
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Hydroponics/buckwheat_plant.yml b/Resources/Prototypes/ADT/Hydroponics/buckwheat_plant.yml
new file mode 100644
index 00000000000..25147e71c8a
--- /dev/null
+++ b/Resources/Prototypes/ADT/Hydroponics/buckwheat_plant.yml
@@ -0,0 +1,21 @@
+- type: seed
+  id: ADTbuckwheatplant
+  name: seeds-buckwheat-name
+  noun: seeds-noun-seeds
+  displayName: seeds-buckwheat-display-name
+  plantRsi: ADT/Objects/Specific/Hydroponics/buckwheat.rsi
+  packetPrototype: ADTBuckwheatSeeds
+  productPrototypes:
+    - ADTBuckwheatFood
+  harvestRepeat: Repeat
+  lifespan: 55
+  maturation: 6
+  production: 9
+  yield: 3
+  potency: 10
+  idealLight: 6
+  chemicals:
+    ADTBuckwheatSolids:
+      Min: 2
+      Max: 10
+      PotencyDivisor: 10
diff --git a/Resources/Prototypes/ADT/Hydroponics/cocoa_tree.yml b/Resources/Prototypes/ADT/Hydroponics/cocoa_tree.yml
new file mode 100644
index 00000000000..379f240bd69
--- /dev/null
+++ b/Resources/Prototypes/ADT/Hydroponics/cocoa_tree.yml
@@ -0,0 +1,21 @@
+#- type: seed
+#  id: ADTcocoatree
+#  name: cocoa-tree-seed
+#  noun: cocoa-tree
+#  displayName: cocoa-tree
+#  plantRsi: ADT/Objects/Specific/Hydroponics/cocoa.rsi
+#  packetPrototype: ADTCocoaSeeds
+#  productPrototypes:
+#    - ADTCocoaFood
+#  harvestRepeat: Repeat
+#  lifespan: 55
+#  maturation: 6
+#  production: 6
+#  yield: 3
+#  potency: 10
+#  idealLight: 6
+#  chemicals:
+#    CocoaSolids:
+#      Min: 3
+#      Max: 30
+#      PotencyDivisor: 10
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/ADT/Hydroponics/leaves/mutatedproduct.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/leaves.yml
rename to Resources/Prototypes/ADT/Hydroponics/leaves/mutatedproduct.yml
diff --git a/Resources/Prototypes/ADT/Hydroponics/pumpkin.yml b/Resources/Prototypes/ADT/Hydroponics/pumpkin.yml
new file mode 100644
index 00000000000..618d30902e7
--- /dev/null
+++ b/Resources/Prototypes/ADT/Hydroponics/pumpkin.yml
@@ -0,0 +1,24 @@
+- type: seed
+  id: adt_pumpkin
+  name: seeds-pumpkin-name
+  noun: seeds-noun-seeds
+  displayName: seeds-pumpkin-display-name
+  plantRsi: ADT/Objects/Specific/Hydroponics/pumpkin.rsi
+  packetPrototype: ADTPumpkinSeeds
+  productPrototypes:
+    - ADTFoodPumpkin
+  lifespan: 45
+  maturation: 8
+  production: 6
+  yield: 2
+  potency: 1
+  idealLight: 8
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 10
+    Vitamin:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
diff --git a/Resources/Prototypes/ADT/Hydroponics/seeds.yml b/Resources/Prototypes/ADT/Hydroponics/seeds.yml
deleted file mode 100644
index 273607fef2c..00000000000
--- a/Resources/Prototypes/ADT/Hydroponics/seeds.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-- type: seed
-  id: ADTPapaverSomniferum
-  name: seeds-papaver-somniferum-name
-  noun: seeds-noun-seeds
-  displayName: seeds-papaver-somniferum-display-name
-  plantRsi: ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi
-  packetPrototype: ADTPapaverSomniferumSeeds
-  productPrototypes: 
-    - ADTFoodPapaverSomniferum
-  lifespan: 25
-  maturation: 10
-  production: 3
-  yield: 3
-  potency: 10
-  growthStages: 3
-  waterConsumption: 0.60
-  chemicals:
-    Nutriment:
-      Min: 1
-      Max: 2
-      Potencydivisor: 50
-    Toxin:
-      Min: 1
-      Max: 4
-      PotencyDivisor: 5
-    ADTMOpium:
-      Min: 1
-      Max: 10
-      PotencyDivisor: 5
-
-- type: seed
-  id: ADTbuckwheatplant
-  name: seeds-buckwheat-name
-  noun: seeds-noun-seeds
-  displayName: seeds-buckwheat-display-name
-  plantRsi: ADT/Objects/Specific/Hydroponics/buckwheat.rsi
-  packetPrototype: ADTBuckwheatSeeds
-  productPrototypes:
-    - ADTBuckwheatFood
-  harvestRepeat: Repeat
-  lifespan: 55
-  maturation: 6
-  production: 9
-  yield: 3
-  potency: 10
-  idealLight: 6
-  chemicals:
-    ADTBuckwheatSolids:
-      Min: 2
-      Max: 10
-      PotencyDivisor: 10
-
-- type: seed
-  id: adt_pumpkin
-  name: seeds-pumpkin-name
-  noun: seeds-noun-seeds
-  displayName: seeds-pumpkin-display-name
-  plantRsi: ADT/Objects/Specific/Hydroponics/pumpkin.rsi
-  packetPrototype: ADTPumpkinSeeds
-  productPrototypes:
-    - ADTFoodPumpkin
-  lifespan: 45
-  maturation: 8
-  production: 6
-  yield: 2
-  potency: 1
-  idealLight: 8
-  chemicals:
-    Nutriment:
-      Min: 1
-      Max: 10
-      PotencyDivisor: 10
-    Vitamin:
-      Min: 1
-      Max: 5
-      PotencyDivisor: 20
diff --git a/Resources/Prototypes/ADT/Hydroponics/mutations.yml b/Resources/Prototypes/ADT/Hydroponics/seeds/mutated.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Hydroponics/mutations.yml
rename to Resources/Prototypes/ADT/Hydroponics/seeds/mutated.yml
diff --git a/Resources/Prototypes/ADT/Hydroponics/seeds/seeds.yml b/Resources/Prototypes/ADT/Hydroponics/seeds/seeds.yml
new file mode 100644
index 00000000000..2386bbd8678
--- /dev/null
+++ b/Resources/Prototypes/ADT/Hydroponics/seeds/seeds.yml
@@ -0,0 +1,29 @@
+- type: seed
+  id: ADTPapaverSomniferum
+  name: seeds-papaver-somniferum-name
+  noun: seeds-noun-seeds
+  displayName: seeds-papaver-somniferum-display-name
+  plantRsi: ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi
+  packetPrototype: ADTPapaverSomniferumSeeds
+  productPrototypes: 
+    - ADTFoodPapaverSomniferum
+  lifespan: 25
+  maturation: 10
+  production: 3
+  yield: 3
+  potency: 10
+  growthStages: 3
+  waterConsumption: 0.60
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 2
+      Potencydivisor: 50
+    Toxin:
+      Min: 1
+      Max: 4
+      PotencyDivisor: 5
+    ADTMOpium:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 5
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/IPC/sound_collections.yml b/Resources/Prototypes/ADT/IPC/sound_collections.yml
new file mode 100644
index 00000000000..6a773358569
--- /dev/null
+++ b/Resources/Prototypes/ADT/IPC/sound_collections.yml
@@ -0,0 +1,24 @@
+- type: soundCollection
+  id: SynthYes
+  files:
+    - /Audio/ADT/IPC/synth_yes.ogg
+
+- type: soundCollection
+  id: SynthNo
+  files:
+    - /Audio/ADT/IPC/synth_no.ogg
+
+- type: soundCollection
+  id: Ping
+  files:
+    - /Audio/ADT/IPC/ping.ogg
+
+- type: soundCollection
+  id: Buzz
+  files:
+    - /Audio/ADT/IPC/buzz-sigh.ogg
+
+- type: soundCollection
+  id: SighBuzz
+  files:
+    - /Audio/ADT/IPC/buzz-two.ogg
diff --git a/Resources/Prototypes/ADT/IPC/speech_emote_sounds.yml b/Resources/Prototypes/ADT/IPC/speech_emote_sounds.yml
new file mode 100644
index 00000000000..58bf587145f
--- /dev/null
+++ b/Resources/Prototypes/ADT/IPC/speech_emote_sounds.yml
@@ -0,0 +1,21 @@
+- type: emoteSounds
+  id: UnisexIPC
+  sounds:
+    RobotBeep:
+      collection: RobotBeeps
+    SynthYes:
+      path: /Audio/ADT/IPC/synth_yes.ogg
+    SynthNo:
+      path: /Audio/ADT/IPC/synth_no.ogg
+    Ping:
+      path: /Audio/ADT/IPC/ping.ogg
+    Buzz:
+      path: /Audio/ADT/IPC/buzz-sigh.ogg
+    SighBuzz:
+      path: /Audio/ADT/IPC/buzz-two.ogg
+    Sigh:
+      path: /Audio/ADT/IPC/buzz-two.ogg
+    Scream:
+      path: /Audio/ADT/IPC/synth_scream.ogg
+  params:
+    variation: 0.125
diff --git a/Resources/Prototypes/ADT/IPC/speech_emotes.yml b/Resources/Prototypes/ADT/IPC/speech_emotes.yml
new file mode 100644
index 00000000000..9e795df084f
--- /dev/null
+++ b/Resources/Prototypes/ADT/IPC/speech_emotes.yml
@@ -0,0 +1,45 @@
+- type: emote
+  id: SynthYes
+  category: Vocal
+  chatMessages: [утвердительно пищит]
+  chatTriggers:
+    - утвердительно пищит
+    - утвердительно пищит.
+    - соглашается
+    - соглашается.
+    - согласен
+    - согласен.
+    - подтверждает
+    - подтверждает.
+
+- type: emote
+  id: SynthNo
+  category: Vocal
+  chatMessages: [отрицательно пищит]
+  chatTriggers:
+    - отрицательно пищит
+    - отрицательно пищит.
+    - отрицает
+    - отрицает.
+    - не соглашается
+    - не соглашается.
+    - не согласен
+    - не согласен.
+
+- type: emote
+  id: Ping
+  category: Vocal
+  chatMessages: [звенит]
+  chatTriggers:
+    - звенит
+    - звенит.
+
+- type: emote
+  id: SighBuzz
+  category: Vocal
+  chatMessages: [раздражённо жужжит]
+  chatTriggers:
+    - раздражённо жужжит
+    - раздражённо жужжит.
+    - раздраженно жужжит
+    - раздраженно жужжит.
diff --git a/Resources/Prototypes/ADT/InventoryTemplates/foodbot.yml b/Resources/Prototypes/ADT/InventoryTemplates/foodbot.yml
deleted file mode 100644
index d324247597f..00000000000
--- a/Resources/Prototypes/ADT/InventoryTemplates/foodbot.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-- type: inventoryTemplate
-  id: foodDistributorBots
-  slots:
-    - name: outerClothing
-      slotTexture: suit
-      slotFlags: OUTERCLOTHING
-      slotGroup: MainHotbar
-      stripTime: 6
-      uiWindowPos: 1,2
-      strippingWindowPos: 1,2
-      displayName: Suit
-
-    - name: back
-      slotTexture: back
-      slotFlags: BACK
-      slotGroup: MainHotbar
-      stripTime: 6
-      uiWindowPos: 3,0
-      strippingWindowPos: 0,5
-      displayName: Back
diff --git a/Resources/Prototypes/ADT/KD/Cargo/GravityForCargo.yml b/Resources/Prototypes/ADT/KD/Cargo/GravityForCargo.yml
new file mode 100644
index 00000000000..07e4337af8e
--- /dev/null
+++ b/Resources/Prototypes/ADT/KD/Cargo/GravityForCargo.yml
@@ -0,0 +1,19 @@
+- type: cargoProduct
+  id: GravityGeneratorMini
+  icon:
+    sprite: Structures/Machines/gravity_generator_mini.rsi
+    state: on
+  product: GravityGeneratorMini
+  cost: 4000
+  category: cargoproduct-category-name-shuttle
+  group: market
+
+- type: cargoProduct
+  id: CargoGravityGenerator
+  icon:
+    sprite: Structures/Machines/gravity_generator.rsi
+    state: on
+  product: CrateEngineeringGravityGenerator
+  cost: 20000
+  category: cargoproduct-category-name-shuttle
+  group: market
diff --git a/Resources/Prototypes/ADT/KD/Cargo/RingBox.yml b/Resources/Prototypes/ADT/KD/Cargo/RingBox.yml
new file mode 100644
index 00000000000..ef3c564a4da
--- /dev/null
+++ b/Resources/Prototypes/ADT/KD/Cargo/RingBox.yml
@@ -0,0 +1,9 @@
+- type: cargoProduct
+  id: FunRingBox
+  icon:
+    sprite: ADT/KD/RingBox.rsi
+    state: box
+  product: RingBox
+  cost: 8000
+  category: cargoproduct-category-name-fun
+  group: market
diff --git a/Resources/Prototypes/ADT/KD/Cargo/VectorCrate.yml b/Resources/Prototypes/ADT/KD/Cargo/VectorCrate.yml
new file mode 100644
index 00000000000..28d65b86c16
--- /dev/null
+++ b/Resources/Prototypes/ADT/KD/Cargo/VectorCrate.yml
@@ -0,0 +1,9 @@
+#- type: cargoProduct
+#  id: ArmoryVectorRubber
+#  icon:
+#    sprite: Objects/Weapons/Guns/SMGs/vector.rsi
+#    state: icon
+#  product: CrateArmoryVector
+#  cost: 4000
+#  category: Armory
+#  group: market
diff --git a/Resources/Prototypes/ADT/KD/Channels/Channels/DroneAntagChannel.yml b/Resources/Prototypes/ADT/KD/Channels/Channels/DroneAntagChannel.yml
new file mode 100644
index 00000000000..8a9c2c478e3
--- /dev/null
+++ b/Resources/Prototypes/ADT/KD/Channels/Channels/DroneAntagChannel.yml
@@ -0,0 +1,7 @@
+- type: radioChannel
+  id: ADTDroneAntagChannel
+  name: Дроны
+  keycode: 'й'
+  frequency: 1301
+  color: "#c21919"
+  longRange: true
diff --git a/Resources/Prototypes/ADT/KD/Channels/Channels/RoboticChannel.yml b/Resources/Prototypes/ADT/KD/Channels/Channels/RoboticChannel.yml
new file mode 100644
index 00000000000..aba1a9addd2
--- /dev/null
+++ b/Resources/Prototypes/ADT/KD/Channels/Channels/RoboticChannel.yml
@@ -0,0 +1,6 @@
+- type: radioChannel
+  id: ADTSilicon
+  name: Синтетики
+  keycode: 'б'
+  frequency: 1300
+  color: "#7df9ff"
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/EncryptionKey.yml b/Resources/Prototypes/ADT/KD/Channels/keys/DroneAntagKey.yml
similarity index 51%
rename from Resources/Prototypes/ADT/Entities/Objects/Device/EncryptionKey.yml
rename to Resources/Prototypes/ADT/KD/Channels/keys/DroneAntagKey.yml
index 12bc512c14f..0525f422152 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Device/EncryptionKey.yml
+++ b/Resources/Prototypes/ADT/KD/Channels/keys/DroneAntagKey.yml
@@ -13,17 +13,3 @@
     layers:
     - state: crypt_silver
     - state: rd_label
-
-- type: entity
-  parent: EncryptionKey
-  id: EncryptionKeyBotic
-  name: Ключ к каналу ботов
-  description: Ключ к доступу каналов ботов.
-  components:
-  - type: EncryptionKey
-    channels:
-    - ADTSilicon
-    defaultChannel: ADTSilicon
-  - type: Sprite
-    sprite: Objects/Devices/encryption_keys.rsi
-    state: robotics_label
diff --git a/Resources/Prototypes/ADT/KD/Channels/keys/RoboticKey.yml b/Resources/Prototypes/ADT/KD/Channels/keys/RoboticKey.yml
new file mode 100644
index 00000000000..f7a0fdf7454
--- /dev/null
+++ b/Resources/Prototypes/ADT/KD/Channels/keys/RoboticKey.yml
@@ -0,0 +1,13 @@
+- type: entity
+  parent: EncryptionKey
+  id: EncryptionKeyBotic
+  name: Ключ к каналу ботов
+  description: Ключ к доступу каналов ботов.
+  components:
+  - type: EncryptionKey
+    channels:
+    - ADTSilicon
+    defaultChannel: ADTSilicon
+  - type: Sprite
+    sprite: Objects/Devices/encryption_keys.rsi
+    state: robotics_label
diff --git a/Resources/Prototypes/ADT/KD/Crates/VectorCrate.yml b/Resources/Prototypes/ADT/KD/Crates/VectorCrate.yml
new file mode 100644
index 00000000000..2ed2e281a60
--- /dev/null
+++ b/Resources/Prototypes/ADT/KD/Crates/VectorCrate.yml
@@ -0,0 +1,11 @@
+- type: entity
+  id: CrateArmoryVector
+  name: vector crate (rubber)
+  parent: CrateWeaponSecure
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponSubMachineGunVectorRubber
+        amount: 2
+      - id: MagazineMagnumSubMachineGunRubber
+        amount: 6
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/JayBeret.yml b/Resources/Prototypes/ADT/KD/Entites/Clothing/Hat/JayBeret.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/JayBeret.yml
rename to Resources/Prototypes/ADT/KD/Entites/Clothing/Hat/JayBeret.yml
diff --git a/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingBlood.yml b/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingBlood.yml
new file mode 100644
index 00000000000..9619d3f10e4
--- /dev/null
+++ b/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingBlood.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsRingBlood
+  name: blood ring
+  description: Good ring.
+  components:
+  - type: Sprite
+    sprite: ADT/KD/RingBlood.rsi
+  - type: Clothing
+    sprite: ADT/KD/RingBlood.rsi
+  - type: Item
+    size: Tiny
+  - type: StaticPrice
+    price: 1000
diff --git a/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingEmerald.yml b/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingEmerald.yml
new file mode 100644
index 00000000000..7205443e852
--- /dev/null
+++ b/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingEmerald.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsRingEmerald
+  name: emerald ring
+  description: Good ring.
+  components:
+  - type: Sprite
+    sprite: ADT/KD/RingEmerald.rsi
+  - type: Clothing
+    sprite: ADT/KD/RingEmerald.rsi
+  - type: Item
+    size: Tiny
+  - type: StaticPrice
+    price: 1000
diff --git a/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingPlazma.yml b/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingPlazma.yml
new file mode 100644
index 00000000000..7691c6b0573
--- /dev/null
+++ b/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingPlazma.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsRingPlazma
+  name: plazma ring
+  description: Good ring.
+  components:
+  - type: Sprite
+    sprite: ADT/KD/RingPlazma.rsi
+  - type: Clothing
+    sprite: ADT/KD/RingPlazma.rsi
+  - type: Item
+    size: Tiny
+  - type: StaticPrice
+    price: 1000
diff --git a/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingTurk.yml b/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingTurk.yml
new file mode 100644
index 00000000000..e5afe34a818
--- /dev/null
+++ b/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingTurk.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsRingTurk
+  name: turk ring
+  description: Good ring.
+  components:
+  - type: Sprite
+    sprite: ADT/KD/RingTurk.rsi
+  - type: Clothing
+    sprite: ADT/KD/RingTurk.rsi
+  - type: Item
+    size: Tiny
+  - type: StaticPrice
+    price: 1000
diff --git a/Resources/Prototypes/ADT/KD/Entites/Food/FoodTinMRECooked.yml b/Resources/Prototypes/ADT/KD/Entites/Food/FoodTinMRECooked.yml
new file mode 100644
index 00000000000..8d3a041a9b7
--- /dev/null
+++ b/Resources/Prototypes/ADT/KD/Entites/Food/FoodTinMRECooked.yml
@@ -0,0 +1,23 @@
+#TODO xTray  State 'icon' not found
+#- type: entity
+#  parent: FoodTinBase
+#  id: FoodTinMRECooked
+#  name: cooked tin
+#  description: A standard issue tin of meat and it cooked.
+#  components:
+#  - type: Sprite
+#    sprite: ADT/KD/CookedTin.rsi
+#    state: tin-hot
+#  - type: SolutionContainerManager
+#    solutions:
+#      food:
+#        reagents:
+#        - ReagentId: Nutriment
+#          Quantity: 15
+#  - type: FlavorProfile
+#    flavors:
+#      - meaty
+#      - salty
+#      - cheap
+#  - type: Food
+#    trash: FoodTinMRETrash
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Magic/JessusX.yml b/Resources/Prototypes/ADT/KD/Entites/JessusX/JessusX.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Objects/Magic/JessusX.yml
rename to Resources/Prototypes/ADT/KD/Entites/JessusX/JessusX.yml
diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/UristSpawn.yml b/Resources/Prototypes/ADT/KD/Entites/Spawns/UristSpawn.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Markers/Spawners/UristSpawn.yml
rename to Resources/Prototypes/ADT/KD/Entites/Spawns/UristSpawn.yml
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/RingStorage.yml b/Resources/Prototypes/ADT/KD/Entites/Storage/RingStorage.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Objects/Misc/RingStorage.yml
rename to Resources/Prototypes/ADT/KD/Entites/Storage/RingStorage.yml
diff --git a/Resources/Prototypes/ADT/KD/Entites/pen/pen.yml b/Resources/Prototypes/ADT/KD/Entites/pen/pen.yml
new file mode 100644
index 00000000000..04ee55247fc
--- /dev/null
+++ b/Resources/Prototypes/ADT/KD/Entites/pen/pen.yml
@@ -0,0 +1,16 @@
+- type: entity
+  name: creator pen
+  parent: BaseItem
+  id: PenCreator
+  description: creator's pen
+  components:
+  - type: Tag
+    tags:
+    - Write
+  - type: Sprite
+    sprite: ADT/KD/pen.rsi
+    state: pen
+  - type: Item
+    sprite: ADT/KD/pen.rsi
+    heldPrefix: pen
+    size: Tiny
diff --git a/Resources/Prototypes/ADT/KD/FireBorn/FireBorn.yml b/Resources/Prototypes/ADT/KD/FireBorn/FireBorn.yml
new file mode 100644
index 00000000000..f1a5ff5c53d
--- /dev/null
+++ b/Resources/Prototypes/ADT/KD/FireBorn/FireBorn.yml
@@ -0,0 +1,48 @@
+- type: entity
+  name: fire born
+  parent: BaseItem
+  id: FireBorn
+  description: born fire
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: ADT/KD/fireborn.rsi
+    layers:
+        - state: fire_extinguisher_closed
+          map: [ "enabled" ]
+  - type: Item
+    sprite: ADT/KD/fireborn.rsi
+    size: Normal
+  - type: SolutionContainerManager
+    solutions:
+      spray:
+        maxVol: 1000
+        reagents:
+        - ReagentId: Phlogiston
+          Quantity: 100
+        - ReagentId: Napalm
+          Quantity: 900
+  - type: RefillableSolution
+    solution: spray
+  - type: DrainableSolution
+    solution: spray
+  #- type: ItemCooldown
+  - type: Spray
+    spraySound:
+      path: /Audio/Effects/extinguish.ogg
+    sprayedPrototype: ExtinguisherSpray
+    vaporAmount: 3
+    vaporSpread: 90
+    sprayVelocity: 2.0
+    sprayTimeAlive: 1.5
+    transferAmount: 5
+    impulse: 50.0
+  - type: FireExtinguisher
+    hasSafety: true
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.FireExtinguisherVisuals.Safety:
+        enabled:
+          True: { state: fire_extinguisher_closed }
+          False: { state: fire_extinguisher_open }
diff --git a/Resources/Prototypes/ADT/KD/Receipt/Microwave/CookedTin.yml b/Resources/Prototypes/ADT/KD/Receipt/Microwave/CookedTin.yml
new file mode 100644
index 00000000000..1662fac36d1
--- /dev/null
+++ b/Resources/Prototypes/ADT/KD/Receipt/Microwave/CookedTin.yml
@@ -0,0 +1,8 @@
+#TODO xTray  State 'icon' not found
+#- type: microwaveMealRecipe
+#  id: RecipeCookedTinMRE
+#  name: рецепт готовой консервы
+#  result: FoodTinMRECooked
+#  time: 5
+#  solids:
+#    FoodTinMREOpen: 1
diff --git a/Resources/Prototypes/ADT/KD/gold-staner/gold-staner.yml b/Resources/Prototypes/ADT/KD/gold-staner/gold-staner.yml
new file mode 100644
index 00000000000..8c9b7b482b7
--- /dev/null
+++ b/Resources/Prototypes/ADT/KD/gold-staner/gold-staner.yml
@@ -0,0 +1,39 @@
+- type: entity
+  name: станнер Эйдана
+  parent: BaseWeaponBatterySmall
+  id: WeaponDisablerIdan
+  description: На вкус как бикаридин.
+  components:
+    - type: Tag
+      tags:
+        - Taser
+    - type: Sprite
+      sprite: ADT/Memes/gold-staner.rsi
+      layers:
+        - state: base
+          map: ["enum.GunVisualLayers.Base"]
+        - state: mag-unshaded-0
+          map: ["enum.GunVisualLayers.MagUnshaded"]
+          shader: unshaded
+    - type: Clothing
+      sprite: ADT/Memes/gold-staner.rsi
+      quickEquip: false
+      slots:
+        - Belt
+    - type: Gun
+      fireRate: 2
+      soundGunshot:
+        path: /Audio/Animals/cat_meow.ogg
+    - type: ProjectileBatteryAmmoProvider
+      proto: BulletDisabler
+      fireCost: 100
+    - type: MagazineVisuals
+      magState: mag
+      steps: 5
+      zeroVisible: true
+    - type: Appearance
+
+- type: loadout
+  id: GoldStanerLoadout
+  entity: WeaponDisablerIdan
+  sponsorOnly: true
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/AshWalker.yml b/Resources/Prototypes/ADT/Lavaland/NPCs/AshWalker/AshWalker.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/NPCs/AshWalker.yml
rename to Resources/Prototypes/ADT/Lavaland/NPCs/AshWalker/AshWalker.yml
diff --git a/Resources/Prototypes/ADT/StartingGear/ashwalker.yml b/Resources/Prototypes/ADT/Lavaland/NPCs/AshWalker/AshWalkerEquipment.yml
similarity index 100%
rename from Resources/Prototypes/ADT/StartingGear/ashwalker.yml
rename to Resources/Prototypes/ADT/Lavaland/NPCs/AshWalker/AshWalkerEquipment.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/BaseHumLavalandMob.yml b/Resources/Prototypes/ADT/Lavaland/NPCs/BaseHumLavalandMob.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Species/BaseHumLavalandMob.yml
rename to Resources/Prototypes/ADT/Lavaland/NPCs/BaseHumLavalandMob.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/Hermit.yml b/Resources/Prototypes/ADT/Lavaland/NPCs/Hermit/Hermit.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/NPCs/Hermit.yml
rename to Resources/Prototypes/ADT/Lavaland/NPCs/Hermit/Hermit.yml
diff --git a/Resources/Prototypes/ADT/StartingGear/hermit.yml b/Resources/Prototypes/ADT/Lavaland/NPCs/Hermit/HermitEquipment.yml
similarity index 100%
rename from Resources/Prototypes/ADT/StartingGear/hermit.yml
rename to Resources/Prototypes/ADT/Lavaland/NPCs/Hermit/HermitEquipment.yml
diff --git a/Resources/Prototypes/ADT/StartingGear/Field_Officer_Central_Committee.yml b/Resources/Prototypes/ADT/Lixon/CC/Field_Officer_Central_Committee.yml
similarity index 74%
rename from Resources/Prototypes/ADT/StartingGear/Field_Officer_Central_Committee.yml
rename to Resources/Prototypes/ADT/Lixon/CC/Field_Officer_Central_Committee.yml
index 1aca5ebf9dd..26bebba06c9 100644
--- a/Resources/Prototypes/ADT/StartingGear/Field_Officer_Central_Committee.yml
+++ b/Resources/Prototypes/ADT/Lixon/CC/Field_Officer_Central_Committee.yml
@@ -16,3 +16,13 @@
     pocket1: MacroBombImplanter
     pocket2: WeaponPulsePistol
 
+- type: entity
+  parent: ClothingBackpack
+  id: ClothingBackpackFilled_CC_FO
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvival
+      - id: RubberStampCentcom
+      - id: BoxFolderRedFilled
diff --git a/Resources/Prototypes/ADT/StartingGear/officercommand.yml b/Resources/Prototypes/ADT/Lixon/CC/Officer_Commander.yml
similarity index 100%
rename from Resources/Prototypes/ADT/StartingGear/officercommand.yml
rename to Resources/Prototypes/ADT/Lixon/CC/Officer_Commander.yml
diff --git a/Resources/Prototypes/ADT/Lixon/CC/Representative_CC.yml b/Resources/Prototypes/ADT/Lixon/CC/Representative_CC.yml
new file mode 100644
index 00000000000..9bef2d13458
--- /dev/null
+++ b/Resources/Prototypes/ADT/Lixon/CC/Representative_CC.yml
@@ -0,0 +1,40 @@
+- type: startingGear
+  id: ADTCentComRepresentativeL
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitCentcomOfficer
+    back: ClothingBackpackFilled_CC_R
+    shoes: ClothingShoesBootsLaceup
+    outerClothing: ClothingOuterVest
+    eyes: ClothingEyesGlassesSunglasses
+    head: ClothingHeadHatBeretCentcomNaval
+    id: CentcomPDA
+    gloves: ClothingHandsGlovesColorGray
+    ears: ClothingHeadsetCentCom
+    #pocket2: MicroBombImpanter - Протатип не найден
+
+- type: entity
+  parent: ClothingBackpack
+  id: ClothingBackpackFilled_CC_R
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvival
+      - id: RubberStampIAA
+      - id: BoxFolderRedFilled
+
+- type: entity
+  id: BoxFolderRedFilled
+  parent: BoxFolderBase
+  suffix: Red
+  components:
+    - type: StorageFill
+      contents:
+      - id: Paper
+        amount: 10
+    - type: Sprite
+      sprite: Objects/Misc/bureaucracy.rsi
+      layers:
+      - state: folder-colormap
+        color: "#cc2323"
+      - state: folder-base
diff --git a/Resources/Prototypes/ADT/Lixon/CC/Special_Operations_Officer.yml b/Resources/Prototypes/ADT/Lixon/CC/Special_Operations_Officer.yml
new file mode 100644
index 00000000000..c77451500e6
--- /dev/null
+++ b/Resources/Prototypes/ADT/Lixon/CC/Special_Operations_Officer.yml
@@ -0,0 +1,43 @@
+- type: startingGear
+  id: SpecialOperationsOfficerGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitCentcomFormal
+    back: ClothingBackpackERTLeaderFilled_SOO
+    shoes: ClothingShoesBootsJack
+    head: ClothingHeadHatCentcom
+    eyes: ClothingEyesGlassesSunglasses
+    gloves: ClothingHandsGlovesCentcomNaval
+    outerClothing: ClothingOuterVestKevlar
+    id: CentcomPDA
+    ears: ClothingHeadsetAltCentCom
+    #belt: SecurityFilled - Портатип не нейден
+    mask: ClothingMaskGasCentcom
+    pocket1: MacroBombImplanter
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackERTLeader
+  id: ClothingBackpackERTLeaderFilled_SOO
+  components:
+    - type: StorageFill
+      contents:
+        - id: BoxSurvival
+        - id: RubberStampCentcom
+        #- id: BoxMagazineMagnumSubMachineGunHighVelocity
+        - id: WeaponSubMachineGunVector
+
+- type: entity
+  id: BoxFolderBlueFilled
+  parent: BoxFolderBase
+  suffix: Blue
+  components:
+    - type: StorageFill
+      contents:
+      - id: Paper
+        amount: 10
+    - type: Sprite
+      sprite: Objects/Misc/bureaucracy.rsi
+      layers:
+      - state: folder-colormap
+        color: "#355d99"
+      - state: folder-base
diff --git a/Resources/Prototypes/ADT/Lixon/CC/VKF_Representative.yml b/Resources/Prototypes/ADT/Lixon/CC/VKF_Representative.yml
new file mode 100644
index 00000000000..52b9b08d92e
--- /dev/null
+++ b/Resources/Prototypes/ADT/Lixon/CC/VKF_Representative.yml
@@ -0,0 +1,66 @@
+- type: startingGear
+  id: ADTMilitarySpaceNaviRepresentativeL
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitCentcomOfficer
+    back: ClothingBackpackFilled_VKF_R
+    #shoes: ClothingShoesBootCombatFilled - портатип не найден
+    mask: ClothingMaskGasCentcom
+    outerClothing: ClothingOuterVestWeb
+    eyes: ClothingEyesGlassesSecurity
+    #head: ClothingHeadHatBeretHos - портатип не найден
+    id: CentcomPDA
+    gloves: ClothingHandsGlovesColorWhite
+    ears: ClothingHeadsetCentCom
+    #belt: SecurityFilled - портатип не найден
+    pocket1: FlashlightSeclite
+    #pocket2: MicroBombImpanter  - портатип не найден
+
+- type: entity
+  parent: ClothingBackpack
+  id: ClothingBackpackFilled_VKF_R
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalSecurity
+      - id: RubberStampCentcom
+      - id: BoxFolderGreyFilled
+
+- type: entity
+  id: BoxFolderGreyFilled
+  parent: BoxFolderBase
+  suffix: Red
+  components:
+    - type: StorageFill
+      contents:
+      - id: Paper
+        amount: 10
+    - type: Sprite
+      sprite: Objects/Misc/bureaucracy.rsi
+      layers:
+      - state: folder-colormap
+        color: "#999999"
+      - state: folder-base
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ADTClothingOuterVestWebL
+  name: web vest
+  description: A synthetic armor vest. This one has added webbing and ballistic plates.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Vests/webvest.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Vests/webvest.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.6 #ballistic plates = better protection
+        Slash: 0.6
+        Piercing: 0.3
+        Heat: 0.9
+  - type: ExplosionResistance
+    damageCoefficient: 0.9
+  - type: StorageFill
+    contents:
+      - id: WeaponPulsePistol
diff --git a/Resources/Prototypes/ADT/Lixon/Insulgon_Items/Holographic_Monocline.yml b/Resources/Prototypes/ADT/Lixon/Insulgon_Items/Holographic_Monocline.yml
new file mode 100644
index 00000000000..879fd118f56
--- /dev/null
+++ b/Resources/Prototypes/ADT/Lixon/Insulgon_Items/Holographic_Monocline.yml
@@ -0,0 +1,30 @@
+- type: entity
+  name: Holographic monocline
+  parent: BaseItem
+  id: ADTHolographicMonoclineL
+  description: This device was implanted in Inna from birth, has amazing sharpness and ephemeral pain.
+  components:
+  - type: Sharp
+  - type: Sprite
+    sprite: ADT/Objects/Weapons/Melee/holographic-monocline.rsi
+    state: icon
+  - type: MeleeWeapon
+    attackRate: 0.75
+    damage:
+      types:
+        Slash: 10
+        Piercing: 5
+        Radiation: 10
+  - type: Item
+    size: Normal
+    sprite: ADT/Objects/Weapons/Melee/holographic-monocline.rsi
+  - type: Tool
+    qualities:
+      - Prying
+  - type: IgniteOnMeleeHit
+    fireStacks: 1
+
+- type: loadout
+  id: ADTHolographicMonoclineInsulgonLoadout
+  entity: ADTHolographicMonoclineL
+  sponsorOnly: true
diff --git a/Resources/Prototypes/ADT/Lixon/Insulgon_Items/White_Diplomat's_suit.yml b/Resources/Prototypes/ADT/Lixon/Insulgon_Items/White_Diplomat's_suit.yml
new file mode 100644
index 00000000000..ecb419764f0
--- /dev/null
+++ b/Resources/Prototypes/ADT/Lixon/Insulgon_Items/White_Diplomat's_suit.yml
@@ -0,0 +1,15 @@
+- type: entity
+  parent: ClothingUniformBase
+  id: ADTClothingUniformsJumpsuitWhiteDiplomatSuitL
+  name: White diplomat suit
+  description: Exquisite white suit worn by NanoTrasen diplomats.
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi
+
+- type: loadout
+  id: ADTClothingUniformsJumpsuitInsulgonLoadout
+  entity: ADTClothingUniformsJumpsuitWhiteDiplomatSuitL
+  sponsorOnly: true
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Lixon/Kiirava_Magic_Wand.yml b/Resources/Prototypes/ADT/Lixon/Kiirava_Magic_Wand.yml
new file mode 100644
index 00000000000..e475a5525bf
--- /dev/null
+++ b/Resources/Prototypes/ADT/Lixon/Kiirava_Magic_Wand.yml
@@ -0,0 +1,50 @@
+- type: entity
+  name: Kiirava magic wand.
+  id: ADTKiiravamagicwand
+  parent: BaseWeaponHeavyMachineGun
+  description: "Improved minigun model with reduced magazine, increased damage and toxic effect. Made by a brilliant beastman girl. P.S. This weapon saved her life when escaping from the captivity of the cultists."
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Weapons/Guns/kiiravamagicwand.rsi
+    layers:
+    - state: icon
+      map: ["enum.GunVisualLayers.Base"]
+  - type: Item
+    size: Tiny
+    sprite: ADT/Objects/Weapons/Guns/kiiravamagicwand.rsi
+  - type: Gun
+    fireRate: 1
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/Magic/staff_healing.ogg
+  - type: BallisticAmmoProvider
+    proto: ADTCartridgeMinigun
+    capacity: 1500
+  - type: MagazineVisuals
+    magState: mag
+    steps: 4
+    zeroVisible: true
+  - type: Appearance
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
+
+- type: entity
+  id: ADTCartridgeWand
+  name: cartridge (.10 rifle)
+  parent: BaseCartridgeHeavyRifle
+  components:
+  - type: CartridgeAmmo
+    proto: ADTBulletWand
+    deleteOnSpawn: true
+
+- type: entity
+  id: ADTBulletWand
+  name: minigun bullet (.10 rifle)
+  parent: BulletHeavyRifle
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Slash: 50
diff --git a/Resources/Prototypes/ADT/StartingGear/SecurityPilot.yml b/Resources/Prototypes/ADT/Lixon/PilotSB.yml
similarity index 100%
rename from Resources/Prototypes/ADT/StartingGear/SecurityPilot.yml
rename to Resources/Prototypes/ADT/Lixon/PilotSB.yml
diff --git a/Resources/Prototypes/ADT/Lixon/Storage_Implanter_Informant.yml b/Resources/Prototypes/ADT/Lixon/Storage_Implanter_Informant.yml
new file mode 100644
index 00000000000..c5f27a6bc81
--- /dev/null
+++ b/Resources/Prototypes/ADT/Lixon/Storage_Implanter_Informant.yml
@@ -0,0 +1,32 @@
+#- type: entity
+#  id: ADTStorageImplanterInformant
+#  name: storage implanter informant
+#  description: a single use implanter, the implant grants hidden storage
+#  parent: BaseImplantOnlyImplanter
+#  components:
+#    - type: Implanter
+#      implant: ADTStorageImplant
+
+#TODO: Не спрайта
+#- type: entity
+#  parent: BaseSubdermalImplant
+#  id: ADTStorageImplant
+#  name: storage implant
+#  description: made with bluespace technology, allows the user to fit a few items in hidden storage
+#  noSpawn: true
+#  components:
+#    #TODO xTray нет протатипа OpenStorageImplant
+#    #- type: SubdermalImplant
+#    #  implantAction: OpenStorageImplant
+#    - type: Item
+#      size: Ginormous
+#    - type: Storage
+#      maxItemSize: Ginormous #10-20 should be more than enough for this
+#    - type: ContainerContainer
+#      containers:
+#        storagebase: !type:Container
+#          ents: [ ]
+#    - type: UserInterface
+#      interfaces:
+#        - key: enum.StorageUiKey.Key
+#          type: StorageBoundUserInterface
diff --git a/Resources/Prototypes/ADT/Lixon/Wedding_things/Veil.yml b/Resources/Prototypes/ADT/Lixon/Wedding_things/Veil.yml
new file mode 100644
index 00000000000..9bb75324ad4
--- /dev/null
+++ b/Resources/Prototypes/ADT/Lixon/Wedding_things/Veil.yml
@@ -0,0 +1,10 @@
+#- type: entity
+#  parent: ClothingHeadBase
+#  id: ADTClothingHeadHatVeilL
+#  name: Veil
+#  description: "No other attribute of a wedding dress is able to give the bride so much grace and beauty."
+#  components:
+#  - type: Sprite
+#    sprite: ADT/Clothing/Head/Hats/Veil.rsi
+#  - type: Clothing
+#    sprite: ADT/Clothing/Head/Hats/Veil.rsi
diff --git a/Resources/Prototypes/ADT/Lixon/Wedding_things/Wedding_dress.yml b/Resources/Prototypes/ADT/Lixon/Wedding_things/Wedding_dress.yml
new file mode 100644
index 00000000000..c92a96e9148
--- /dev/null
+++ b/Resources/Prototypes/ADT/Lixon/Wedding_things/Wedding_dress.yml
@@ -0,0 +1,10 @@
+#- type: entity
+#  parent: ClothingUniformBase
+#  id: ADTClothingUniformJumpsuitWeddingDressL
+#  name: Wedding dress
+#  description: A fabulous dress, with a certain airiness and unimaginable beauty, a real princess walks in such a dress, sweet honey for the eyes. Just a gorgeous dress!
+#  components:
+#  - type: Sprite
+#    sprite: ADT/Clothing/Uniforms/Jumpsuit/wedding-dress.rsi
+#  - type: Clothing
+#    sprite: ADT/Clothing/Uniforms/Jumpsuit/wedding-dress.rsi
diff --git a/Resources/Prototypes/ADT/Lixon/Wedding_things/Wedding_ring.yml b/Resources/Prototypes/ADT/Lixon/Wedding_things/Wedding_ring.yml
new file mode 100644
index 00000000000..833553b7f8c
--- /dev/null
+++ b/Resources/Prototypes/ADT/Lixon/Wedding_things/Wedding_ring.yml
@@ -0,0 +1,23 @@
+#- type: entity
+#  parent: ClothingHandsBase
+#  id: ADTClothingHandsGlovesWeddingRing
+#  name: Wedding ring
+#  description: The oath of eternal love between ... and ....
+#  components:
+#    - type: Sprite
+#      sprite: ADT/Clothing/Hands/Gloves/wedding-ring.rsi
+#    - type: Clothing
+#      sprite: ADT/Clothing/Hands/Gloves/wedding-ring.rsi
+#    - type: GloveHeatResistance
+#      heatResistance: 1400
+#    - type: Insulated
+
+#- type: entity
+#  parent: ADTClothingHandsGlovesWeddingRing
+#  id: ADTClothingHandsGlovesWeddingRingZoyaDemyan
+#  description: The oath of eternal love between Zoya Grigorieva and Demyan Grigoriev.
+
+#- type: entity
+#  parent: ADTClothingHandsGlovesWeddingRing
+#  id: ADTClothingHandsGlovesWeddingRingYanaAidan
+#  description: The oath of eternal love between Yana Simp and Aidan Simp.
diff --git a/Resources/Prototypes/ADT/Lixon/Yumi_Degurshavs_tail.yml b/Resources/Prototypes/ADT/Lixon/Yumi_Degurshavs_tail.yml
new file mode 100644
index 00000000000..c43baa497bc
--- /dev/null
+++ b/Resources/Prototypes/ADT/Lixon/Yumi_Degurshavs_tail.yml
@@ -0,0 +1,56 @@
+- type: entity
+  name: Yumi Degurshav's tail.
+  id: ADTWeaponMinigunL
+  parent: BaseWeaponHeavyMachineGun
+  description: "Improved minigun model with reduced magazine, increased damage and toxic effect. Made by a brilliant beastman girl. P.S. This weapon saved her life when escaping from the captivity of the cultists."
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Weapons/Guns/HMGs/yumidegurshavstail.rsi
+    layers:
+    - state: icon
+      map: ["enum.GunVisualLayers.Base"]
+  - type: Item
+    size: Tiny
+    sprite: ADT/Objects/Weapons/Guns/HMGs/yumidegurshavstail.rsi
+  - type: Gun
+    fireRate: 30
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/minigun.ogg
+  - type: BallisticAmmoProvider
+    proto: ADTCartridgeMinigun
+    capacity: 150
+  - type: MagazineVisuals
+    magState: mag
+    steps: 4
+    zeroVisible: true
+  - type: Appearance
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
+
+- type: entity
+  id: ADTCartridgeMinigun
+  name: cartridge (.10 rifle)
+  parent: BaseCartridgeHeavyRifle
+  components:
+  - type: CartridgeAmmo
+    proto: ADTBulletMinigun
+    deleteOnSpawn: true
+
+- type: entity
+  id: ADTBulletMinigun
+  name: minigun bullet (.10 rifle)
+  parent: BulletHeavyRifle
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 6
+        Poison: 1
+
+- type: loadout
+  id: LixonLoadout
+  entity: ADTWeaponMinigunL
+  sponsorOnly: true
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/ADT/Lixon/soap/soap.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Objects/Specific/Janitorial/soap.yml
rename to Resources/Prototypes/ADT/Lixon/soap/soap.yml
diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Body/Parts/moth.yml b/Resources/Prototypes/ADT/Moth(Disabled)/Body/Parts/moth.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Body/Parts/moth.yml
rename to Resources/Prototypes/ADT/Moth(Disabled)/Body/Parts/moth.yml
diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Body/Prototypes/moth.yml b/Resources/Prototypes/ADT/Moth(Disabled)/Body/Prototypes/moth.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Body/Prototypes/moth.yml
rename to Resources/Prototypes/ADT/Moth(Disabled)/Body/Prototypes/moth.yml
diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Damage/modifier_sets.yml b/Resources/Prototypes/ADT/Moth(Disabled)/Damage/modifier_sets.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Damage/modifier_sets.yml
rename to Resources/Prototypes/ADT/Moth(Disabled)/Damage/modifier_sets.yml
diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/ADT/Moth(Disabled)/Entities/Mobs/Customization/Markings/moth.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Customization/Markings/moth.yml
rename to Resources/Prototypes/ADT/Moth(Disabled)/Entities/Mobs/Customization/Markings/moth.yml
diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Player/moth.yml b/Resources/Prototypes/ADT/Moth(Disabled)/Entities/Mobs/Player/moth.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Player/moth.yml
rename to Resources/Prototypes/ADT/Moth(Disabled)/Entities/Mobs/Player/moth.yml
diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/ADT/Moth(Disabled)/Entities/Mobs/Species/moth.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Species/moth.yml
rename to Resources/Prototypes/ADT/Moth(Disabled)/Entities/Mobs/Species/moth.yml
diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Names/first_female_moth.yml b/Resources/Prototypes/ADT/Moth(Disabled)/Names/first_female_moth.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Names/first_female_moth.yml
rename to Resources/Prototypes/ADT/Moth(Disabled)/Names/first_female_moth.yml
diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Names/first_male_moth.yml b/Resources/Prototypes/ADT/Moth(Disabled)/Names/first_male_moth.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Names/first_male_moth.yml
rename to Resources/Prototypes/ADT/Moth(Disabled)/Names/first_male_moth.yml
diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Names/last_moth.yml b/Resources/Prototypes/ADT/Moth(Disabled)/Names/last_moth.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Names/last_moth.yml
rename to Resources/Prototypes/ADT/Moth(Disabled)/Names/last_moth.yml
diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Species/moth.yml b/Resources/Prototypes/ADT/Moth(Disabled)/Species/moth.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Species/moth.yml
rename to Resources/Prototypes/ADT/Moth(Disabled)/Species/moth.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/Narcotic.yml b/Resources/Prototypes/ADT/Narcotic.yml
similarity index 94%
rename from Resources/Prototypes/ADT/Entities/Mobs/NPCs/Narcotic.yml
rename to Resources/Prototypes/ADT/Narcotic.yml
index 341ac64e5ce..d343ed3fee1 100644
--- a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/Narcotic.yml
+++ b/Resources/Prototypes/ADT/Narcotic.yml
@@ -1,3 +1,21 @@
+- type: reagent
+  id: HallucinationTestReagent
+  name: reagent-name-nicotine
+  group: Narcotics
+  desc: reagent-desc-nicotine
+  flavor: bitter
+  color: "#C0C0C0"
+  physicalDesc: reagent-physical-desc-strong-smelling
+  metabolisms:
+    Narcotic:
+      effects:
+      - !type:GenericStatusEffect
+        key: ADTHallucinations
+        component: NarcoHallucinations
+        type: Add
+        time: 15
+        refresh: false
+
       # Base
 - type: entity
   parent: BaseMob
diff --git a/Resources/Prototypes/ADT/Body/Organs/novakid.yml b/Resources/Prototypes/ADT/Novakid/Body/Organs/novakid.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Organs/novakid.yml
rename to Resources/Prototypes/ADT/Novakid/Body/Organs/novakid.yml
diff --git a/Resources/Prototypes/ADT/Body/Parts/novakid.yml b/Resources/Prototypes/ADT/Novakid/Body/Parts/novakid.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Parts/novakid.yml
rename to Resources/Prototypes/ADT/Novakid/Body/Parts/novakid.yml
diff --git a/Resources/Prototypes/ADT/Body/Prototypes/novakid.yml b/Resources/Prototypes/ADT/Novakid/Body/Prototypes/novakid.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Prototypes/novakid.yml
rename to Resources/Prototypes/ADT/Novakid/Body/Prototypes/novakid.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/novakid.yml b/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/novakid.yml
rename to Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/novakid.yml b/Resources/Prototypes/ADT/Novakid/Mobs/Player/novakid.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/player/novakid.yml
rename to Resources/Prototypes/ADT/Novakid/Mobs/Player/novakid.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/novakid.yml b/Resources/Prototypes/ADT/Novakid/Mobs/Species/novakid.yml
similarity index 53%
rename from Resources/Prototypes/ADT/Entities/Mobs/Species/novakid.yml
rename to Resources/Prototypes/ADT/Novakid/Mobs/Species/novakid.yml
index 9f993dc39c7..62ded1111b3 100644
--- a/Resources/Prototypes/ADT/Entities/Mobs/Species/novakid.yml
+++ b/Resources/Prototypes/ADT/Novakid/Mobs/Species/novakid.yml
@@ -134,3 +134,141 @@
   components:
   - type: HumanoidAppearance
     species: NovakidSpecies
+
+
+- type: emoteSounds
+  id: UnisexNovakid
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: NovakidScreams
+    Laugh:
+      collection: NovakidLaugh
+    Sneeze:
+      collection: MaleSneezes
+    Cough:
+      collection: MaleCoughs
+    CatMeow:
+      collection: CatMeows
+    CatHisses:
+      collection: CatHisses
+    MonkeyScreeches:
+      collection: MonkeyScreeches
+    RobotBeep:
+      collection: RobotBeeps
+    Yawn:
+      collection: MaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: BikeHorn
+    Sigh:
+      collection: MaleSigh
+    Crying:
+      collection: MaleCry
+    Whistle:
+      collection: Whistles
+
+- type: emoteSounds
+  id: MaleNovakid
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: NovakidScreams
+    Laugh:
+      collection: NovakidLaugh
+    Sneeze:
+      collection: MaleSneezes
+    Cough:
+      collection: MaleCoughs
+    CatMeow:
+      collection: CatMeows
+    CatHisses:
+      collection: CatHisses
+    MonkeyScreeches:
+      collection: MonkeyScreeches
+    RobotBeep:
+      collection: RobotBeeps
+    Yawn:
+      collection: MaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: BikeHorn
+    Sigh:
+      collection: MaleSigh
+    Crying:
+      collection: MaleCry
+    Whistle:
+      collection: Whistles
+    # ADT-Apathy Sounds. 
+    Scream-apathy:
+      collection: NovakidScreams
+    Laugh-apathy:
+      collection: NovakidLaugh 
+    Sigh-apathy:
+      collection: MaleSigh
+    Crying-apathy:
+      collection: MaleCry
+
+- type: emoteSounds
+  id: FemaleNovakid
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: NovakidScreams
+    Laugh:
+      collection: NovakidLaugh
+    Sneeze:
+      collection: FemaleSneezes
+    Cough:
+      collection: FemaleCoughs
+    CatMeow:
+      collection: CatMeows
+    CatHisses:
+      collection: CatHisses
+    MonkeyScreeches:
+      collection: MonkeyScreeches
+    RobotBeep:
+      collection: RobotBeeps
+    Yawn:
+      collection: FemaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: CluwneHorn
+    Sigh:
+      collection: FemaleSigh
+    Crying:
+      collection: FemaleCry
+    Whistle:
+      collection: Whistles
+    # ADT-Apathy Sounds. 
+    Scream-apathy:
+      collection: NovakidScreams
+    Laugh-apathy:
+      collection: NovakidLaugh 
+    Sigh-apathy:
+      collection: FemaleSigh
+    Crying-apathy:
+      collection: FemaleCry
+
+- type: soundCollection
+  id: NovakidLaugh
+  files:
+    - /Audio/ADT/Novakid/novakid_laugh01.ogg
+    - /Audio/ADT/Novakid/novakid_laugh02.ogg
+    - /Audio/ADT/Novakid/novakid_laugh03.ogg
+    - /Audio/ADT/Novakid/novakid_laugh04.ogg
+    - /Audio/ADT/Novakid/novakid_laugh05.ogg
+
+- type: soundCollection
+  id: NovakidScreams
+  files:
+    - /Audio/ADT/Novakid/novakid_scream01.ogg
+    - /Audio/ADT/Novakid/novakid_scream02.ogg
+    - /Audio/ADT/Novakid/novakid_scream03.ogg
+    - /Audio/ADT/Novakid/novakid_scream04.ogg
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Datasets/Names/first_novakid.yml b/Resources/Prototypes/ADT/Novakid/Names/first_novakid.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Datasets/Names/first_novakid.yml
rename to Resources/Prototypes/ADT/Novakid/Names/first_novakid.yml
diff --git a/Resources/Prototypes/ADT/Datasets/Names/last_novakid.yml b/Resources/Prototypes/ADT/Novakid/Names/last_novakid.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Datasets/Names/last_novakid.yml
rename to Resources/Prototypes/ADT/Novakid/Names/last_novakid.yml
diff --git a/Resources/Prototypes/ADT/Species/novakid.yml b/Resources/Prototypes/ADT/Novakid/Species/novakid.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Species/novakid.yml
rename to Resources/Prototypes/ADT/Novakid/Species/novakid.yml
diff --git a/Resources/Prototypes/ADT/Objectives/base.yml b/Resources/Prototypes/ADT/Objectives/base.yml
deleted file mode 100644
index 4fe798ee36c..00000000000
--- a/Resources/Prototypes/ADT/Objectives/base.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: entity
-  abstract: true
-  parent: BaseObjective
-  id: BaseChangelingObjective
-  components:
-  - type: Objective
-    issuer: changeling-issuer
-  - type: RoleRequirement
-    roles:
-      components:
-      - ChangelingRole
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/alcohol.yml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Food/buckwheat_solid.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Food/buckwheat_solid.yml
new file mode 100644
index 00000000000..72190fc820f
--- /dev/null
+++ b/Resources/Prototypes/ADT/Reagents/Consumable/Food/buckwheat_solid.yml
@@ -0,0 +1,18 @@
+- type: reagent
+  id: ADTBuckwheatSolids
+  name: buckwheat-sodid-name
+  group: Foods
+  desc: buckwheat-solid-desc
+  physicalDesc: reagent-physical-desc-powdery
+  flavor: ADTBuckwheatSolidsFlavor
+  color: "#401e05"
+  recognizable: true
+  metabolisms:
+    Food:
+      effects:
+      - !type:AdjustReagent
+        reagent: Sugar
+        amount: 0.1
+      - !type:AdjustReagent
+        reagent: Nutriment
+        amount: 0.25
diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Food/cocoa_solid.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Food/cocoa_solid.yml
new file mode 100644
index 00000000000..cdd1a0628c7
--- /dev/null
+++ b/Resources/Prototypes/ADT/Reagents/Consumable/Food/cocoa_solid.yml
@@ -0,0 +1,20 @@
+#- type: reagent
+#  id: ADTCocoaSolids
+#  name: cocoa-sodid-name
+#  group: Foods
+#  desc: cocoa-solid-desc
+#  physicalDesc: reagent-physical-desc-powdery
+#  flavor: ADTCocoaSolidsFlavor
+#  color: "#491F13"
+#  recognizable: true
+#  metabolisms:
+#    Food:
+#      effects:
+#      - !type:AdjustReagent
+#        reagent: Sugar
+#        amount: 0.6
+#      - !type:SatiateThirst
+#        factor: -0.5 #its flour
+#      - !type:AdjustReagent
+#        reagent: Nutriment
+#        amount: 0.1
diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Food/condensed_milk.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Food/condensed_milk.yml
new file mode 100644
index 00000000000..0cc31f8e402
--- /dev/null
+++ b/Resources/Prototypes/ADT/Reagents/Consumable/Food/condensed_milk.yml
@@ -0,0 +1,18 @@
+- type: reagent
+  id: ADTCondensedMilk
+  name: reagent-name-condensedmilk
+  group: Foods
+  desc: reagent-desc-condensedmilk
+  physicalDesc: reagent-physical-desc-gloopy
+  flavor: adtconsideredmilk
+  color: "#fcfcf2"
+  recognizable: true
+  metabolisms:
+    Food:
+      effects:
+      - !type:AdjustReagent
+        reagent: Sugar
+        amount: 0.5
+      - !type:AdjustReagent
+        reagent: Nutriment
+        amount: 0.2
diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Food/food.yml
deleted file mode 100644
index 38830ebcce6..00000000000
--- a/Resources/Prototypes/ADT/Reagents/Consumable/Food/food.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-- type: reagent
-  id: ADTBuckwheatSolids
-  name: buckwheat-sodid-name
-  group: Foods
-  desc: buckwheat-solid-desc
-  physicalDesc: reagent-physical-desc-powdery
-  flavor: ADTBuckwheatSolidsFlavor
-  color: "#401e05"
-  recognizable: true
-  metabolisms:
-    Food:
-      effects:
-      - !type:AdjustReagent
-        reagent: Sugar
-        amount: 0.1
-      - !type:AdjustReagent
-        reagent: Nutriment
-        amount: 0.25
-
-#- type: reagent
-#  id: ADTCocoaSolids
-#  name: cocoa-sodid-name
-#  group: Foods
-#  desc: cocoa-solid-desc
-#  physicalDesc: reagent-physical-desc-powdery
-#  flavor: ADTCocoaSolidsFlavor
-#  color: "#491F13"
-#  recognizable: true
-#  metabolisms:
-#    Food:
-#      effects:
-#      - !type:AdjustReagent
-#        reagent: Sugar
-#        amount: 0.6
-#      - !type:SatiateThirst
-#        factor: -0.5 #its flour
-#      - !type:AdjustReagent
-#        reagent: Nutriment
-#        amount: 0.1
-
-- type: reagent
-  id: ADTCondensedMilk
-  name: reagent-name-condensedmilk
-  group: Foods
-  desc: reagent-desc-condensedmilk
-  physicalDesc: reagent-physical-desc-gloopy
-  flavor: adtconsideredmilk
-  color: "#fcfcf2"
-  recognizable: true
-  metabolisms:
-    Food:
-      effects:
-      - !type:AdjustReagent
-        reagent: Sugar
-        amount: 0.5
-      - !type:AdjustReagent
-        reagent: Nutriment
-        amount: 0.2
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Reagents/medicine.yml b/Resources/Prototypes/ADT/Reagents/medicine.yml
index 3bb70347d62..f08f7e2a6b1 100644
--- a/Resources/Prototypes/ADT/Reagents/medicine.yml
+++ b/Resources/Prototypes/ADT/Reagents/medicine.yml
@@ -542,56 +542,3 @@
         visualType: Small
         messages: [ "narcotic-effect-visible-miosis" ]
         probability: 0.05
-
-#Кровоостанавливающая пудра
-- type: reagent
-  id: ADTStypticPowder
-  name: reagent-name-styptic-powder
-  group: Medicine
-  desc: reagent-desc-styptic-powder
-  flavor: medicine
-  color: "#c8a2c8"
-  physicalDesc: reagent-physical-desc-powdery
-  metabolisms:
-    Medicine:
-      metabolismRate : 0.75
-      effects:
-      - !type:HealthChange
-        damage:
-          groups:
-            Brute: -2.25
-      - !type:ModifyBleedAmount
-        amount: -1 #почему кровоостанавливающая пудра не останавливала кровотечение?
-      - !type:PopupMessage
-        conditions:
-        - !type:TotalDamage
-          min: 0.5
-        type: Local
-        visualType: Small
-        messages: [ "medicine-effect-usual" ]
-        probability: 0.05
-#Сульфадиазин серебра
-- type: reagent
-  id: ADTSilverSulfadiazine
-  name: reagent-name-silver-sulfadiazine
-  group: Medicine
-  desc: reagent-desc-silver-sulfadiazine
-  flavor: medicine
-  color: "#c8a2c8"
-  physicalDesc: reagent-physical-desc-powdery
-  metabolisms:
-    Medicine:
-      metabolismRate : 0.75
-      effects:
-      - !type:HealthChange
-        damage:
-          groups:
-            Burn: -3
-      - !type:PopupMessage
-        conditions:
-        - !type:TotalDamage
-          min: 0.5
-        type: Local
-        visualType: Small
-        messages: [ "medicine-effect-usual" ]
-        probability: 0.05
diff --git a/Resources/Prototypes/ADT/Reagents/narcotics.yml b/Resources/Prototypes/ADT/Reagents/narcotics.yml
index caab6898378..bc8066bbf90 100644
--- a/Resources/Prototypes/ADT/Reagents/narcotics.yml
+++ b/Resources/Prototypes/ADT/Reagents/narcotics.yml
@@ -51,48 +51,3 @@
         damage:
           types:
             Asphyxiation: 2
-
-- type: reagent
-  id: HallucinationTestReagent
-  name: reagent-name-nicotine
-  group: Narcotics
-  desc: reagent-desc-nicotine
-  flavor: bitter
-  color: "#C0C0C0"
-  physicalDesc: reagent-physical-desc-strong-smelling
-  metabolisms:
-    Narcotic:
-      effects:
-      - !type:GenericStatusEffect
-        key: ADTHallucinations
-        component: NarcoHallucinations
-        type: Add
-        time: 15
-        refresh: false
-
-- type: reagent
-  id: LingDrugs
-  name: reagent-name-space-drugs
-  group: Narcotics
-  desc: reagent-desc-space-drugs
-  physicalDesc: reagent-physical-desc-syrupy
-  flavor: bitter
-  color: "#63806e"
-  metabolisms:
-    Narcotic:
-      effects:
-      - !type:GenericStatusEffect
-        key: SeeingRainbows
-        component: SeeingRainbows
-        type: Add
-        time: 5
-        refresh: false
-      - !type:GenericStatusEffect
-        key: ADTHallucinations
-        component: LingHallucinations
-        type: Add
-        time: 10
-        refresh: false
-        conditions:
-        - !type:ReagentThreshold
-          min: 15
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Reagents/patch_medicine.yml b/Resources/Prototypes/ADT/Reagents/patch_medicine.yml
new file mode 100644
index 00000000000..0b166e157f2
--- /dev/null
+++ b/Resources/Prototypes/ADT/Reagents/patch_medicine.yml
@@ -0,0 +1,52 @@
+#Кровоостанавливающая пудра
+- type: reagent
+  id: ADTStypticPowder
+  name: reagent-name-styptic-powder
+  group: Medicine
+  desc: reagent-desc-styptic-powder
+  flavor: medicine
+  color: "#c8a2c8"
+  physicalDesc: reagent-physical-desc-powdery
+  metabolisms:
+    Medicine:
+      metabolismRate : 0.75
+      effects:
+      - !type:HealthChange
+        damage:
+          groups:
+            Brute: -2.25
+      - !type:ModifyBleedAmount
+        amount: -1 #почему кровоостанавливающая пудра не останавливала кровотечение?
+      - !type:PopupMessage
+        conditions:
+        - !type:TotalDamage
+          min: 0.5
+        type: Local
+        visualType: Small
+        messages: [ "medicine-effect-usual" ]
+        probability: 0.05
+#Сульфадиазин серебра
+- type: reagent
+  id: ADTSilverSulfadiazine
+  name: reagent-name-silver-sulfadiazine
+  group: Medicine
+  desc: reagent-desc-silver-sulfadiazine
+  flavor: medicine
+  color: "#c8a2c8"
+  physicalDesc: reagent-physical-desc-powdery
+  metabolisms:
+    Medicine:
+      metabolismRate : 0.75
+      effects:
+      - !type:HealthChange
+        damage:
+          groups:
+            Burn: -3
+      - !type:PopupMessage
+        conditions:
+        - !type:TotalDamage
+          min: 0.5
+        type: Local
+        visualType: Small
+        messages: [ "medicine-effect-usual" ]
+        probability: 0.05
diff --git a/Resources/Prototypes/ADT/Reagents/toxins.yml b/Resources/Prototypes/ADT/Reagents/toxins.yml
index 8ea2eae4bd5..bbef2475dfe 100644
--- a/Resources/Prototypes/ADT/Reagents/toxins.yml
+++ b/Resources/Prototypes/ADT/Reagents/toxins.yml
@@ -94,41 +94,3 @@
 #ну и эффекты. 
 #получилось небольшое спаггети, но я тупо не знаю, как нормально это всё сузить.
 
-- type: reagent
-  id: LingToxin
-  name: reagent-name-toxin
-  group: Toxins
-  desc: reagent-desc-toxin
-  flavor: bitter
-  color: "#cf3600"
-  physicalDesc: reagent-physical-desc-opaque
-  plantMetabolism:
-  - !type:PlantAdjustToxins
-    amount: 10
-  - !type:PlantAdjustHealth
-    amount: -5
-  metabolisms:
-    Poison:
-      effects:
-      - !type:HealthChange
-        damage:
-          types:
-            Poison: 2
-
-
-- type: reagent
-  id: ADTLingEggs # Немножко костылей, но кому не пофиг?
-  name: reagent-name-ling
-  group: Toxins
-  desc: reagent-desc-ling
-  flavor: bitter
-  physicalDesc: reagent-physical-desc-skunky
-  color: "#ffd478"
-  worksOnTheDead: true
-  metabolisms:
-    Medicine:
-      effects:
-      - !type:HealthChange
-        damage:
-          types:
-            Poison: 30
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/clothing/Clothing.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/Clothing.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Recipes/Construction/Graph/clothing/Clothing.yml
rename to Resources/Prototypes/ADT/Recipes/Construction/Graph/Clothing.yml
diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/structures/adtstool.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/adtstool.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Recipes/Construction/Graph/structures/adtstool.yml
rename to Resources/Prototypes/ADT/Recipes/Construction/Graph/adtstool.yml
diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/structures/adttable.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/adttable.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Recipes/Construction/Graph/structures/adttable.yml
rename to Resources/Prototypes/ADT/Recipes/Construction/Graph/adttable.yml
diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/structures/bonfire.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/bonfire.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Recipes/Construction/Graph/structures/bonfire.yml
rename to Resources/Prototypes/ADT/Recipes/Construction/Graph/bonfire.yml
diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/fun/discoball.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/discoball.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Recipes/Construction/Graph/fun/discoball.yml
rename to Resources/Prototypes/ADT/Recipes/Construction/Graph/discoball.yml
diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/fun/glassbreak.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/drinks.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Recipes/Construction/Graph/fun/glassbreak.yml
rename to Resources/Prototypes/ADT/Recipes/Construction/Graph/drinks.yml
diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/structures/fireplace.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/fireplace.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Recipes/Construction/Graph/structures/fireplace.yml
rename to Resources/Prototypes/ADT/Recipes/Construction/Graph/fireplace.yml
diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/food/fish.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/fish.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Recipes/Construction/Graph/food/fish.yml
rename to Resources/Prototypes/ADT/Recipes/Construction/Graph/fish.yml
diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/furniture/exist.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/furniture/exist.yml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/machines/gravity_generator_broken.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/gravity_generator_broken.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Recipes/Construction/Graph/machines/gravity_generator_broken.yml
rename to Resources/Prototypes/ADT/Recipes/Construction/Graph/gravity_generator_broken.yml
diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/materials/exist.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/materials/exist.yml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/mechs/exist.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/mechs/exist.yml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/structures/roundtable.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/roundtable.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Recipes/Construction/Graph/structures/roundtable.yml
rename to Resources/Prototypes/ADT/Recipes/Construction/Graph/roundtable.yml
diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/fun/secretbook.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/secretbook.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Recipes/Construction/Graph/fun/secretbook.yml
rename to Resources/Prototypes/ADT/Recipes/Construction/Graph/secretbook.yml
diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/tools/exist.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/tools/exist.yml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/utilities/exist.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/utilities/exist.yml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/weapons/exist.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/weapons/exist.yml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/buckwheat_kasha_recipe.yml b/Resources/Prototypes/ADT/Recipes/Cooking/buckwheat_kasha_recipe.yml
new file mode 100644
index 00000000000..19188465a0a
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Cooking/buckwheat_kasha_recipe.yml
@@ -0,0 +1,29 @@
+- type: microwaveMealRecipe
+  id: ADTFoodBoiledBuckwheatRecipe
+  name: buckwheat kasha recipe
+  result: ADTFoodBoiledBuckwheat
+  time: 15
+  reagents:
+    Water: 10
+    ADTBuckwheatSolids: 15
+  solids:
+    FoodBowlBig: 1
+
+- type: microwaveMealRecipe
+  id: ADTFoodBoiledBuckwheatEggRecipe
+  name: buckwheat kasha egg recipe
+  result: ADTFoodBoiledBuckwheatEgg
+  time: 15
+  solids:
+    ADTFoodBoiledBuckwheat: 1
+    FoodEgg: 1
+    FoodCarrot: 1
+
+- type: microwaveMealRecipe
+  id: ADTFoodBoiledBuckwheatSausageRecipe
+  name: buckwheat kasha sausage recipe
+  result: ADTFoodBoiledBuckwheatSausage
+  time: 15
+  solids:
+    ADTFoodBoiledBuckwheat: 1
+    ADTFoodSausageRaw: 2
diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/cannabis_white.yml b/Resources/Prototypes/ADT/Recipes/Cooking/cannabis_white.yml
new file mode 100644
index 00000000000..edc4efe51f2
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Cooking/cannabis_white.yml
@@ -0,0 +1,7 @@
+- type: microwaveMealRecipe
+  id: ADTRecipeDriedCannabisWhite
+  name: dried cannabis leaves recipe
+  result: ADTLeavesCannabisWhiteDried
+  time: 10
+  solids:
+    ADTLeavesCannabisWhite: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/food.yml b/Resources/Prototypes/ADT/Recipes/Cooking/choco_bar_recipe.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Recipes/Reactions/food.yml
rename to Resources/Prototypes/ADT/Recipes/Cooking/choco_bar_recipe.yml
diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/choco_drink_recipe.yml b/Resources/Prototypes/ADT/Recipes/Cooking/choco_drink_recipe.yml
new file mode 100644
index 00000000000..2b72b8ac4d9
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Cooking/choco_drink_recipe.yml
@@ -0,0 +1,17 @@
+- type: microwaveMealRecipe
+  id: ADTRecipeChocolateDrink
+  name: chocolate drink recipe
+  result: ADTChocolateGlass
+  time: 10
+  solids:
+    FoodSnackChocolateBar: 1
+    DrinkGlass: 1
+
+- type: microwaveMealRecipe
+  id: ADTRecipeHypoallergenChocolateDrink
+  name: chocolate drink recipe
+  result: ADTChocolateGlass
+  time: 10
+  solids:
+    ADTHypoAllergenChocolateBar: 1
+    DrinkGlass: 1
diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/croissant_recipe.yml b/Resources/Prototypes/ADT/Recipes/Cooking/croissant_recipe.yml
new file mode 100644
index 00000000000..732dd88c030
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Cooking/croissant_recipe.yml
@@ -0,0 +1,55 @@
+- type: microwaveMealRecipe
+  id: ADTFoodCroissantCreamRecipe
+  name: croissant with cream recipe
+  result: ADTFoodCroissantCream
+  time: 10
+  reagents:
+    Egg: 6
+    Sugar: 5
+    Cream: 5
+  solids:
+    FoodDoughSlice: 1
+
+- type: microwaveMealRecipe
+  id: ADTFoodCroissantChocolateRecipe
+  name: croissant with chocolate recipe
+  result: ADTFoodCroissantChocolate
+  time: 10
+  reagents:
+    Egg: 6
+    Sugar: 5
+  solids:
+    FoodDoughSlice: 1
+    FoodSnackChocolateBar: 1
+
+- type: microwaveMealRecipe
+  id: ADTFoodCroissantCheeseRecipe
+  name: croissant with cheese recipe
+  result: ADTFoodCroissantCheese
+  time: 10
+  reagents:
+    Egg: 6
+    Sugar: 5
+  solids:
+    FoodDoughSlice: 1
+    FoodCheeseSlice: 1
+
+- type: microwaveMealRecipe
+  id: ADTFoodHotDogRecipe
+  name: hot dog
+  result: ADTFoodHotDog
+  time: 10
+  reagents:
+    Ketchup: 2
+  solids:
+    FoodDoughSlice: 1
+    ADTFoodSausageRaw: 1
+
+- type: microwaveMealRecipe
+  id: ADTFoodMealPigblanketRecipe
+  name: pig blanket
+  result: FoodMealPigblanket
+  time: 5
+  solids:
+    FoodDoughSlice: 1
+    ADTFoodSausageRaw: 1
diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/drinks_recipe.yml b/Resources/Prototypes/ADT/Recipes/Cooking/drinks_recipe.yml
deleted file mode 100644
index f62e17eb84f..00000000000
--- a/Resources/Prototypes/ADT/Recipes/Cooking/drinks_recipe.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-
-#технически не совсем приготовление напитка, но всё же
-- type: microwaveMealRecipe
-  id: RecipeMulledWineWarm
-  name: warm mulled wine recipe
-  result: ADTMulledWineGlass
-  time: 10
-  reagents:
-    ADTMulledWineCold: 30
-  solids:
-    DrinkGlass: 1
-
-- type: microwaveMealRecipe
-  id: RecipeMulledWineWarm2
-  name: warm mulled wine recipe
-  result: ADTMulledWineGlass
-  time: 10
-  reagents:
-    ADTMulledWineCold: 30
-  solids:
-    ADTMulledWineGlass: 1 #Костыли, но по-другому я никак не могу придумать.
-
-- type: microwaveMealRecipe
-  id: RecipeADTHotChocolate
-  name: hot chocolate recipe
-  result: ADTHotChocolateGlass
-  time: 10
-  solids:
-    DrinkGlass: 1
-    FoodSnackChocolateBar: 2
-
-- type: microwaveMealRecipe
-  id: RecipeADTHotChocolate2
-  name: hot chocolate recipe
-  result: ADTHotChocolateGlass
-  time: 10
-  solids:
-    ADTHotChocolateGlass: 1
-    FoodSnackChocolateBar: 2
-
-- type: microwaveMealRecipe
-  id: RecipeADTHotChocolateAllergic
-  name: hot hypoallergen chocolate recipe
-  result: ADTHotChocolateAllergicGlass
-  time: 10
-  solids:
-    DrinkGlass: 1
-    ADTHypoAllergenChocolateBar: 2
-
-- type: microwaveMealRecipe
-  id: RecipeADTHotChocolateAllergic2
-  name: hot hypoallergen chocolate recipe
-  result: ADTHotChocolateAllergicGlass
-  time: 10
-  solids:
-    ADTHotChocolateAllergicGlass: 1
-    ADTHypoAllergenChocolateBar: 2
-
-- type: microwaveMealRecipe
-  id: RecipeADTHotCocoa
-  name: hot cocoa recipe
-  result: ADTHotCocoaGlass
-  time: 10
-  reagents:
-    ADTCocoaDrink: 30
-  solids:
-    DrinkGlass: 1
-
-- type: microwaveMealRecipe
-  id: RecipeADTHotCocoa2
-  name: hot cocoa recipe
-  result: ADTHotCocoaGlass
-  time: 10
-  reagents:
-    ADTCocoaDrink: 30
-  solids:
-    ADTHotCocoaGlass: 1
-
-- type: microwaveMealRecipe
-  id: ADTRecipeChocolateDrink
-  name: chocolate drink recipe
-  result: ADTChocolateGlass
-  time: 10
-  solids:
-    FoodSnackChocolateBar: 1
-    DrinkGlass: 1
-
-- type: microwaveMealRecipe
-  id: ADTRecipeHypoallergenChocolateDrink
-  name: chocolate drink recipe
-  result: ADTChocolateGlass
-  time: 10
-  solids:
-    ADTHypoAllergenChocolateBar: 1
-    DrinkGlass: 1
diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/fishrecipes.yml b/Resources/Prototypes/ADT/Recipes/Cooking/fishrecipes.yml
new file mode 100644
index 00000000000..0f8808392d1
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Cooking/fishrecipes.yml
@@ -0,0 +1,35 @@
+
+- type: microwaveMealRecipe
+  id: ADTRecipeTacoFishAlt
+  name: fish taco recipe
+  result: FoodTacoFish
+  time: 10
+  solids:
+    FoodTacoShell: 1
+    ADTFoodFish: 1
+    FoodOnionSlice: 2
+    FoodTomato: 1
+    FoodCabbage: 1
+
+- type: microwaveMealRecipe
+  id: ADTRecipeSashimiSafe
+  name: safe sashimi recipe
+  result: ADTFoodMealSashimi
+  time: 15
+  reagents:
+    TableSalt: 1
+  solids:
+    ADTFoodFish: 2
+
+- type: microwaveMealRecipe
+  id: ADTRecipeBisqueAlt
+  name: bisque recipe
+  result: FoodSoupBisque
+  time: 10
+  reagents:
+    Water: 10
+  solids:
+    FoodBowlBig: 1
+    FoodTomato: 1
+    FoodMushroom: 1
+    ADTFoodFish: 1
diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/fried_egg_recipe.yml b/Resources/Prototypes/ADT/Recipes/Cooking/fried_egg_recipe.yml
new file mode 100644
index 00000000000..9641351f1ec
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Cooking/fried_egg_recipe.yml
@@ -0,0 +1,10 @@
+- type: microwaveMealRecipe
+  id: ADTFriedEggSausageRecipe
+  name: fried egg with sausage recipe
+  result: ADTFriedEggSausage
+  time: 10
+  reagents:
+    Egg: 12
+  solids:
+    ADTFoodSausageRaw: 1
+    FoodPlateSmall: 1
diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/khachapuri_recipe.yml b/Resources/Prototypes/ADT/Recipes/Cooking/khachapuri_recipe.yml
new file mode 100644
index 00000000000..861cfe03a56
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Cooking/khachapuri_recipe.yml
@@ -0,0 +1,12 @@
+- type: microwaveMealRecipe
+  id: ADTFoodRecipeKhachapuri
+  name: khachapuri recipe
+  result: ADTFoodKhachapuri
+  time: 10
+  reagents:
+    TableSalt: 1
+    Milk: 5
+  solids:
+    FoodEgg: 2
+    FoodCheeseSlice: 1
+    FoodBreadPlainSlice: 1
diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipe.yml b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipe.yml
deleted file mode 100644
index 7a01b1b2fc3..00000000000
--- a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipe.yml
+++ /dev/null
@@ -1,270 +0,0 @@
-- type: microwaveMealRecipe
-  id: ADTRecipeBakedChicken
-  name: baked chicken
-  result: ADTFoodMeatChickenBaked
-  time: 25
-  solids:
-    ADTChickenBody: 1
-  reagents:
-    BbqSauce: 5
-
-- type: microwaveMealRecipe
-  id: ADTRecipeBakedStuffedChicken
-  name: baked stuffed chicken
-  result: ADTFoodMeatChickenBakedWithVegetables
-  time: 30
-  solids:
-    ADTChickenBody: 1
-    FoodPlate: 1
-    FoodCabbage: 1
-    FoodTomato: 1
-    FoodPotato: 1
-    FoodCorn: 1
-    FoodMeatCutlet: 2
-  reagents:
-    BbqSauce: 5
-
-- type: microwaveMealRecipe
-  id: ADTRecipeBakedChickenLeg
-  name: baked chicken leg
-  result: ADTFoodMeatChickenBakedLeg
-  time: 5
-  solids:
-    ADTFoodMeatChickenLeg: 1
-
-- type: microwaveMealRecipe
-  id: ADTRecipeBakedChickenWing
-  name: baked chicken wing
-  result: ADTFoodMeatChickenBakedWing
-  time: 5
-  solids:
-    ADTFoodMeatChickenWing: 1
-
-- type: microwaveMealRecipe
-  id: ADTFoodRecipeVulpix
-  name: vulpix recipe
-  result: ADTFoodVulpix
-  time: 10
-  solids:
-    FoodOnion: 1
-    FoodCheeseSlice: 1
-    ADTOrganVulpkaninAnimalLiver: 1
-    FoodPlateSmall: 1
-
-- type: microwaveMealRecipe
-  id: ADTRecipeShawermaDefault
-  name: shawerma recipe
-  result: ADTShawermaDefault
-  time: 20
-  solids:
-    FoodTomato: 1
-    FoodMeatCutlet: 3
-    FoodDough: 1
-    FoodCarrot: 1
-    FoodOnionRedSlice: 1
-    FoodCabbage: 1
-  reagents:
-    Mayo: 2
-
-- type: microwaveMealRecipe
-  id: ADTRecipeShawermaCheese
-  name: cheese shawerma recipe
-  result: ADTShawermaCheese
-  time: 20
-  solids:
-    FoodTomato: 1
-    FoodMeatCutlet: 3
-    FoodDough: 1
-    FoodCarrot: 1
-    FoodOnionRedSlice: 1
-    FoodCabbage: 1
-    FoodCheeseSlice: 1
-  reagents:
-    Mayo: 2
-
-- type: microwaveMealRecipe
-  id: ADTRecipeShawermaMeat
-  name: shawerma recipe
-  result: ADTShawermaMeat
-  time: 20
-  solids:
-    FoodMeatCutlet: 3
-    FoodMeatCooked: 1
-    FoodEgg: 2
-    FoodMeatMeatball: 1
-  reagents:
-    Mayo: 2
-
-- type: microwaveMealRecipe
-  id: ADTRecipeSausageRaw
-  name: raw sausage recipe
-  result: ADTFoodSausageRaw
-  time: 10
-  solids:
-    FoodMeatCutlet: 1
-  reagents:
-    Milk: 5
-    TableSalt: 2
-    Egg: 6
-
-- type: microwaveMealRecipe
-  id: ADTRecipeSausageFried
-  name: fried sausage recipe
-  result: ADTFoodSausageFried
-  time: 5
-  solids:
-    ADTFoodSausageRaw: 1
-
-- type: microwaveMealRecipe
-  id: ADTFoodRecipeKhachapuri
-  name: khachapuri recipe
-  result: ADTFoodKhachapuri
-  time: 10
-  reagents:
-    TableSalt: 1
-    Milk: 5
-  solids:
-    FoodEgg: 2
-    FoodCheeseSlice: 1
-    FoodBreadPlainSlice: 1
-
-- type: microwaveMealRecipe
-  id: ADTFriedEggSausageRecipe
-  name: fried egg with sausage recipe
-  result: ADTFriedEggSausage
-  time: 10
-  reagents:
-    Egg: 12
-  solids:
-    ADTFoodSausageRaw: 1
-    FoodPlateSmall: 1
-
-
-- type: microwaveMealRecipe
-  id: ADTRecipeTacoFishAlt
-  name: fish taco recipe
-  result: FoodTacoFish
-  time: 10
-  solids:
-    FoodTacoShell: 1
-    ADTFoodFish: 1
-    FoodOnionSlice: 2
-    FoodTomato: 1
-    FoodCabbage: 1
-
-- type: microwaveMealRecipe
-  id: ADTRecipeSashimiSafe
-  name: safe sashimi recipe
-  result: ADTFoodMealSashimi
-  time: 15
-  reagents:
-    TableSalt: 1
-  solids:
-    ADTFoodFish: 2
-
-- type: microwaveMealRecipe
-  id: ADTRecipeBisqueAlt
-  name: bisque recipe
-  result: FoodSoupBisque
-  time: 10
-  reagents:
-    Water: 10
-  solids:
-    FoodBowlBig: 1
-    FoodTomato: 1
-    FoodMushroom: 1
-    ADTFoodFish: 1
-
-- type: microwaveMealRecipe
-  id: ADTFoodCroissantCreamRecipe
-  name: croissant with cream recipe
-  result: ADTFoodCroissantCream
-  time: 10
-  reagents:
-    Egg: 6
-    Sugar: 5
-    Cream: 5
-  solids:
-    FoodDoughSlice: 1
-
-- type: microwaveMealRecipe
-  id: ADTFoodCroissantChocolateRecipe
-  name: croissant with chocolate recipe
-  result: ADTFoodCroissantChocolate
-  time: 10
-  reagents:
-    Egg: 6
-    Sugar: 5
-  solids:
-    FoodDoughSlice: 1
-    FoodSnackChocolateBar: 1
-
-- type: microwaveMealRecipe
-  id: ADTFoodCroissantCheeseRecipe
-  name: croissant with cheese recipe
-  result: ADTFoodCroissantCheese
-  time: 10
-  reagents:
-    Egg: 6
-    Sugar: 5
-  solids:
-    FoodDoughSlice: 1
-    FoodCheeseSlice: 1
-
-- type: microwaveMealRecipe
-  id: ADTFoodHotDogRecipe
-  name: hot dog
-  result: ADTFoodHotDog
-  time: 10
-  reagents:
-    Ketchup: 2
-  solids:
-    FoodDoughSlice: 1
-    ADTFoodSausageRaw: 1
-
-- type: microwaveMealRecipe
-  id: ADTFoodMealPigblanketRecipe
-  name: pig blanket
-  result: FoodMealPigblanket
-  time: 5
-  solids:
-    FoodDoughSlice: 1
-    ADTFoodSausageRaw: 1
-
-- type: microwaveMealRecipe
-  id: ADTRecipeDriedCannabisWhite
-  name: dried cannabis leaves recipe
-  result: ADTLeavesCannabisWhiteDried
-  time: 10
-  solids:
-    ADTLeavesCannabisWhite: 1
-
-- type: microwaveMealRecipe
-  id: ADTFoodBoiledBuckwheatRecipe
-  name: buckwheat kasha recipe
-  result: ADTFoodBoiledBuckwheat
-  time: 15
-  reagents:
-    Water: 10
-    ADTBuckwheatSolids: 15
-  solids:
-    FoodBowlBig: 1
-
-- type: microwaveMealRecipe
-  id: ADTFoodBoiledBuckwheatEggRecipe
-  name: buckwheat kasha egg recipe
-  result: ADTFoodBoiledBuckwheatEgg
-  time: 15
-  solids:
-    ADTFoodBoiledBuckwheat: 1
-    FoodEgg: 1
-    FoodCarrot: 1
-
-- type: microwaveMealRecipe
-  id: ADTFoodBoiledBuckwheatSausageRecipe
-  name: buckwheat kasha sausage recipe
-  result: ADTFoodBoiledBuckwheatSausage
-  time: 15
-  solids:
-    ADTFoodBoiledBuckwheat: 1
-    ADTFoodSausageRaw: 2
diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/meat_recipe.yml b/Resources/Prototypes/ADT/Recipes/Cooking/meat_recipe.yml
new file mode 100644
index 00000000000..033c7bbac6c
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Cooking/meat_recipe.yml
@@ -0,0 +1,41 @@
+- type: microwaveMealRecipe
+  id: ADTRecipeBakedChicken
+  name: baked chicken
+  result: ADTFoodMeatChickenBaked
+  time: 25
+  solids:
+    ADTChickenBody: 1
+  reagents:
+    BbqSauce: 5
+
+- type: microwaveMealRecipe
+  id: ADTRecipeBakedStuffedChicken
+  name: baked stuffed chicken
+  result: ADTFoodMeatChickenBakedWithVegetables
+  time: 30
+  solids:
+    ADTChickenBody: 1
+    FoodPlate: 1
+    FoodCabbage: 1
+    FoodTomato: 1
+    FoodPotato: 1
+    FoodCorn: 1
+    FoodMeatCutlet: 2
+  reagents:
+    BbqSauce: 5
+
+- type: microwaveMealRecipe
+  id: ADTRecipeBakedChickenLeg
+  name: baked chicken leg
+  result: ADTFoodMeatChickenBakedLeg
+  time: 5
+  solids:
+    ADTFoodMeatChickenLeg: 1
+
+- type: microwaveMealRecipe
+  id: ADTRecipeBakedChickenWing
+  name: baked chicken wing
+  result: ADTFoodMeatChickenBakedWing
+  time: 5
+  solids:
+    ADTFoodMeatChickenWing: 1
diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/sausage_recipe.yml b/Resources/Prototypes/ADT/Recipes/Cooking/sausage_recipe.yml
new file mode 100644
index 00000000000..bc278ed1467
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Cooking/sausage_recipe.yml
@@ -0,0 +1,19 @@
+- type: microwaveMealRecipe
+  id: ADTRecipeSausageRaw
+  name: raw sausage recipe
+  result: ADTFoodSausageRaw
+  time: 10
+  solids:
+    FoodMeatCutlet: 1
+  reagents:
+    Milk: 5
+    TableSalt: 2
+    Egg: 6
+
+- type: microwaveMealRecipe
+  id: ADTRecipeSausageFried
+  name: fried sausage recipe
+  result: ADTFoodSausageFried
+  time: 5
+  solids:
+    ADTFoodSausageRaw: 1
diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/shawerma_recipe.yml b/Resources/Prototypes/ADT/Recipes/Cooking/shawerma_recipe.yml
new file mode 100644
index 00000000000..dd11085d1ba
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Cooking/shawerma_recipe.yml
@@ -0,0 +1,43 @@
+- type: microwaveMealRecipe
+  id: ADTRecipeShawermaDefault
+  name: shawerma recipe
+  result: ADTShawermaDefault
+  time: 20
+  solids:
+    FoodTomato: 1
+    FoodMeatCutlet: 3
+    FoodDough: 1
+    FoodCarrot: 1
+    FoodOnionRedSlice: 1
+    FoodCabbage: 1
+  reagents:
+    Mayo: 2
+
+- type: microwaveMealRecipe
+  id: ADTRecipeShawermaCheese
+  name: cheese shawerma recipe
+  result: ADTShawermaCheese
+  time: 20
+  solids:
+    FoodTomato: 1
+    FoodMeatCutlet: 3
+    FoodDough: 1
+    FoodCarrot: 1
+    FoodOnionRedSlice: 1
+    FoodCabbage: 1
+    FoodCheeseSlice: 1
+  reagents:
+    Mayo: 2
+
+- type: microwaveMealRecipe
+  id: ADTRecipeShawermaMeat
+  name: shawerma recipe
+  result: ADTShawermaMeat
+  time: 20
+  solids:
+    FoodMeatCutlet: 3
+    FoodMeatCooked: 1
+    FoodEgg: 2
+    FoodMeatMeatball: 1
+  reagents:
+    Mayo: 2
diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/vulpix_recipe.yml b/Resources/Prototypes/ADT/Recipes/Cooking/vulpix_recipe.yml
new file mode 100644
index 00000000000..3538bbfbeed
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Cooking/vulpix_recipe.yml
@@ -0,0 +1,10 @@
+- type: microwaveMealRecipe
+  id: ADTFoodRecipeVulpix
+  name: vulpix recipe
+  result: ADTFoodVulpix
+  time: 10
+  solids:
+    FoodOnion: 1
+    FoodCheeseSlice: 1
+    ADTOrganVulpkaninAnimalLiver: 1
+    FoodPlateSmall: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/cocoa_react.yml b/Resources/Prototypes/ADT/Recipes/Reactions/cocoa_react.yml
new file mode 100644
index 00000000000..c5a92244ddd
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Reactions/cocoa_react.yml
@@ -0,0 +1,11 @@
+- type: reaction
+  id: ADTCocoaDrink
+  reactants:
+    CocoaPowder:
+      amount: 1
+    Water:
+      amount: 4
+    Milk:
+      amount: 1
+  products:
+    ADTCocoaDrink: 6
diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml b/Resources/Prototypes/ADT/Recipes/Reactions/just_kekc_coctails_recipe.yml
similarity index 67%
rename from Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml
rename to Resources/Prototypes/ADT/Recipes/Reactions/just_kekc_coctails_recipe.yml
index becea7c50f5..191c6932f2e 100644
--- a/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/ADT/Recipes/Reactions/just_kekc_coctails_recipe.yml
@@ -1,15 +1,3 @@
-- type: reaction
-  id: ADTCocoaDrink
-  reactants:
-    CocoaPowder:
-      amount: 1
-    Water:
-      amount: 4
-    Milk:
-      amount: 1
-  products:
-    ADTCocoaDrink: 6
-
 #безалкогольные
 
 - type: reaction
@@ -301,112 +289,3 @@
 #      amount: 2
 #  products:
 #    ADTCosmopolitan: 6
-
-- type: reaction
-  id: ADTChampagneMandarin
-  reactants:
-    Champagne:
-      amount: 2
-    ADTJuiceMandarin:
-      amount: 1
-  products:
-    ADTChampagneMandarin: 3
-
-- type: reaction
-  id: ADTMulledWineCold
-  reactants:
-    ADTСinnamon:
-      amount: 1
-    ADTCarnation:
-      amount: 2
-    JuiceLemon:
-      amount: 1
-    Wine:
-      amount: 2
-  products:
-    ADTMulledWineCold: 6
-
-- type: reaction
-  id: ADTMulledWine
-  minTemp: 353
-  reactants:
-    ADTMulledWineCold:
-      amount: 0.5
-  products:
-    ADTMulledWine: 0.5
-
-- type: reaction
-  id: ADTChristmasMilkshake
-  reactants:
-    Milk:
-      amount: 3
-    IceCream:
-      amount: 1
-    CocoaPowder:
-      amount: 2
-  products:
-    ADTChristmasMilkshake: 6
-
-- type: reaction
-  id: ADTTeaCinnamonLemon
-  reactants:
-    Tea:
-      amount: 3
-    JuiceLemon:
-      amount: 2
-    ADTСinnamon:
-      amount: 1
-  products:
-    ADTTeaCinnamonLemon: 6
-
-- type: reaction
-  id: ADTSbitenCinnamonLemon
-  minTemp: 373 #температура кипячения. ~99°C
-  reactants:
-    Water:
-      amount: 2
-    Mead:
-      amount: 1 #заменить на мёд. КОГДА ОН ПОЯВИТСЯ
-    JuiceLemon:
-      amount: 1
-    ADTСinnamon:
-      amount: 1
-    ADTCarnation:
-      amount: 1
-  products:
-    ADTSbitenCinnamonLemon: 6
-
-- type: reaction
-  id: ADTHotCocoa
-  minTemp: 373
-  reactants:
-    ADTCocoaDrink:
-      amount: 2
-    Cream:
-      amount: 1
-  products:
-    ADTHotCocoa: 3
-
-- type: reaction
-  id: ADTHotChocolate
-  minTemp: 373
-  reactants:
-    Nutriment:
-      amount: 10
-    Theobromine:
-       amount: 3
-    CocoaPowder:
-       amount: 1 #просто перемолотая плитка шоколада.
-  products:
-    ADTHotChocolate: 15
-
-- type: reaction
-  id: ADTHotChocolateAllergic
-  minTemp: 373
-  reactants:
-    Nutriment:
-      amount: 8
-    CocoaPowder:
-       amount: 1 #просто перемолотая плитка гипо-шоколада.
-  products:
-    ADTHotChocolateAllergic: 10
diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/medicine.yml b/Resources/Prototypes/ADT/Recipes/Reactions/medicine.yml
index 5803da82e8c..497504721e4 100644
--- a/Resources/Prototypes/ADT/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/ADT/Recipes/Reactions/medicine.yml
@@ -164,35 +164,3 @@
       catalyst: true
   products:
     ADTMFormalin: 3
-
-#Кровоостанавливающая пудра
-- type: reaction
-  id: ADTStypticPowder
-  reactants:
-    Aluminium:
-      amount: 1
-    Hydrogen:
-      amount: 1
-    Oxygen:
-      amount: 1
-    SulfuricAcid:
-      amount: 1
-  products:
-    ADTStypticPowder: 4
-#Сульфадиазин серебра
-- type: reaction
-  id: ADTSilverSulfadiazine
-  reactants:
-    Ammonia:
-      amount: 1
-    Silver:
-      amount: 1
-    Sulfur:
-      amount: 1
-    Oxygen:
-      amount: 1
-    Chlorine:
-      amount: 1
-  products:
-    ADTSilverSulfadiazine: 5
-
diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/new_year.yml b/Resources/Prototypes/ADT/Recipes/Reactions/new_year.yml
new file mode 100644
index 00000000000..d380f18c5bb
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Reactions/new_year.yml
@@ -0,0 +1,185 @@
+- type: reaction
+  id: ADTChampagneMandarin
+  reactants:
+    Champagne:
+      amount: 2
+    ADTJuiceMandarin:
+      amount: 1
+  products:
+    ADTChampagneMandarin: 3
+
+- type: reaction
+  id: ADTMulledWineCold
+  reactants:
+    ADTСinnamon:
+      amount: 1
+    ADTCarnation:
+      amount: 2
+    JuiceLemon:
+      amount: 1
+    Wine:
+      amount: 2
+  products:
+    ADTMulledWineCold: 6
+
+- type: reaction
+  id: ADTMulledWine
+  minTemp: 353
+  reactants:
+    ADTMulledWineCold:
+      amount: 0.5
+  products:
+    ADTMulledWine: 0.5
+
+- type: reaction
+  id: ADTChristmasMilkshake
+  reactants:
+    Milk:
+      amount: 3
+    IceCream:
+      amount: 1
+    CocoaPowder:
+      amount: 2
+  products:
+    ADTChristmasMilkshake: 6
+
+- type: reaction
+  id: ADTTeaCinnamonLemon
+  reactants:
+    Tea:
+      amount: 3
+    JuiceLemon:
+      amount: 2
+    ADTСinnamon:
+      amount: 1
+  products:
+    ADTTeaCinnamonLemon: 6
+
+- type: reaction
+  id: ADTSbitenCinnamonLemon
+  minTemp: 373 #температура кипячения. ~99°C
+  reactants:
+    Water:
+      amount: 2
+    Mead:
+      amount: 1 #заменить на мёд. КОГДА ОН ПОЯВИТСЯ
+    JuiceLemon:
+      amount: 1
+    ADTСinnamon:
+      amount: 1
+    ADTCarnation:
+      amount: 1
+  products:
+    ADTSbitenCinnamonLemon: 6
+
+- type: reaction
+  id: ADTHotCocoa
+  minTemp: 373
+  reactants:
+    ADTCocoaDrink:
+      amount: 2
+    Cream:
+      amount: 1
+  products:
+    ADTHotCocoa: 3
+
+- type: reaction
+  id: ADTHotChocolate
+  minTemp: 373
+  reactants:
+    Nutriment:
+      amount: 10
+    Theobromine:
+       amount: 3
+    CocoaPowder:
+       amount: 1 #просто перемолотая плитка шоколада.
+  products:
+    ADTHotChocolate: 15
+
+- type: reaction
+  id: ADTHotChocolateAllergic
+  minTemp: 373
+  reactants:
+    Nutriment:
+      amount: 8
+    CocoaPowder:
+       amount: 1 #просто перемолотая плитка гипо-шоколада.
+  products:
+    ADTHotChocolateAllergic: 10
+
+#технически не совсем приготовление напитка, но всё же
+- type: microwaveMealRecipe
+  id: RecipeMulledWineWarm
+  name: warm mulled wine recipe
+  result: ADTMulledWineGlass
+  time: 10
+  reagents:
+    ADTMulledWineCold: 30
+  solids:
+    DrinkGlass: 1
+
+- type: microwaveMealRecipe
+  id: RecipeMulledWineWarm2
+  name: warm mulled wine recipe
+  result: ADTMulledWineGlass
+  time: 10
+  reagents:
+    ADTMulledWineCold: 30
+  solids:
+    ADTMulledWineGlass: 1 #Костыли, но по-другому я никак не могу придумать.
+
+- type: microwaveMealRecipe
+  id: RecipeADTHotChocolate
+  name: hot chocolate recipe
+  result: ADTHotChocolateGlass
+  time: 10
+  solids:
+    DrinkGlass: 1
+    FoodSnackChocolateBar: 2
+
+- type: microwaveMealRecipe
+  id: RecipeADTHotChocolate2
+  name: hot chocolate recipe
+  result: ADTHotChocolateGlass
+  time: 10
+  solids:
+    ADTHotChocolateGlass: 1
+    FoodSnackChocolateBar: 2
+
+- type: microwaveMealRecipe
+  id: RecipeADTHotChocolateAllergic
+  name: hot hypoallergen chocolate recipe
+  result: ADTHotChocolateAllergicGlass
+  time: 10
+  solids:
+    DrinkGlass: 1
+    ADTHypoAllergenChocolateBar: 2
+
+- type: microwaveMealRecipe
+  id: RecipeADTHotChocolateAllergic2
+  name: hot hypoallergen chocolate recipe
+  result: ADTHotChocolateAllergicGlass
+  time: 10
+  solids:
+    ADTHotChocolateAllergicGlass: 1
+    ADTHypoAllergenChocolateBar: 2
+
+- type: microwaveMealRecipe
+  id: RecipeADTHotCocoa
+  name: hot cocoa recipe
+  result: ADTHotCocoaGlass
+  time: 10
+  reagents:
+    ADTCocoaDrink: 30
+  solids:
+    DrinkGlass: 1
+
+- type: microwaveMealRecipe
+  id: RecipeADTHotCocoa2
+  name: hot cocoa recipe
+  result: ADTHotCocoaGlass
+  time: 10
+  reagents:
+    ADTCocoaDrink: 30
+  solids:
+    ADTHotCocoaGlass: 1
diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/patch_medicine_recipe.yml b/Resources/Prototypes/ADT/Recipes/Reactions/patch_medicine_recipe.yml
new file mode 100644
index 00000000000..e561889f9ad
--- /dev/null
+++ b/Resources/Prototypes/ADT/Recipes/Reactions/patch_medicine_recipe.yml
@@ -0,0 +1,30 @@
+#Кровоостанавливающая пудра
+- type: reaction
+  id: ADTStypticPowder
+  reactants:
+    Aluminium:
+      amount: 1
+    Hydrogen:
+      amount: 1
+    Oxygen:
+      amount: 1
+    SulfuricAcid:
+      amount: 1
+  products:
+    ADTStypticPowder: 4
+#Сульфадиазин серебра
+- type: reaction
+  id: ADTSilverSulfadiazine
+  reactants:
+    Ammonia:
+      amount: 1
+    Silver:
+      amount: 1
+    Sulfur:
+      amount: 1
+    Oxygen:
+      amount: 1
+    Chlorine:
+      amount: 1
+  products:
+    ADTSilverSulfadiazine: 5
diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/toxins.yml b/Resources/Prototypes/ADT/Recipes/Reactions/toxins.yml
index 5681387ad7a..47803ee3d5f 100644
--- a/Resources/Prototypes/ADT/Recipes/Reactions/toxins.yml
+++ b/Resources/Prototypes/ADT/Recipes/Reactions/toxins.yml
@@ -8,18 +8,4 @@
     Lexorin:
       amount: 1
   products:
-    ADTPhronidolepaxorine: 3
-
-- type: reaction
-  id: ADTLingLarva #без понятия, как там у тебя личинка называется
-  quantized: true
-  reactants:
-    ADTMPolymorphine:
-      amount: 15
-    Nutriment: #ну, раз мы создаём что-то биологическое, то пусть будут ещё и биологические приколы.
-      amount: 3
-    Stimulants:
-      amount: 5
-  effects:
-    - !type:CreateEntityReactionEffect
-      entity: ADTLingLarva #сам подставишь id сущности.
\ No newline at end of file
+    ADTPhronidolepaxorine: 3
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Body/Organs/Shark.yml b/Resources/Prototypes/ADT/Shark/Body/Organs/Shark.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Organs/Shark.yml
rename to Resources/Prototypes/ADT/Shark/Body/Organs/Shark.yml
diff --git a/Resources/Prototypes/ADT/Body/Parts/Shark.yml b/Resources/Prototypes/ADT/Shark/Body/Parts/Shark.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Parts/Shark.yml
rename to Resources/Prototypes/ADT/Shark/Body/Parts/Shark.yml
diff --git a/Resources/Prototypes/ADT/Body/Prototypes/Shark.yml b/Resources/Prototypes/ADT/Shark/Body/Prototypes/Shark.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Prototypes/Shark.yml
rename to Resources/Prototypes/ADT/Shark/Body/Prototypes/Shark.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/Shark.yml b/Resources/Prototypes/ADT/Shark/Entities/Mobs/Player/Shark.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/player/Shark.yml
rename to Resources/Prototypes/ADT/Shark/Entities/Mobs/Player/Shark.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/Shark.yml b/Resources/Prototypes/ADT/Shark/Entities/Mobs/Species/Shark.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Species/Shark.yml
rename to Resources/Prototypes/ADT/Shark/Entities/Mobs/Species/Shark.yml
diff --git a/Resources/Prototypes/ADT/Datasets/Names/first_female_shark.yml b/Resources/Prototypes/ADT/Shark/Names/first_female_shark.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Datasets/Names/first_female_shark.yml
rename to Resources/Prototypes/ADT/Shark/Names/first_female_shark.yml
diff --git a/Resources/Prototypes/ADT/Datasets/Names/first_male_shark.yml b/Resources/Prototypes/ADT/Shark/Names/first_male_shark.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Datasets/Names/first_male_shark.yml
rename to Resources/Prototypes/ADT/Shark/Names/first_male_shark.yml
diff --git a/Resources/Prototypes/ADT/Datasets/Names/last_shark.yml b/Resources/Prototypes/ADT/Shark/Names/last_shark.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Datasets/Names/last_shark.yml
rename to Resources/Prototypes/ADT/Shark/Names/last_shark.yml
diff --git a/Resources/Prototypes/ADT/Species/Shark.yml b/Resources/Prototypes/ADT/Shark/Species/Shark.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Species/Shark.yml
rename to Resources/Prototypes/ADT/Shark/Species/Shark.yml
diff --git a/Resources/Prototypes/ADT/SoundCollections/emotes.yml b/Resources/Prototypes/ADT/SoundCollections/emotes.yml
deleted file mode 100644
index 3440ad71a1b..00000000000
--- a/Resources/Prototypes/ADT/SoundCollections/emotes.yml
+++ /dev/null
@@ -1,105 +0,0 @@
-- type: soundCollection
-  id: UrsusCry
-  files:
-  - /Audio/ADT/Ursus/cry1.ogg
-  - /Audio/ADT/Ursus/cry2.ogg
-
-- type: soundCollection
-  id: UrsusLaugh
-  files:
-  - /Audio/ADT/Ursus/laugh1.ogg
-  - /Audio/ADT/Ursus/laugh2.ogg
-
-- type: soundCollection
-  id: TajaranHisses
-  files:
-  - /Audio/ADT/Felinid/cat_hiss1.ogg
-  - /Audio/ADT/Felinid/cat_hiss2.ogg
-
-- type: soundCollection
-  id: TajaranMeows
-  files:
-  - /Audio/ADT/Felinid/cat_meow1.ogg
-  - /Audio/ADT/Felinid/cat_meow2.ogg
-  - /Audio/ADT/Felinid/cat_meow3.ogg
-
-- type: soundCollection
-  id: TajaranMews
-  files:
-  - /Audio/ADT/Felinid/cat_mew1.ogg
-  - /Audio/ADT/Felinid/cat_mew2.ogg
-
-- type: soundCollection
-  id: TajaranGrowls
-  files:
-  - /Audio/ADT/Felinid/cat_growl1.ogg
-
-- type: soundCollection
-  id: TajaranPurrs
-  files:
-  - /Audio/ADT/Felinid/cat_purr1.ogg
-
-- type: soundCollection
-  id: NovakidLaugh
-  files:
-    - /Audio/ADT/Novakid/novakid_laugh01.ogg
-    - /Audio/ADT/Novakid/novakid_laugh02.ogg
-    - /Audio/ADT/Novakid/novakid_laugh03.ogg
-    - /Audio/ADT/Novakid/novakid_laugh04.ogg
-    - /Audio/ADT/Novakid/novakid_laugh05.ogg
-
-
-- type: soundCollection
-  id: SynthYes
-  files:
-    - /Audio/ADT/IPC/synth_yes.ogg
-
-- type: soundCollection
-  id: SynthNo
-  files:
-    - /Audio/ADT/IPC/synth_no.ogg
-
-- type: soundCollection
-  id: Ping
-  files:
-    - /Audio/ADT/IPC/ping.ogg
-
-- type: soundCollection
-  id: Buzz
-  files:
-    - /Audio/ADT/IPC/buzz-sigh.ogg
-
-- type: soundCollection
-  id: SighBuzz
-  files:
-    - /Audio/ADT/IPC/buzz-two.ogg
-
-
-- type: soundCollection
-  id: FelinidHisses
-  files:
-  - /Audio/ADT/Felinid/cat_hiss1.ogg
-  - /Audio/ADT/Felinid/cat_hiss2.ogg
-
-- type: soundCollection
-  id: FelinidMeows
-  files:
-  - /Audio/ADT/Felinid/cat_meow1.ogg
-  - /Audio/ADT/Felinid/cat_meow2.ogg
-  - /Audio/ADT/Felinid/cat_meow3.ogg
-
-- type: soundCollection
-  id: FelinidMews
-  files:
-  - /Audio/ADT/Felinid/cat_mew1.ogg
-  - /Audio/ADT/Felinid/cat_mew2.ogg
-
-- type: soundCollection
-  id: FelinidGrowls
-  files:
-  - /Audio/ADT/Felinid/cat_growl1.ogg
-
-- type: soundCollection
-  id: FelinidPurrs
-  files:
-  - /Audio/ADT/Felinid/cat_purr1.ogg
diff --git a/Resources/Prototypes/ADT/SoundCollections/screams.yml b/Resources/Prototypes/ADT/SoundCollections/screams.yml
deleted file mode 100644
index 29833571b4a..00000000000
--- a/Resources/Prototypes/ADT/SoundCollections/screams.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-- type: soundCollection
-  id: UrsusScreams
-  files:
-  - /Audio/ADT/Ursus/scream1.ogg
-  - /Audio/ADT/Ursus/scream2.ogg
-  - /Audio/ADT/Ursus/scream3.ogg
-  - /Audio/ADT/Ursus/scream4.ogg
-
-- type: soundCollection
-  id: TajaranMaleScreams
-  files:
-  - /Audio/Voice/Human/malescream_1.ogg
-
-- type: soundCollection
-  id: TajaranFemaleScreams
-  files:
-  - /Audio/Voice/Human/femalescream_2.ogg
-
-- type: soundCollection
-  id: TajaranScreams
-  files:
-  - /Audio/ADT/Felinid/cat_scream1.ogg
-  - /Audio/ADT/Felinid/cat_scream2.ogg
-  - /Audio/ADT/Felinid/cat_scream3.ogg
-
-- type: soundCollection
-  id: NovakidScreams
-  files:
-    - /Audio/ADT/Novakid/novakid_scream01.ogg
-    - /Audio/ADT/Novakid/novakid_scream02.ogg
-    - /Audio/ADT/Novakid/novakid_scream03.ogg
-    - /Audio/ADT/Novakid/novakid_scream04.ogg
-
-- type: soundCollection
-  id: FelinidScreams
-  files:
-  - /Audio/ADT/Felinid/cat_scream1.ogg
-  - /Audio/ADT/Felinid/cat_scream2.ogg
-  - /Audio/ADT/Felinid/cat_scream3.ogg
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/soundgenerators.yml b/Resources/Prototypes/ADT/SoundGen/soundgenerators.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Objects/Misc/soundgenerators.yml
rename to Resources/Prototypes/ADT/SoundGen/soundgenerators.yml
diff --git a/Resources/Prototypes/ADT/StartingGear/Events/DroneAntag.yml b/Resources/Prototypes/ADT/StartingGear/Events/DroneAntag.yml
deleted file mode 100644
index 260e5049be5..00000000000
--- a/Resources/Prototypes/ADT/StartingGear/Events/DroneAntag.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-- type: startingGear
-  id: ADTAntagDroneGearMiner
-  equipment:
-    back: ClothingBackpackAntagDroneMiner
-    belt: OreBagAntagDrone
-  # inhand:
-  #   - MiningDrill
-  #   - WeaponProtoKineticAccelerator
-  #   - JawsOfLife
-  #   - PowerDrill
-  #   - OreBag
-
-- type: startingGear
-  id: ADTAntagDroneGearEngineer
-  equipment:
-    back: ClothingBackpackAntagDroneEngineer
-    belt: OreBagAntagDrone
-  # inhand:
-  #   - WelderIndustrial
-  #   - JawsOfLife
-  #   - PowerDrill
-  #   - Multitool
-  #   - trayScanner
-  #   - OreBag
-
-- type: startingGear
-  id: ADTAntagDroneGearCharger
-  equipment:
-    back: ClothingBackpackAntagDroneCharger
-    belt: OreBagAntagDrone
-  # inhand:
-  #   - JawsOfLife
-
-- type: startingGear
-  id: ADTAntagDroneGearIPC
-  equipment:
-    suitstorage: ADTWeaponLasgunSALR36
-    pocket1: ADTPowerCellLasgun
-    pocket2: ADTPowerCellLasgun
-    outerClothing: ClothingOuterArmorIPCAntagDrone
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/StartingGear/Navi.yml b/Resources/Prototypes/ADT/StartingGear/Navi.yml
deleted file mode 100644
index bcc1d983bae..00000000000
--- a/Resources/Prototypes/ADT/StartingGear/Navi.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-- type: startingGear
-  id: ADTMilitarySpaceNaviRepresentativeL
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitCentcomOfficer
-    back: ClothingBackpackFilled_VKF_R
-    #shoes: ClothingShoesBootCombatFilled - портатип не найден
-    mask: ClothingMaskGasCentcom
-    outerClothing: ClothingOuterVestWeb
-    eyes: ClothingEyesGlassesSecurity
-    #head: ClothingHeadHatBeretHos - портатип не найден
-    id: CentcomPDA
-    gloves: ClothingHandsGlovesColorWhite
-    ears: ClothingHeadsetCentCom
-    #belt: SecurityFilled - портатип не найден
-    pocket1: FlashlightSeclite
-    #pocket2: MicroBombImpanter  - портатип не найден
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/StartingGear/centcomrepresentativeL.yml b/Resources/Prototypes/ADT/StartingGear/centcomrepresentativeL.yml
deleted file mode 100644
index 9ec5dff9b98..00000000000
--- a/Resources/Prototypes/ADT/StartingGear/centcomrepresentativeL.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: startingGear
-  id: ADTCentComRepresentativeL
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitCentcomOfficer
-    back: ClothingBackpackFilled_CC_R
-    shoes: ClothingShoesBootsLaceup
-    outerClothing: ClothingOuterVest
-    eyes: ClothingEyesGlassesSunglasses
-    head: ClothingHeadHatBeretCentcomNaval
-    id: CentcomPDA
-    gloves: ClothingHandsGlovesColorGray
-    ears: ClothingHeadsetCentCom
-    #pocket2: MicroBombImpanter - Протатип не найден
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/StartingGear/specialofficer.yml b/Resources/Prototypes/ADT/StartingGear/specialofficer.yml
deleted file mode 100644
index 70edea2f631..00000000000
--- a/Resources/Prototypes/ADT/StartingGear/specialofficer.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-- type: startingGear
-  id: SpecialOperationsOfficerGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitCentcomFormal
-    back: ClothingBackpackERTLeaderFilled_SOO
-    shoes: ClothingShoesBootsJack
-    head: ClothingHeadHatCentcom
-    eyes: ClothingEyesGlassesSunglasses
-    gloves: ClothingHandsGlovesCentcomNaval
-    outerClothing: ClothingOuterVestKevlar
-    id: CentcomPDA
-    ears: ClothingHeadsetAltCentCom
-    #belt: SecurityFilled - Портатип не нейден
-    mask: ClothingMaskGasCentcom
-    pocket1: MacroBombImplanter
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Body/Organs/Tajaran.yml b/Resources/Prototypes/ADT/Tajaran/Body/Organs/Tajaran.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Organs/Tajaran.yml
rename to Resources/Prototypes/ADT/Tajaran/Body/Organs/Tajaran.yml
diff --git a/Resources/Prototypes/ADT/Body/Parts/Tajaran.yml b/Resources/Prototypes/ADT/Tajaran/Body/Parts/Tajaran.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Parts/Tajaran.yml
rename to Resources/Prototypes/ADT/Tajaran/Body/Parts/Tajaran.yml
diff --git a/Resources/Prototypes/ADT/Body/Prototypes/Tajaran.yml b/Resources/Prototypes/ADT/Tajaran/Body/Prototypes/Tajaran.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Prototypes/Tajaran.yml
rename to Resources/Prototypes/ADT/Tajaran/Body/Prototypes/Tajaran.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Tajaran.yml b/Resources/Prototypes/ADT/Tajaran/Entities/Mobs/Customization/Markings/Tajaran.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Tajaran.yml
rename to Resources/Prototypes/ADT/Tajaran/Entities/Mobs/Customization/Markings/Tajaran.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/Tajaran.yml b/Resources/Prototypes/ADT/Tajaran/Entities/Mobs/Player/Tajaran.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/player/Tajaran.yml
rename to Resources/Prototypes/ADT/Tajaran/Entities/Mobs/Player/Tajaran.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/Tajaran.yml b/Resources/Prototypes/ADT/Tajaran/Entities/Mobs/Species/Tajaran.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Species/Tajaran.yml
rename to Resources/Prototypes/ADT/Tajaran/Entities/Mobs/Species/Tajaran.yml
diff --git a/Resources/Prototypes/ADT/Datasets/Names/first_female_tajaran.yml b/Resources/Prototypes/ADT/Tajaran/Names/first_female_tajaran.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Datasets/Names/first_female_tajaran.yml
rename to Resources/Prototypes/ADT/Tajaran/Names/first_female_tajaran.yml
diff --git a/Resources/Prototypes/ADT/Datasets/Names/first_male_tajaran.yml b/Resources/Prototypes/ADT/Tajaran/Names/first_male_tajaran.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Datasets/Names/first_male_tajaran.yml
rename to Resources/Prototypes/ADT/Tajaran/Names/first_male_tajaran.yml
diff --git a/Resources/Prototypes/ADT/Datasets/Names/last_tajaran.yml b/Resources/Prototypes/ADT/Tajaran/Names/last_tajaran.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Datasets/Names/last_tajaran.yml
rename to Resources/Prototypes/ADT/Tajaran/Names/last_tajaran.yml
diff --git a/Resources/Prototypes/ADT/Species/Tajaran.yml b/Resources/Prototypes/ADT/Tajaran/Species/Tajaran.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Species/Tajaran.yml
rename to Resources/Prototypes/ADT/Tajaran/Species/Tajaran.yml
diff --git a/Resources/Prototypes/ADT/Tajaran/Voice/sound_collections.yml b/Resources/Prototypes/ADT/Tajaran/Voice/sound_collections.yml
new file mode 100644
index 00000000000..d832c11640f
--- /dev/null
+++ b/Resources/Prototypes/ADT/Tajaran/Voice/sound_collections.yml
@@ -0,0 +1,45 @@
+- type: soundCollection
+  id: TajaranMaleScreams
+  files:
+  - /Audio/Voice/Human/malescream_1.ogg
+
+- type: soundCollection
+  id: TajaranFemaleScreams
+  files:
+  - /Audio/Voice/Human/femalescream_2.ogg
+
+- type: soundCollection
+  id: TajaranScreams
+  files:
+  - /Audio/ADT/Felinid/cat_scream1.ogg
+  - /Audio/ADT/Felinid/cat_scream2.ogg
+  - /Audio/ADT/Felinid/cat_scream3.ogg
+
+- type: soundCollection
+  id: TajaranHisses
+  files:
+  - /Audio/ADT/Felinid/cat_hiss1.ogg
+  - /Audio/ADT/Felinid/cat_hiss2.ogg
+
+- type: soundCollection
+  id: TajaranMeows
+  files:
+  - /Audio/ADT/Felinid/cat_meow1.ogg
+  - /Audio/ADT/Felinid/cat_meow2.ogg
+  - /Audio/ADT/Felinid/cat_meow3.ogg
+
+- type: soundCollection
+  id: TajaranMews
+  files:
+  - /Audio/ADT/Felinid/cat_mew1.ogg
+  - /Audio/ADT/Felinid/cat_mew2.ogg
+
+- type: soundCollection
+  id: TajaranGrowls
+  files:
+  - /Audio/ADT/Felinid/cat_growl1.ogg
+
+- type: soundCollection
+  id: TajaranPurrs
+  files:
+  - /Audio/ADT/Felinid/cat_purr1.ogg
diff --git a/Resources/Prototypes/ADT/Tajaran/Voice/speech_emote_sounds.yml b/Resources/Prototypes/ADT/Tajaran/Voice/speech_emote_sounds.yml
new file mode 100644
index 00000000000..be8895d4dd6
--- /dev/null
+++ b/Resources/Prototypes/ADT/Tajaran/Voice/speech_emote_sounds.yml
@@ -0,0 +1,97 @@
+- type: emoteSounds
+  id: ADTMaleTajaran
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: TajaranMaleScreams
+    Laugh:
+      collection: MaleLaugh
+    Hiss:
+      collection: TajaranHisses
+    Meow:
+      collection: TajaranMeows
+    Mew:
+      collection: TajaranMews
+    Growl:
+      collection: TajaranGrowls
+    Purr:
+      collection: TajaranPurrs
+    Sneeze:
+      collection: MaleSneezes
+    Cough:
+      collection: MaleCoughs
+    MonkeyScreeches:
+      collection: MonkeyScreeches
+    RobotBeep:
+      collection: RobotBeeps
+    Yawn:
+      collection: MaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: BikeHorn
+    Sigh:
+      collection: MaleSigh
+    Crying:
+      collection: MaleCry
+    Whistle:
+      collection: Whistles
+    # ADT-Apathy Sounds. 
+    Scream-apathy:
+      collection: TajaranMaleScreams
+    Laugh-apathy:
+      collection: MaleLaugh 
+    Sigh-apathy:
+      collection: MaleSigh
+    Crying-apathy:
+      collection: MaleCry
+
+- type: emoteSounds
+  id: ADTFemaleTajaran
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: TajaranFemaleScreams
+    Laugh:
+      collection: FemaleLaugh
+    Sneeze:
+      collection: FemaleSneezes
+    Cough:
+      collection: FemaleCoughs
+    Hiss:
+      collection: TajaranHisses
+    Meow:
+      collection: TajaranMeows
+    Mew:
+      collection: TajaranMews
+    Growl:
+      collection: TajaranGrowls
+    Purr:
+      collection: TajaranPurrs
+    MonkeyScreeches:
+      collection: MonkeyScreeches
+    RobotBeep:
+      collection: RobotBeeps
+    Yawn:
+      collection: FemaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: CluwneHorn
+    Sigh:
+      collection: FemaleSigh
+    Crying:
+      collection: FemaleCry
+    Whistle:
+      collection: Whistles
+    # ADT-Apathy Sounds. 
+    Scream-apathy:
+      collection: TajaranFemaleScreams
+    Laugh-apathy:
+      collection: FemaleLaugh 
+    Sigh-apathy:
+      collection: FemaleSigh
+    Crying-apathy:
+      collection: FemaleCry
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Tajaran/Voice/speech_emotes.yml b/Resources/Prototypes/ADT/Tajaran/Voice/speech_emotes.yml
new file mode 100644
index 00000000000..e2e4fade110
--- /dev/null
+++ b/Resources/Prototypes/ADT/Tajaran/Voice/speech_emotes.yml
@@ -0,0 +1,66 @@
+# ## vocal emotes
+# - type: emote
+#   id: ADTHiss
+#   category: Vocal
+#   chatMessages: [шипит]
+#   chatTriggers:
+#     - шипит
+#     - шипит.
+#     - шипит!
+
+# - type: emote
+#   id: ADTMeow
+#   category: Vocal
+#   chatMessages: [мяукает]
+#   chatTriggers:
+#     - мяу
+#     - мяукнул
+#     - мяукнул.
+#     - мяукнул!
+#     - мяукнула
+#     - мяукнула.
+#     - мяукнула!
+#     - мяукает
+#     - мяукает.
+#     - мяукает!
+
+# - type: emote
+#   id: ADTMew
+#   category: Vocal
+#   chatMessages: [мякает]
+#   chatTriggers:
+#     - мя
+#     - мякает
+#     - мякает.
+#     - мякает!
+#     - ня
+#     - мякает?
+#     - mews.
+#     - mews!
+#     - mewing
+#     - mewed
+
+# - type: emote
+#   id: ADTGrowl
+#   category: Vocal
+#   chatMessages: [growls]
+#   chatTriggers:
+#     - рычит
+#     - ррр
+#     - growl
+#     - growls
+#     - growls.
+#     - growls!
+#     - growling
+#     - growled
+
+# - type: emote
+#   id: ADTPurr
+#   category: Vocal
+#   chatMessages: [мурчит]
+#   chatTriggers:
+#     - мур
+#     - мурчит
+#     - мурчит.
+#     - мурчит!
+
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/base_meka.yml b/Resources/Prototypes/ADT/Tallrobot/base.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/base_meka.yml
rename to Resources/Prototypes/ADT/Tallrobot/base.yml
diff --git a/Resources/Prototypes/ADT/Tallrobot/fmeka/fmekacargo.yml b/Resources/Prototypes/ADT/Tallrobot/fmeka/fmekacargo.yml
new file mode 100644
index 00000000000..30eecc3ff0a
--- /dev/null
+++ b/Resources/Prototypes/ADT/Tallrobot/fmeka/fmekacargo.yml
@@ -0,0 +1,54 @@
+- type: entity
+  id: ADTTallRobotFMekaCargo
+  parent: ADTTallRobotFMekaBase
+  name: cargo cyborg
+  components:
+  - type: Sprite
+    sprite: ADT/Mobs/Silicon/Bots/tallrobot/fmekacargo.rsi
+    layers:
+    - state: fmekacargo
+      map: ["enum.DamageStateVisualLayers.Base"]
+    - state: fmekacargoe
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: fmekacargoer
+      shader: unshaded
+      visible: false
+    - state: robot_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: BorgChassis
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleCargo
+    hasMindState: fmekacargoe
+    noMindState: fmekacargoer
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: fmekacargo
+      Critical:
+        Base: fmekacargo-wreck
+      Dead:
+        Base: fmekacargo-wreck
+  - type: Construction
+    node: mining
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Supply
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Supply
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]]
+  - type: Inventory
+    templateId: borgTall
diff --git a/Resources/Prototypes/ADT/Tallrobot/fmeka/fmekaeng.yml b/Resources/Prototypes/ADT/Tallrobot/fmeka/fmekaeng.yml
new file mode 100644
index 00000000000..632f9a84658
--- /dev/null
+++ b/Resources/Prototypes/ADT/Tallrobot/fmeka/fmekaeng.yml
@@ -0,0 +1,54 @@
+- type: entity
+  id: ADTTallRobotFMekaEng
+  parent: ADTTallRobotFMekaBase
+  name: eng cyborg
+  components:
+  - type: Sprite
+    sprite: ADT/Mobs/Silicon/Bots/tallrobot/fmekaeng.rsi
+    layers:
+    - state: fmekaeng
+      map: ["enum.DamageStateVisualLayers.Base"]
+    - state: fmekaenge
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: fmekaenger
+      shader: unshaded
+      visible: false
+    - state: robot_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: BorgChassis
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleEngineering
+    hasMindState: fmekaenge
+    noMindState: fmekaenger
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: fmekaeng
+      Critical:
+        Base: fmekaeng-wreck
+      Dead:
+        Base: fmekaeng-wreck
+  - type: Construction
+    node: engineer
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Engineering
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Engineering
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Engineering"], ["Command"], ["Research"]]
+  - type: Inventory
+    templateId: borgTall
diff --git a/Resources/Prototypes/ADT/Tallrobot/fmeka/fmekajani.yml b/Resources/Prototypes/ADT/Tallrobot/fmeka/fmekajani.yml
new file mode 100644
index 00000000000..922c97695ae
--- /dev/null
+++ b/Resources/Prototypes/ADT/Tallrobot/fmeka/fmekajani.yml
@@ -0,0 +1,55 @@
+- type: entity
+  id: ADTTallRobotFMekaJani
+  parent: ADTTallRobotFMekaBase
+  name: service cyborg
+  components:
+  - type: Sprite
+    sprite: ADT/Mobs/Silicon/Bots/tallrobot/fmekajani.rsi
+    layers:
+    - state: fmekajani
+      map: ["enum.DamageStateVisualLayers.Base"]
+    - state: fmekajanie
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: fmekajanier
+      shader: unshaded
+      visible: false
+    - state: robot_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: BorgChassis
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleService
+      - BorgModuleJanitor
+    hasMindState: fmekajanie
+    noMindState: fmekajanier
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: fmekajani
+      Critical:
+        Base: fmekajani-wreck
+      Dead:
+        Base: fmekajani-wreck
+  - type: Construction
+    node: service
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Service
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Service
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Service"], ["Command"], ["Research"]]
+  - type: Inventory
+    templateId: borgTall
diff --git a/Resources/Prototypes/ADT/Tallrobot/fmeka/fmekamed.yml b/Resources/Prototypes/ADT/Tallrobot/fmeka/fmekamed.yml
new file mode 100644
index 00000000000..04261036110
--- /dev/null
+++ b/Resources/Prototypes/ADT/Tallrobot/fmeka/fmekamed.yml
@@ -0,0 +1,54 @@
+- type: entity
+  id: ADTTallRobotFMekaMed
+  parent: ADTTallRobotFMekaBase
+  name: med cyborg
+  components:
+  - type: Sprite
+    sprite: ADT/Mobs/Silicon/Bots/tallrobot/fmekamed.rsi
+    layers:
+    - state: fmekamed
+      map: ["enum.DamageStateVisualLayers.Base"]
+    - state: fmekamed_e
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: fmekamed_e_r
+      shader: unshaded
+      visible: false
+    - state: robot_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: BorgChassis
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleMedical
+    hasMindState: fmekamed_e
+    noMindState: fmekamed_e_r
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: fmekamed
+      Critical:
+        Base: fmekamed-wreck
+      Dead:
+        Base: fmekamed-wreck
+  - type: Construction
+    node: service
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Medical
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Medical
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Medical"], ["Command"], ["Research"]]
+  - type: Inventory
+    templateId: borgTall
diff --git a/Resources/Prototypes/ADT/Tallrobot/fmeka/fmekaserve.yml b/Resources/Prototypes/ADT/Tallrobot/fmeka/fmekaserve.yml
new file mode 100644
index 00000000000..f63f8f130d3
--- /dev/null
+++ b/Resources/Prototypes/ADT/Tallrobot/fmeka/fmekaserve.yml
@@ -0,0 +1,54 @@
+- type: entity
+  id: ADTTallRobotFMekaServe
+  parent: ADTTallRobotFMekaBase
+  name: service cyborg
+  components:
+  - type: Sprite
+    sprite: ADT/Mobs/Silicon/Bots/tallrobot/fmekaserve.rsi
+    layers:
+    - state: fmekaserv
+      map: ["enum.DamageStateVisualLayers.Base"]
+    - state: fmekaserv_e
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: fmekaserv_e_r
+      shader: unshaded
+      visible: false
+    - state: robot_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: BorgChassis
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleService
+    hasMindState: fmekaserv_e
+    noMindState: fmekaserv_e_r
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: fmekaserv
+      Critical:
+        Base: fmekaserv-wreck
+      Dead:
+        Base: fmekaserv-wreck
+  - type: Construction
+    node: service
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Service
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Service
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Service"], ["Command"], ["Research"]]
+  - type: Inventory
+    templateId: borgTall
diff --git a/Resources/Prototypes/ADT/Tallrobot/meka/mekacargo.yml b/Resources/Prototypes/ADT/Tallrobot/meka/mekacargo.yml
new file mode 100644
index 00000000000..0a9994f549a
--- /dev/null
+++ b/Resources/Prototypes/ADT/Tallrobot/meka/mekacargo.yml
@@ -0,0 +1,54 @@
+- type: entity
+  id: ADTTallRobotMekaCargo
+  parent: ADTTallRobotMekaBase
+  name: cargo cyborg
+  components:
+  - type: Sprite
+    sprite: ADT/Mobs/Silicon/Bots/tallrobot/mekacargo.rsi
+    layers:
+    - state: mekacargo
+      map: ["enum.DamageStateVisualLayers.Base"]
+    - state: mekacargo_e
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: mekacargo_e_r
+      shader: unshaded
+      visible: false
+    - state: robot_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: BorgChassis
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleCargo
+    hasMindState: mekacargo_e
+    noMindState: mekacargo_e_r
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: mekacargo
+      Critical:
+        Base: mekacargo-tipped
+      Dead:
+        Base: mekacargo-tipped
+  - type: Construction
+    node: mining
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Supply
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Supply
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]]
+  - type: Inventory
+    templateId: borgTall
diff --git a/Resources/Prototypes/ADT/Tallrobot/meka/mekaeng.yml b/Resources/Prototypes/ADT/Tallrobot/meka/mekaeng.yml
new file mode 100644
index 00000000000..bb1dd88c8b9
--- /dev/null
+++ b/Resources/Prototypes/ADT/Tallrobot/meka/mekaeng.yml
@@ -0,0 +1,54 @@
+- type: entity
+  id: ADTTallRobotMekaEng
+  parent: ADTTallRobotMekaBase
+  name: eng cyborg
+  components:
+  - type: Sprite
+    sprite: ADT/Mobs/Silicon/Bots/tallrobot/mekaeng.rsi
+    layers:
+    - state: mekaengi
+      map: ["enum.DamageStateVisualLayers.Base"]
+    - state: mekaengi_e
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: mekaengi_e_r
+      shader: unshaded
+      visible: false
+    - state: robot_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: BorgChassis
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleEngineering
+    hasMindState: mekaengi_e
+    noMindState: mekaengi_e_r
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: mekaengi
+      Critical:
+        Base: mekaengi-tipped
+      Dead:
+        Base: mekaengi-tipped
+  - type: Construction
+    node: engineer
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Engineering
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Engineering
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Engineering"], ["Command"], ["Research"]]
+  - type: Inventory
+    templateId: borgTall
diff --git a/Resources/Prototypes/ADT/Tallrobot/meka/mekajani.yml b/Resources/Prototypes/ADT/Tallrobot/meka/mekajani.yml
new file mode 100644
index 00000000000..9b11d2c47e1
--- /dev/null
+++ b/Resources/Prototypes/ADT/Tallrobot/meka/mekajani.yml
@@ -0,0 +1,59 @@
+- type: entity
+  id: ADTTallRobotMekaJani
+  parent: ADTTallRobotMekaBase
+  name: service cyborg
+  components:
+  - type: Sprite
+    sprite: ADT/Mobs/Silicon/Bots/tallrobot/mekajani.rsi
+    layers:
+    - state: mekajani
+      map: ["enum.DamageStateVisualLayers.Base"]
+    - state: mekajanitipped
+      visible: false
+    - state: mekajanie
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: mekajanier
+      shader: unshaded
+      visible: false
+    - state: mekajanirest
+      visible: false
+    - state: robot_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: BorgChassis
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleService
+      - BorgModuleJanitor
+    hasMindState: mekajanie
+    noMindState: mekajanier
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: mekajani
+      Critical:
+        Base: mekajanitipped
+      Dead:
+        Base: mekajanitipped
+  - type: Construction
+    node: service
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Service
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Service
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Service"], ["Command"], ["Research"]]
+  - type: Inventory
+    templateId: borgTall
diff --git a/Resources/Prototypes/ADT/Tallrobot/meka/mekamed.yml b/Resources/Prototypes/ADT/Tallrobot/meka/mekamed.yml
new file mode 100644
index 00000000000..15c12d4b978
--- /dev/null
+++ b/Resources/Prototypes/ADT/Tallrobot/meka/mekamed.yml
@@ -0,0 +1,54 @@
+- type: entity
+  id: ADTTallRobotMekaMed
+  parent: ADTTallRobotMekaBase
+  name: med cyborg
+  components:
+  - type: Sprite
+    sprite: ADT/Mobs/Silicon/Bots/tallrobot/mekamed.rsi
+    layers:
+    - state: mekamed
+      map: ["enum.DamageStateVisualLayers.Base"]
+    - state: mekamed_e
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: mekamed_e_r
+      shader: unshaded
+      visible: false
+    - state: robot_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: BorgChassis
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleMedical
+    hasMindState: mekamed_e
+    noMindState: mekamed_e_r
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: mekamed
+      Critical:
+        Base: mekamed-tipped
+      Dead:
+        Base: mekamed-tipped
+  - type: Construction
+    node: service
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Medical
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Medical
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Medical"], ["Command"], ["Research"]]
+  - type: Inventory
+    templateId: borgTall
diff --git a/Resources/Prototypes/ADT/Tallrobot/meka/mekaserve.yml b/Resources/Prototypes/ADT/Tallrobot/meka/mekaserve.yml
new file mode 100644
index 00000000000..efe5a73946f
--- /dev/null
+++ b/Resources/Prototypes/ADT/Tallrobot/meka/mekaserve.yml
@@ -0,0 +1,54 @@
+- type: entity
+  id: ADTTallRobotMekaServe
+  parent: ADTTallRobotMekaBase
+  name: service cyborg
+  components:
+  - type: Sprite
+    sprite: ADT/Mobs/Silicon/Bots/tallrobot/mekaserve.rsi
+    layers:
+    - state: mekaserve
+      map: ["enum.DamageStateVisualLayers.Base"]
+    - state: mekaserve_e
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: mekaserve_e_r
+      shader: unshaded
+      visible: false
+    - state: robot_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: BorgChassis
+    moduleWhitelist:
+      tags:
+      - BorgModuleGeneric
+      - BorgModuleService
+    hasMindState: mekaserve_e
+    noMindState: mekaserve_e_r
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: mekaserve
+      Critical:
+        Base: mekaserve-tipped
+      Dead:
+        Base: mekaserve-tipped
+  - type: Construction
+    node: service
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Service
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Service
+    - Binary
+    - Common
+    - Science
+  - type: AccessReader
+    access: [["Service"], ["Command"], ["Research"]]
+  - type: Inventory
+    templateId: borgTall
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Specific/tardis.yml b/Resources/Prototypes/ADT/Tardis/tardis.yml
similarity index 99%
rename from Resources/Prototypes/ADT/Entities/Structures/Specific/tardis.yml
rename to Resources/Prototypes/ADT/Tardis/tardis.yml
index de76d9a703f..76267585ceb 100644
--- a/Resources/Prototypes/ADT/Entities/Structures/Specific/tardis.yml
+++ b/Resources/Prototypes/ADT/Tardis/tardis.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: LockerTardis
   parent: LockerBaseTardis
   name: Tardis
diff --git a/Resources/Prototypes/ADT/Tiles/plating.yml b/Resources/Prototypes/ADT/Tiles/halloween_tile.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Tiles/plating.yml
rename to Resources/Prototypes/ADT/Tiles/halloween_tile.yml
diff --git a/Resources/Prototypes/ADT/Body/Organs/Ursus.yml b/Resources/Prototypes/ADT/Ursus/Body/Organs/Ursus.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Organs/Ursus.yml
rename to Resources/Prototypes/ADT/Ursus/Body/Organs/Ursus.yml
diff --git a/Resources/Prototypes/ADT/Body/Parts/Ursus.yml b/Resources/Prototypes/ADT/Ursus/Body/Parts/Ursus.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Parts/Ursus.yml
rename to Resources/Prototypes/ADT/Ursus/Body/Parts/Ursus.yml
diff --git a/Resources/Prototypes/ADT/Body/Prototypes/Ursus.yml b/Resources/Prototypes/ADT/Ursus/Body/Prototypes/Ursus.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Prototypes/Ursus.yml
rename to Resources/Prototypes/ADT/Ursus/Body/Prototypes/Ursus.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Ursus.yml b/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Customization/Markings/Ursus.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Ursus.yml
rename to Resources/Prototypes/ADT/Ursus/Entities/Mobs/Customization/Markings/Ursus.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Ursus_hair.yml b/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Customization/Markings/Ursus_hair.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Ursus_hair.yml
rename to Resources/Prototypes/ADT/Ursus/Entities/Mobs/Customization/Markings/Ursus_hair.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/Ursus.yml b/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Player/Ursus.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/player/Ursus.yml
rename to Resources/Prototypes/ADT/Ursus/Entities/Mobs/Player/Ursus.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/Ursus.yml b/Resources/Prototypes/ADT/Ursus/Entities/Mobs/Species/Ursus.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Species/Ursus.yml
rename to Resources/Prototypes/ADT/Ursus/Entities/Mobs/Species/Ursus.yml
diff --git a/Resources/Prototypes/ADT/Datasets/Names/first_female_urs.yml b/Resources/Prototypes/ADT/Ursus/Names/first_female_urs.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Datasets/Names/first_female_urs.yml
rename to Resources/Prototypes/ADT/Ursus/Names/first_female_urs.yml
diff --git a/Resources/Prototypes/ADT/Datasets/Names/first_male_urs.yml b/Resources/Prototypes/ADT/Ursus/Names/first_male_urs.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Datasets/Names/first_male_urs.yml
rename to Resources/Prototypes/ADT/Ursus/Names/first_male_urs.yml
diff --git a/Resources/Prototypes/ADT/Datasets/Names/last_female_urs.yml b/Resources/Prototypes/ADT/Ursus/Names/last_female_urs.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Datasets/Names/last_female_urs.yml
rename to Resources/Prototypes/ADT/Ursus/Names/last_female_urs.yml
diff --git a/Resources/Prototypes/ADT/Datasets/Names/last_male_urs.yml b/Resources/Prototypes/ADT/Ursus/Names/last_male_urs.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Datasets/Names/last_male_urs.yml
rename to Resources/Prototypes/ADT/Ursus/Names/last_male_urs.yml
diff --git a/Resources/Prototypes/ADT/Ursus/Sound/sound_collections.yml b/Resources/Prototypes/ADT/Ursus/Sound/sound_collections.yml
new file mode 100644
index 00000000000..1317350a021
--- /dev/null
+++ b/Resources/Prototypes/ADT/Ursus/Sound/sound_collections.yml
@@ -0,0 +1,19 @@
+- type: soundCollection
+  id: UrsusScreams
+  files:
+  - /Audio/ADT/Ursus/scream1.ogg
+  - /Audio/ADT/Ursus/scream2.ogg
+  - /Audio/ADT/Ursus/scream3.ogg
+  - /Audio/ADT/Ursus/scream4.ogg
+
+- type: soundCollection
+  id: UrsusCry
+  files:
+  - /Audio/ADT/Ursus/cry1.ogg
+  - /Audio/ADT/Ursus/cry2.ogg
+
+- type: soundCollection
+  id: UrsusLaugh
+  files:
+  - /Audio/ADT/Ursus/laugh1.ogg
+  - /Audio/ADT/Ursus/laugh2.ogg
diff --git a/Resources/Prototypes/ADT/Ursus/Sound/speech_emote_sounds.yml b/Resources/Prototypes/ADT/Ursus/Sound/speech_emote_sounds.yml
new file mode 100644
index 00000000000..3a1c64cc3b4
--- /dev/null
+++ b/Resources/Prototypes/ADT/Ursus/Sound/speech_emote_sounds.yml
@@ -0,0 +1,85 @@
+- type: emoteSounds
+  id: MaleUrsus
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: UrsusScreams
+    Laugh:
+      collection: UrsusLaugh
+    Sneeze:
+      collection: MaleSneezes
+    Cough:
+      collection: MaleCoughs
+    CatMeow:
+      collection: CatMeows
+    CatHisses:
+      collection: CatHisses
+    MonkeyScreeches:
+      collection: MonkeyScreeches
+    RobotBeep:
+      collection: RobotBeeps
+    Yawn:
+      collection: MaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: BikeHorn
+    Sigh:
+      collection: MaleSigh
+    Crying:
+      collection: UrsusCry
+    Whistle:
+      collection: Whistles
+    # ADT-Apathy Sounds. 
+    Scream-apathy:
+      collection: UrsusScreams
+    Laugh-apathy:
+      collection: UrsusLaugh 
+    Sigh-apathy:
+      collection: MaleSigh
+    Crying-apathy:
+      collection: UrsusCry
+
+- type: emoteSounds
+  id: FemaleUrsus
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: UrsusScreams
+    Laugh:
+      collection: UrsusLaugh
+    Sneeze:
+      collection: FemaleSneezes
+    Cough:
+      collection: FemaleCoughs
+    CatMeow:
+      collection: CatMeows
+    CatHisses:
+      collection: CatHisses
+    MonkeyScreeches:
+      collection: MonkeyScreeches
+    RobotBeep:
+      collection: RobotBeeps
+    Yawn:
+      collection: FemaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: CluwneHorn
+    Sigh:
+      collection: FemaleSigh
+    Crying:
+      collection: UrsusCry
+    Whistle:
+      collection: Whistles
+    # ADT-Apathy Sounds. 
+    Scream-apathy:
+      collection: UrsusScreams
+    Laugh-apathy:
+      collection: UrsusLaugh 
+    Sigh-apathy:
+      collection: FemaleSigh
+    Crying-apathy:
+      collection: UrsusCry
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Species/Ursus.yml b/Resources/Prototypes/ADT/Ursus/Species/Ursus.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Species/Ursus.yml
rename to Resources/Prototypes/ADT/Ursus/Species/Ursus.yml
diff --git a/Resources/Prototypes/ADT/Ursus/faction.yml b/Resources/Prototypes/ADT/Ursus/faction.yml
new file mode 100644
index 00000000000..3b8eb480b0b
--- /dev/null
+++ b/Resources/Prototypes/ADT/Ursus/faction.yml
@@ -0,0 +1,7 @@
+- type: npcFaction
+  id: Ursus
+  hostile:
+  - Syndicate
+  - Xeno
+  - Zombie
+  - Revolutionary
diff --git a/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml b/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml
deleted file mode 100644
index 09db9a8fde2..00000000000
--- a/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml
+++ /dev/null
@@ -1,424 +0,0 @@
-- type: emoteSounds
-  id: MaleUrsus
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      collection: UrsusScreams
-    Laugh:
-      collection: UrsusLaugh
-    Sneeze:
-      collection: MaleSneezes
-    Cough:
-      collection: MaleCoughs
-    CatMeow:
-      collection: CatMeows
-    CatHisses:
-      collection: CatHisses
-    MonkeyScreeches:
-      collection: MonkeyScreeches
-    RobotBeep:
-      collection: RobotBeeps
-    Yawn:
-      collection: MaleYawn
-    Snore:
-      collection: Snores
-    Honk:
-      collection: BikeHorn
-    Sigh:
-      collection: MaleSigh
-    Crying:
-      collection: UrsusCry
-    Whistle:
-      collection: Whistles
-    # ADT-Apathy Sounds. 
-    Scream-apathy:
-      collection: UrsusScreams
-    Laugh-apathy:
-      collection: UrsusLaugh 
-    Sigh-apathy:
-      collection: MaleSigh
-    Crying-apathy:
-      collection: UrsusCry
-
-- type: emoteSounds
-  id: FemaleUrsus
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      collection: UrsusScreams
-    Laugh:
-      collection: UrsusLaugh
-    Sneeze:
-      collection: FemaleSneezes
-    Cough:
-      collection: FemaleCoughs
-    CatMeow:
-      collection: CatMeows
-    CatHisses:
-      collection: CatHisses
-    MonkeyScreeches:
-      collection: MonkeyScreeches
-    RobotBeep:
-      collection: RobotBeeps
-    Yawn:
-      collection: FemaleYawn
-    Snore:
-      collection: Snores
-    Honk:
-      collection: CluwneHorn
-    Sigh:
-      collection: FemaleSigh
-    Crying:
-      collection: UrsusCry
-    Whistle:
-      collection: Whistles
-    # ADT-Apathy Sounds. 
-    Scream-apathy:
-      collection: UrsusScreams
-    Laugh-apathy:
-      collection: UrsusLaugh 
-    Sigh-apathy:
-      collection: FemaleSigh
-    Crying-apathy:
-      collection: UrsusCry
-
-- type: emoteSounds
-  id: ADTMaleTajaran
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      collection: TajaranMaleScreams
-    Laugh:
-      collection: MaleLaugh
-    Hiss:
-      collection: TajaranHisses
-    Meow:
-      collection: TajaranMeows
-    Mew:
-      collection: TajaranMews
-    Growl:
-      collection: TajaranGrowls
-    Purr:
-      collection: TajaranPurrs
-    Sneeze:
-      collection: MaleSneezes
-    Cough:
-      collection: MaleCoughs
-    MonkeyScreeches:
-      collection: MonkeyScreeches
-    RobotBeep:
-      collection: RobotBeeps
-    Yawn:
-      collection: MaleYawn
-    Snore:
-      collection: Snores
-    Honk:
-      collection: BikeHorn
-    Sigh:
-      collection: MaleSigh
-    Crying:
-      collection: MaleCry
-    Whistle:
-      collection: Whistles
-    # ADT-Apathy Sounds. 
-    Scream-apathy:
-      collection: TajaranMaleScreams
-    Laugh-apathy:
-      collection: MaleLaugh 
-    Sigh-apathy:
-      collection: MaleSigh
-    Crying-apathy:
-      collection: MaleCry
-
-- type: emoteSounds
-  id: ADTFemaleTajaran
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      collection: TajaranFemaleScreams
-    Laugh:
-      collection: FemaleLaugh
-    Sneeze:
-      collection: FemaleSneezes
-    Cough:
-      collection: FemaleCoughs
-    Hiss:
-      collection: TajaranHisses
-    Meow:
-      collection: TajaranMeows
-    Mew:
-      collection: TajaranMews
-    Growl:
-      collection: TajaranGrowls
-    Purr:
-      collection: TajaranPurrs
-    MonkeyScreeches:
-      collection: MonkeyScreeches
-    RobotBeep:
-      collection: RobotBeeps
-    Yawn:
-      collection: FemaleYawn
-    Snore:
-      collection: Snores
-    Honk:
-      collection: CluwneHorn
-    Sigh:
-      collection: FemaleSigh
-    Crying:
-      collection: FemaleCry
-    Whistle:
-      collection: Whistles
-    # ADT-Apathy Sounds. 
-    Scream-apathy:
-      collection: TajaranFemaleScreams
-    Laugh-apathy:
-      collection: FemaleLaugh 
-    Sigh-apathy:
-      collection: FemaleSigh
-    Crying-apathy:
-      collection: FemaleCry
-
-- type: emoteSounds
-  id: UnisexNovakid
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      collection: NovakidScreams
-    Laugh:
-      collection: NovakidLaugh
-    Sneeze:
-      collection: MaleSneezes
-    Cough:
-      collection: MaleCoughs
-    CatMeow:
-      collection: CatMeows
-    CatHisses:
-      collection: CatHisses
-    MonkeyScreeches:
-      collection: MonkeyScreeches
-    RobotBeep:
-      collection: RobotBeeps
-    Yawn:
-      collection: MaleYawn
-    Snore:
-      collection: Snores
-    Honk:
-      collection: BikeHorn
-    Sigh:
-      collection: MaleSigh
-    Crying:
-      collection: MaleCry
-    Whistle:
-      collection: Whistles
-
-- type: emoteSounds
-  id: MaleNovakid
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      collection: NovakidScreams
-    Laugh:
-      collection: NovakidLaugh
-    Sneeze:
-      collection: MaleSneezes
-    Cough:
-      collection: MaleCoughs
-    CatMeow:
-      collection: CatMeows
-    CatHisses:
-      collection: CatHisses
-    MonkeyScreeches:
-      collection: MonkeyScreeches
-    RobotBeep:
-      collection: RobotBeeps
-    Yawn:
-      collection: MaleYawn
-    Snore:
-      collection: Snores
-    Honk:
-      collection: BikeHorn
-    Sigh:
-      collection: MaleSigh
-    Crying:
-      collection: MaleCry
-    Whistle:
-      collection: Whistles
-    # ADT-Apathy Sounds. 
-    Scream-apathy:
-      collection: NovakidScreams
-    Laugh-apathy:
-      collection: NovakidLaugh 
-    Sigh-apathy:
-      collection: MaleSigh
-    Crying-apathy:
-      collection: MaleCry
-
-- type: emoteSounds
-  id: FemaleNovakid
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      collection: NovakidScreams
-    Laugh:
-      collection: NovakidLaugh
-    Sneeze:
-      collection: FemaleSneezes
-    Cough:
-      collection: FemaleCoughs
-    CatMeow:
-      collection: CatMeows
-    CatHisses:
-      collection: CatHisses
-    MonkeyScreeches:
-      collection: MonkeyScreeches
-    RobotBeep:
-      collection: RobotBeeps
-    Yawn:
-      collection: FemaleYawn
-    Snore:
-      collection: Snores
-    Honk:
-      collection: CluwneHorn
-    Sigh:
-      collection: FemaleSigh
-    Crying:
-      collection: FemaleCry
-    Whistle:
-      collection: Whistles
-    # ADT-Apathy Sounds. 
-    Scream-apathy:
-      collection: NovakidScreams
-    Laugh-apathy:
-      collection: NovakidLaugh 
-    Sigh-apathy:
-      collection: FemaleSigh
-    Crying-apathy:
-      collection: FemaleCry
-
-- type: emoteSounds
-  id: UnisexIPC
-  sounds:
-    RobotBeep:
-      collection: RobotBeeps
-    SynthYes:
-      path: /Audio/ADT/IPC/synth_yes.ogg
-    SynthNo:
-      path: /Audio/ADT/IPC/synth_no.ogg
-    Ping:
-      path: /Audio/ADT/IPC/ping.ogg
-    Buzz:
-      path: /Audio/ADT/IPC/buzz-sigh.ogg
-    SighBuzz:
-      path: /Audio/ADT/IPC/buzz-two.ogg
-    Sigh:
-      path: /Audio/ADT/IPC/buzz-two.ogg
-    Scream:
-      path: /Audio/ADT/IPC/synth_scream.ogg
-  params:
-    variation: 0.125
-
-
-- type: emoteSounds
-  id: MaleFelinid
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      collection: FelinidScreams
-    Laugh:
-      collection: MaleLaugh
-    Hiss:
-      collection: FelinidHisses
-    Meow:
-      collection: FelinidMeows
-    Mew:
-      collection: FelinidMews
-    Growl:
-      collection: FelinidGrowls
-    Purr:
-      collection: FelinidPurrs
-    Sneeze:
-      collection: MaleSneezes
-    Cough:
-      collection: MaleCoughs
-    MonkeyScreeches:
-      collection: MonkeyScreeches
-    RobotBeep:
-      collection: RobotBeeps
-    Yawn:
-      collection: MaleYawn
-    Snore:
-      collection: Snores
-    Honk:
-      collection: BikeHorn
-    Sigh:
-      collection: MaleSigh
-    Crying:
-      collection: MaleCry
-    Whistle:
-      collection: Whistles
-    # ADT-Apathy Sounds. 
-    Scream-apathy:
-      collection: FelinidScreams
-    Laugh-apathy:
-      collection: MaleLaugh 
-    Sigh-apathy:
-      collection: MaleSigh
-    Crying-apathy:
-      collection: MaleCry
-
-- type: emoteSounds
-  id: FemaleFelinid
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      collection: FelinidScreams
-    Laugh:
-      collection: FemaleLaugh
-    Sneeze:
-      collection: FemaleSneezes
-    Cough:
-      collection: FemaleCoughs
-    Hiss:
-      collection: FelinidHisses
-    Meow:
-      collection: FelinidMeows
-    Mew:
-      collection: FelinidMews
-    Growl:
-      collection: FelinidGrowls
-    Purr:
-      collection: FelinidPurrs
-    MonkeyScreeches:
-      collection: MonkeyScreeches
-    RobotBeep:
-      collection: RobotBeeps
-    Yawn:
-      collection: FemaleYawn
-    Snore:
-      collection: Snores
-    Honk:
-      collection: CluwneHorn
-    Sigh:
-      collection: FemaleSigh
-    Crying:
-      collection: FemaleCry
-    Whistle:
-      collection: Whistles
-    # ADT-Apathy Sounds. 
-    Scream-apathy:
-      collection: FelinidScreams
-    Laugh-apathy:
-      collection: FemaleLaugh 
-    Sigh-apathy:
-      collection: FemaleSigh
-    Crying-apathy:
-      collection: FemaleCry
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Voice/speech_emotes.yml b/Resources/Prototypes/ADT/Voice/speech_emotes.yml
index b6063814bac..0b4c52ffa6d 100644
--- a/Resources/Prototypes/ADT/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/ADT/Voice/speech_emotes.yml
@@ -33,182 +33,4 @@
   category: Vocal
   chatMessages: [фальшиво плачет] 
   chatTriggers:
-    - фальшиво плачет
-
-# ## vocal emotes
-# - type: emote
-#   id: ADTHiss
-#   category: Vocal
-#   chatMessages: [шипит]
-#   chatTriggers:
-#     - шипит
-#     - шипит.
-#     - шипит!
-
-# - type: emote
-#   id: ADTMeow
-#   category: Vocal
-#   chatMessages: [мяукает]
-#   chatTriggers:
-#     - мяу
-#     - мяукнул
-#     - мяукнул.
-#     - мяукнул!
-#     - мяукнула
-#     - мяукнула.
-#     - мяукнула!
-#     - мяукает
-#     - мяукает.
-#     - мяукает!
-
-# - type: emote
-#   id: ADTMew
-#   category: Vocal
-#   chatMessages: [мякает]
-#   chatTriggers:
-#     - мя
-#     - мякает
-#     - мякает.
-#     - мякает!
-#     - ня
-#     - мякает?
-#     - mews.
-#     - mews!
-#     - mewing
-#     - mewed
-
-# - type: emote
-#   id: ADTGrowl
-#   category: Vocal
-#   chatMessages: [growls]
-#   chatTriggers:
-#     - рычит
-#     - ррр
-#     - growl
-#     - growls
-#     - growls.
-#     - growls!
-#     - growling
-#     - growled
-
-# - type: emote
-#   id: ADTPurr
-#   category: Vocal
-#   chatMessages: [мурчит]
-#   chatTriggers:
-#     - мур
-#     - мурчит
-#     - мурчит.
-#     - мурчит!
-
-- type: emote
-  id: SynthYes
-  category: Vocal
-  chatMessages: [утвердительно пищит]
-  chatTriggers:
-    - утвердительно пищит
-    - утвердительно пищит.
-    - соглашается
-    - соглашается.
-    - согласен
-    - согласен.
-    - подтверждает
-    - подтверждает.
-
-- type: emote
-  id: SynthNo
-  category: Vocal
-  chatMessages: [отрицательно пищит]
-  chatTriggers:
-    - отрицательно пищит
-    - отрицательно пищит.
-    - отрицает
-    - отрицает.
-    - не соглашается
-    - не соглашается.
-    - не согласен
-    - не согласен.
-
-- type: emote
-  id: Ping
-  category: Vocal
-  chatMessages: [звенит]
-  chatTriggers:
-    - звенит
-    - звенит.
-
-- type: emote
-  id: SighBuzz
-  category: Vocal
-  chatMessages: [раздражённо жужжит]
-  chatTriggers:
-    - раздражённо жужжит
-    - раздражённо жужжит.
-    - раздраженно жужжит
-    - раздраженно жужжит.
-
-## vocal emotes
-- type: emote
-  id: Hiss
-  category: Vocal
-  chatMessages: [шипит]
-  chatTriggers:
-    - шипит
-    - шипит.
-    - шипит!
-
-- type: emote
-  id: Meow
-  category: Vocal
-  chatMessages: [мяукает]
-  chatTriggers:
-    - мяу
-    - мяукнул
-    - мяукнул.
-    - мяукнул!
-    - мяукнула
-    - мяукнула.
-    - мяукнула!
-    - мяукает
-    - мяукает.
-    - мяукает!
-
-- type: emote
-  id: Mew
-  category: Vocal
-  chatMessages: [мякает]
-  chatTriggers:
-    - мя
-    - мякает
-    - мякает.
-    - мякает!
-    - ня
-    - мякает?
-    - mews.
-    - mews!
-    - mewing
-    - mewed
-
-- type: emote
-  id: Growl
-  category: Vocal
-  chatMessages: [growls]
-  chatTriggers:
-    - рычит
-    - ррр
-    - growl
-    - growls
-    - growls.
-    - growls!
-    - growling
-    - growled
-
-- type: emote
-  id: Purr
-  category: Vocal
-  chatMessages: [мурчит]
-  chatTriggers:
-    - мур
-    - мурчит
-    - мурчит.
-    - мурчит!
+    - фальшиво плачет
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Body/Organs/Vulpkanin.yml b/Resources/Prototypes/ADT/Vulpkanin/Body/Organs/Vulpkanin.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Organs/Vulpkanin.yml
rename to Resources/Prototypes/ADT/Vulpkanin/Body/Organs/Vulpkanin.yml
diff --git a/Resources/Prototypes/ADT/Body/Parts/Vulpkanin.yml b/Resources/Prototypes/ADT/Vulpkanin/Body/Parts/Vulpkanin.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Parts/Vulpkanin.yml
rename to Resources/Prototypes/ADT/Vulpkanin/Body/Parts/Vulpkanin.yml
diff --git a/Resources/Prototypes/ADT/Body/Prototypes/Vulpkanin.yml b/Resources/Prototypes/ADT/Vulpkanin/Body/Prototypes/Vulpkanin.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Body/Prototypes/Vulpkanin.yml
rename to Resources/Prototypes/ADT/Vulpkanin/Body/Prototypes/Vulpkanin.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Vulpkanin.yml b/Resources/Prototypes/ADT/Vulpkanin/Entities/Mobs/Customization/Markings/Vulpkanin.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Vulpkanin.yml
rename to Resources/Prototypes/ADT/Vulpkanin/Entities/Mobs/Customization/Markings/Vulpkanin.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Vulpkanin_hair.yml b/Resources/Prototypes/ADT/Vulpkanin/Entities/Mobs/Customization/Markings/Vulpkanin_hair.yml
similarity index 96%
rename from Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Vulpkanin_hair.yml
rename to Resources/Prototypes/ADT/Vulpkanin/Entities/Mobs/Customization/Markings/Vulpkanin_hair.yml
index d1e0032c810..6027f7f48da 100644
--- a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Vulpkanin_hair.yml
+++ b/Resources/Prototypes/ADT/Vulpkanin/Entities/Mobs/Customization/Markings/Vulpkanin_hair.yml
@@ -1,1568 +1,1568 @@
-- type: marking
-  id: ADTVulpkaninAbhara
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: abhara
-
-- type: marking
-  id: ADTVulpkaninAnite
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: anite
-
-- type: marking
-  id: ADTVulpkaninApollo
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: apollo
-
-- type: marking
-  id: ADTVulpkaninBelle
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: belle
-
-- type: marking
-  id: ADTVulpkaninBraided
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: braided
-
-- type: marking
-  id: ADTVulpkaninBun
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: bun
-
-- type: marking
-  id: ADTVulpkaninCurl
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: curl
-
-- type: marking
-  id: ADTVulpkaninHair_sponsor
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  #sponsorOnly: true
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: hair_sponsor
-
-- type: marking
-  id: ADTVulpkaninHawk
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: hawk
-
-- type: marking
-  id: ADTVulpkaninJagged_sponsor_hair
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  #sponsorOnly: true
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: jagged_sponsor_hair
-
-- type: marking
-  id: ADTVulpkaninKajam1
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: kajam1
-
-- type: marking
-  id: ADTVulpkaninKajam2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: kajam2
-
-- type: marking
-  id: ADTVulpkaninKeid
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: keid
-
-- type: marking
-  id: ADTVulpkaninKleeia
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: kleeia
-
-- type: marking
-  id: ADTVulpkaninMizar
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: mizar
-
-- type: marking
-  id: ADTVulpkaninRaine
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: raine
-
-- type: marking
-  id: ADTVulpkaninRough
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: rough
-
-- type: marking
-  id: ADTVulpkaninShort
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: short
-
-- type: marking
-  id: ADTVulpkaninShort2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: short2
-
-- type: marking
-  id: ADTVulpkaninSpike
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: spike
-
-- type: marking
-  id: ADTVulpkaninYkiteru_sponsor_hair
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  #sponsorOnly: true
-  sprites:
-    - sprite: Mobs/Customization/vulpkanin_hair.rsi
-      state: ykiteru_sponsor_hair
-
-- type: marking
-  id: ADTVulpkaninAfro
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: afro
-- type: marking
-  id: ADTVulpkaninAfro2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: afro2
-- type: marking
-  id: ADTVulpkaninBigafro
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: bigafro
-- type: marking
-  id: ADTVulpkaninAntenna
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: antenna
-- type: marking
-  id: ADTVulpkaninBalding
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: e
-- type: marking
-  id: ADTVulpkaninBedhead
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: bedhead
-- type: marking
-  id: ADTVulpkaninBedheadv2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: bedheadv2
-- type: marking
-  id: ADTVulpkaninBedheadv3
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: bedheadv3
-- type: marking
-  id: ADTVulpkaninLongBedhead
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: long_bedhead
-- type: marking
-  id: ADTVulpkaninFloorlengthBedhead
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: floorlength_bedhead
-- type: marking
-  id: ADTVulpkaninBeehive
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: beehive
-- type: marking
-  id: ADTVulpkaninBeehivev2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: beehivev2
-- type: marking
-  id: ADTVulpkaninBob
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: bob
-- type: marking
-  id: ADTVulpkaninBob2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: bob2
-- type: marking
-  id: ADTVulpkaninBobcut
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: bobcut
-- type: marking
-  id: ADTVulpkaninBob4
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: bob4
-- type: marking
-  id: ADTVulpkaninBobcurl
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: bobcurl
-- type: marking
-  id: ADTVulpkaninBoddicker
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: boddicker
-- type: marking
-  id: ADTVulpkaninBowlcut
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: bowlcut
-- type: marking
-  id: ADTVulpkaninBowlcut2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: bowlcut2
-- type: marking
-  id: ADTVulpkaninBraid
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: braid
-- type: marking
-  id: ADTVulpkaninBraidfront
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: braidfront
-- type: marking
-  id: ADTVulpkaninBraid2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: braid2
-- type: marking
-  id: ADTVulpkaninHbraid
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: hbraid
-- type: marking
-  id: ADTVulpkaninShortbraid
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: shortbraid
-- type: marking
-  id: ADTVulpkaninBraidtail
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: braidtail
-- type: marking
-  id: ADTVulpkaninBunhead2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: bunhead2
-- type: marking
-  id: ADTVulpkaninBun3
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: bun3
-- type: marking
-  id: ADTVulpkaninLargebun
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: largebun
-- type: marking
-  id: ADTVulpkaninManbun
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: manbun
-- type: marking
-  id: ADTVulpkaninTightbun
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: tightbun
-- type: marking
-  id: ADTVulpkaninBusiness
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: business
-- type: marking
-  id: ADTVulpkaninBusiness2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: business2
-- type: marking
-  id: ADTVulpkaninBusiness3
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: business3
-- type: marking
-  id: ADTVulpkaninBusiness4
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: business4
-- type: marking
-  id: ADTVulpkaninBuzzcut
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: buzzcut
-- type: marking
-  id: ADTVulpkaninCia
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: cia
-- type: marking
-  id: ADTVulpkaninCoffeehouse
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: coffeehouse
-- type: marking
-  id: ADTVulpkaninCombover
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: combover
-- type: marking
-  id: ADTVulpkaninCornrows
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: cornrows
-- type: marking
-  id: ADTVulpkaninCornrows2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: cornrows2
-- type: marking
-  id: ADTVulpkaninCornrowbun
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: cornrowbun
-- type: marking
-  id: ADTVulpkaninCornrowbraid
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: cornrowbraid
-- type: marking
-  id: ADTVulpkaninCornrowtail
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: cornrowtail
-- type: marking
-  id: ADTVulpkaninCrewcut
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: crewcut
-- type: marking
-  id: ADTVulpkaninCurls
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: curls
-- type: marking
-  id: ADTVulpkaninC
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: c
-- type: marking
-  id: ADTVulpkaninDandypompadour
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: dandypompadour
-- type: marking
-  id: ADTVulpkaninDevilock
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: devilock
-- type: marking
-  id: ADTVulpkaninDoublebun
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: doublebun
-- type: marking
-  id: ADTVulpkaninDreads
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: dreads
-- type: marking
-  id: ADTVulpkaninDrillruru
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: drillruru
-- type: marking
-  id: ADTVulpkaninDrillhairextended
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: drillhairextended
-- type: marking
-  id: ADTVulpkaninEmo
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: emo
-- type: marking
-  id: ADTVulpkaninEmofringe
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: emofringe
-- type: marking
-  id: ADTVulpkaninNofade
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: nofade
-- type: marking
-  id: ADTVulpkaninHighfade
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: highfade
-- type: marking
-  id: ADTVulpkaninMedfade
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: medfade
-- type: marking
-  id: ADTVulpkaninLowfade
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: lowfade
-- type: marking
-  id: ADTVulpkaninBaldfade
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: baldfade
-- type: marking
-  id: ADTVulpkaninFeather
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: feather
-- type: marking
-  id: ADTVulpkaninFather
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: father
-- type: marking
-  id: ADTVulpkaninSargeant
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: sargeant
-- type: marking
-  id: ADTVulpkaninFlair
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: flair
-- type: marking
-  id: ADTVulpkaninBigflattop
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: bigflattop
-- type: marking
-  id: ADTVulpkaninFlow
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: f
-- type: marking
-  id: ADTVulpkaninGelled
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: gelled
-- type: marking
-  id: ADTVulpkaninGentle
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: gentle
-- type: marking
-  id: ADTVulpkaninHalfbang
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: halfbang
-- type: marking
-  id: ADTVulpkaninHalfbang2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: halfbang2
-- type: marking
-  id: ADTVulpkaninHalfshaved
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: halfshaved
-- type: marking
-  id: ADTVulpkaninHedgehog
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: hedgehog
-- type: marking
-  id: ADTVulpkaninHimecut
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: himecut
-- type: marking
-  id: ADTVulpkaninHimecut2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: himecut2
-- type: marking
-  id: ADTVulpkaninShorthime
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: shorthime
-- type: marking
-  id: ADTVulpkaninHimeup
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: himeup
-- type: marking
-  id: ADTVulpkaninHitop
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: hitop
-- type: marking
-  id: ADTVulpkaninJade
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: jade
-- type: marking
-  id: ADTVulpkaninJensen
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: jensen
-- type: marking
-  id: ADTVulpkaninJoestar
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: joestar
-- type: marking
-  id: ADTVulpkaninKeanu
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: keanu
-- type: marking
-  id: ADTVulpkaninKusanagi
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: kusanagi
-- type: marking
-  id: ADTVulpkaninLong
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: long
-- type: marking
-  id: ADTVulpkaninLong2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: long2
-- type: marking
-  id: ADTVulpkaninLong3
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: long3
-- type: marking
-  id: ADTVulpkaninLongovereye
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: longovereye
-- type: marking
-  id: ADTVulpkaninLbangs
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: lbangs
-- type: marking
-  id: ADTVulpkaninLongemo
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: longemo
-- type: marking
-  id: ADTVulpkaninLongfringe
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: longfringe
-- type: marking
-  id: ADTVulpkaninLongsidepart
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: longsidepart
-- type: marking
-  id: ADTVulpkaninMegaeyebrows
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: megaeyebrows
-- type: marking
-  id: ADTVulpkaninMessy
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: messy
-- type: marking
-  id: ADTVulpkaninModern
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: modern
-- type: marking
-  id: ADTVulpkaninMohawk
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: d
-- type: marking
-  id: ADTVulpkaninNitori
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: nitori
-- type: marking
-  id: ADTVulpkaninReversemohawk
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: reversemohawk
-- type: marking
-  id: ADTVulpkaninUnshavenMohawk
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: unshaven_mohawk
-- type: marking
-  id: ADTVulpkaninMulder
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: mulder
-- type: marking
-  id: ADTVulpkaninOdango
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: odango
-- type: marking
-  id: ADTVulpkaninOmbre
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: ombre
-- type: marking
-  id: ADTVulpkaninOneshoulder
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: oneshoulder
-- type: marking
-  id: ADTVulpkaninShortovereye
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: shortovereye
-- type: marking
-  id: ADTVulpkaninOxton
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: oxton
-- type: marking
-  id: ADTVulpkaninParted
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: parted
-- type: marking
-  id: ADTVulpkaninPart
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: part
-- type: marking
-  id: ADTVulpkaninKagami
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: kagami
-- type: marking
-  id: ADTVulpkaninPigtails
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: pigtails
-- type: marking
-  id: ADTVulpkaninPigtails2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: pigtails2
-- type: marking
-  id: ADTVulpkaninPixie
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: pixie
-- type: marking
-  id: ADTVulpkaninPompadour
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: pompadour
-- type: marking
-  id: ADTVulpkaninBigpompadour
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: bigpompadour
-- type: marking
-  id: ADTVulpkaninPonytail
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: ponytail
-- type: marking
-  id: ADTVulpkaninPonytail2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: ponytail2
-- type: marking
-  id: ADTVulpkaninPonytail3
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: ponytail3
-- type: marking
-  id: ADTVulpkaninPonytail4
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: ponytail4
-- type: marking
-  id: ADTVulpkaninPonytail5
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: ponytail5
-- type: marking
-  id: ADTVulpkaninPonytail6
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: ponytail6
-- type: marking
-  id: ADTVulpkaninPonytail7
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: ponytail7
-- type: marking
-  id: ADTVulpkaninHighponytail
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: highponytail
-- type: marking
-  id: ADTVulpkaninStail
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: stail
-- type: marking
-  id: ADTVulpkaninLongstraightponytail
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: longstraightponytail
-- type: marking
-  id: ADTVulpkaninCountry
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: country
-- type: marking
-  id: ADTVulpkaninFringetail
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: fringetail
-- type: marking
-  id: ADTVulpkaninSidetail
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: sidetail
-- type: marking
-  id: ADTVulpkaninSidetail2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: sidetail2
-- type: marking
-  id: ADTVulpkaninSidetail3
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: sidetail3
-- type: marking
-  id: ADTVulpkaninSidetail4
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: sidetail4
-- type: marking
-  id: ADTVulpkaninSpikyponytail
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: spikyponytail
-- type: marking
-  id: ADTVulpkaninPoofy
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: poofy
-- type: marking
-  id: ADTVulpkaninQuiff
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: quiff
-- type: marking
-  id: ADTVulpkaninRonin
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: ronin
-- type: marking
-  id: ADTVulpkaninShaved
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: shaved
-- type: marking
-  id: ADTVulpkaninShavedpart
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: shavedpart
-- type: marking
-  id: ADTVulpkaninShortbangs
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: shortbangs
-- type: marking
-  id: ADTVulpkaninA
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: a
-- type: marking
-  id: ADTVulpkaninShorthair2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: shorthair2
-- type: marking
-  id: ADTVulpkaninShorthair3
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: shorthair3
-- type: marking
-  id: ADTVulpkaninD
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: d
-- type: marking
-  id: ADTVulpkaninE
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: e
-- type: marking
-  id: ADTVulpkaninF
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: f
-- type: marking
-  id: ADTVulpkaninShorthairg
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: shorthairg
-- type: marking
-  id: ADTVulpkanin80s
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: 80s
-- type: marking
-  id: ADTVulpkaninRosa
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: rosa
-- type: marking
-  id: ADTVulpkaninB
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: b
-- type: marking
-  id: ADTVulpkaninSidecut
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: sidecut
-- type: marking
-  id: ADTVulpkaninSkinhead
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: skinhead
-- type: marking
-  id: ADTVulpkaninProtagonist
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: protagonist
-- type: marking
-  id: ADTVulpkaninSpikey
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: spikey
-- type: marking
-  id: ADTVulpkaninSpiky
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: spiky
-- type: marking
-  id: ADTVulpkaninSpiky2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: spiky2
-- type: marking
-  id: ADTVulpkaninSwept
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: swept
-- type: marking
-  id: ADTVulpkaninSwept2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: swept2
-- type: marking
-  id: ADTVulpkaninThinning
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: thinning
-- type: marking
-  id: ADTVulpkaninThinningfront
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: thinningfront
-- type: marking
-  id: ADTVulpkaninThinningrear
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: thinningrear
-- type: marking
-  id: ADTVulpkaninTopknot
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: topknot
-- type: marking
-  id: ADTVulpkaninTressshoulder
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: tressshoulder
-- type: marking
-  id: ADTVulpkaninTrimmed
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: trimmed
-- type: marking
-  id: ADTVulpkaninTrimflat
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: trimflat
-- type: marking
-  id: ADTVulpkaninTwintail
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: twintail
-- type: marking
-  id: ADTVulpkaninUndercut
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: undercut
-- type: marking
-  id: ADTVulpkaninUndercutleft
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: undercutleft
-- type: marking
-  id: ADTVulpkaninUndercutright
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: undercutright
-- type: marking
-  id: ADTVulpkaninUnkept
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: unkept
-- type: marking
-  id: ADTVulpkaninUpdo
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: updo
-- type: marking
-  id: ADTVulpkaninVlong
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: vlong
-- type: marking
-  id: ADTVulpkaninLongest
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: longest
-- type: marking
-  id: ADTVulpkaninLongest2
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: longest2
-- type: marking
-  id: ADTVulpkaninVeryshortovereyealternate
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: veryshortovereyealternate
-- type: marking
-  id: ADTVulpkaninVlongfringe
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: vlongfringe
-- type: marking
-  id: ADTVulpkaninVolaju
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: volaju
-- type: marking
-  id: ADTVulpkaninWisp
-  bodyPart: Hair
-  markingCategory: Hair
-  speciesRestriction: [VulpkaninSpecies]
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: wisp
+- type: marking
+  id: ADTVulpkaninAbhara
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: abhara
+
+- type: marking
+  id: ADTVulpkaninAnite
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: anite
+
+- type: marking
+  id: ADTVulpkaninApollo
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: apollo
+
+- type: marking
+  id: ADTVulpkaninBelle
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: belle
+
+- type: marking
+  id: ADTVulpkaninBraided
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: braided
+
+- type: marking
+  id: ADTVulpkaninBun
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: bun
+
+- type: marking
+  id: ADTVulpkaninCurl
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: curl
+
+- type: marking
+  id: ADTVulpkaninHair_sponsor
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  #sponsorOnly: true
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: hair_sponsor
+
+- type: marking
+  id: ADTVulpkaninHawk
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: hawk
+
+- type: marking
+  id: ADTVulpkaninJagged_sponsor_hair
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  #sponsorOnly: true
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: jagged_sponsor_hair
+
+- type: marking
+  id: ADTVulpkaninKajam1
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: kajam1
+
+- type: marking
+  id: ADTVulpkaninKajam2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: kajam2
+
+- type: marking
+  id: ADTVulpkaninKeid
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: keid
+
+- type: marking
+  id: ADTVulpkaninKleeia
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: kleeia
+
+- type: marking
+  id: ADTVulpkaninMizar
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: mizar
+
+- type: marking
+  id: ADTVulpkaninRaine
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: raine
+
+- type: marking
+  id: ADTVulpkaninRough
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: rough
+
+- type: marking
+  id: ADTVulpkaninShort
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: short
+
+- type: marking
+  id: ADTVulpkaninShort2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: short2
+
+- type: marking
+  id: ADTVulpkaninSpike
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: spike
+
+- type: marking
+  id: ADTVulpkaninYkiteru_sponsor_hair
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  #sponsorOnly: true
+  sprites:
+    - sprite: Mobs/Customization/vulpkanin_hair.rsi
+      state: ykiteru_sponsor_hair
+
+- type: marking
+  id: ADTVulpkaninAfro
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: afro
+- type: marking
+  id: ADTVulpkaninAfro2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: afro2
+- type: marking
+  id: ADTVulpkaninBigafro
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bigafro
+- type: marking
+  id: ADTVulpkaninAntenna
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: antenna
+- type: marking
+  id: ADTVulpkaninBalding
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: e
+- type: marking
+  id: ADTVulpkaninBedhead
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bedhead
+- type: marking
+  id: ADTVulpkaninBedheadv2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bedheadv2
+- type: marking
+  id: ADTVulpkaninBedheadv3
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bedheadv3
+- type: marking
+  id: ADTVulpkaninLongBedhead
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: long_bedhead
+- type: marking
+  id: ADTVulpkaninFloorlengthBedhead
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: floorlength_bedhead
+- type: marking
+  id: ADTVulpkaninBeehive
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: beehive
+- type: marking
+  id: ADTVulpkaninBeehivev2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: beehivev2
+- type: marking
+  id: ADTVulpkaninBob
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bob
+- type: marking
+  id: ADTVulpkaninBob2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bob2
+- type: marking
+  id: ADTVulpkaninBobcut
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bobcut
+- type: marking
+  id: ADTVulpkaninBob4
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bob4
+- type: marking
+  id: ADTVulpkaninBobcurl
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bobcurl
+- type: marking
+  id: ADTVulpkaninBoddicker
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: boddicker
+- type: marking
+  id: ADTVulpkaninBowlcut
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bowlcut
+- type: marking
+  id: ADTVulpkaninBowlcut2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bowlcut2
+- type: marking
+  id: ADTVulpkaninBraid
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: braid
+- type: marking
+  id: ADTVulpkaninBraidfront
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: braidfront
+- type: marking
+  id: ADTVulpkaninBraid2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: braid2
+- type: marking
+  id: ADTVulpkaninHbraid
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: hbraid
+- type: marking
+  id: ADTVulpkaninShortbraid
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: shortbraid
+- type: marking
+  id: ADTVulpkaninBraidtail
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: braidtail
+- type: marking
+  id: ADTVulpkaninBunhead2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bunhead2
+- type: marking
+  id: ADTVulpkaninBun3
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bun3
+- type: marking
+  id: ADTVulpkaninLargebun
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: largebun
+- type: marking
+  id: ADTVulpkaninManbun
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: manbun
+- type: marking
+  id: ADTVulpkaninTightbun
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: tightbun
+- type: marking
+  id: ADTVulpkaninBusiness
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: business
+- type: marking
+  id: ADTVulpkaninBusiness2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: business2
+- type: marking
+  id: ADTVulpkaninBusiness3
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: business3
+- type: marking
+  id: ADTVulpkaninBusiness4
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: business4
+- type: marking
+  id: ADTVulpkaninBuzzcut
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: buzzcut
+- type: marking
+  id: ADTVulpkaninCia
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: cia
+- type: marking
+  id: ADTVulpkaninCoffeehouse
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: coffeehouse
+- type: marking
+  id: ADTVulpkaninCombover
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: combover
+- type: marking
+  id: ADTVulpkaninCornrows
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: cornrows
+- type: marking
+  id: ADTVulpkaninCornrows2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: cornrows2
+- type: marking
+  id: ADTVulpkaninCornrowbun
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: cornrowbun
+- type: marking
+  id: ADTVulpkaninCornrowbraid
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: cornrowbraid
+- type: marking
+  id: ADTVulpkaninCornrowtail
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: cornrowtail
+- type: marking
+  id: ADTVulpkaninCrewcut
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: crewcut
+- type: marking
+  id: ADTVulpkaninCurls
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: curls
+- type: marking
+  id: ADTVulpkaninC
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: c
+- type: marking
+  id: ADTVulpkaninDandypompadour
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: dandypompadour
+- type: marking
+  id: ADTVulpkaninDevilock
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: devilock
+- type: marking
+  id: ADTVulpkaninDoublebun
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: doublebun
+- type: marking
+  id: ADTVulpkaninDreads
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: dreads
+- type: marking
+  id: ADTVulpkaninDrillruru
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: drillruru
+- type: marking
+  id: ADTVulpkaninDrillhairextended
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: drillhairextended
+- type: marking
+  id: ADTVulpkaninEmo
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: emo
+- type: marking
+  id: ADTVulpkaninEmofringe
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: emofringe
+- type: marking
+  id: ADTVulpkaninNofade
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: nofade
+- type: marking
+  id: ADTVulpkaninHighfade
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: highfade
+- type: marking
+  id: ADTVulpkaninMedfade
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: medfade
+- type: marking
+  id: ADTVulpkaninLowfade
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: lowfade
+- type: marking
+  id: ADTVulpkaninBaldfade
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: baldfade
+- type: marking
+  id: ADTVulpkaninFeather
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: feather
+- type: marking
+  id: ADTVulpkaninFather
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: father
+- type: marking
+  id: ADTVulpkaninSargeant
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: sargeant
+- type: marking
+  id: ADTVulpkaninFlair
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: flair
+- type: marking
+  id: ADTVulpkaninBigflattop
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bigflattop
+- type: marking
+  id: ADTVulpkaninFlow
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: f
+- type: marking
+  id: ADTVulpkaninGelled
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: gelled
+- type: marking
+  id: ADTVulpkaninGentle
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: gentle
+- type: marking
+  id: ADTVulpkaninHalfbang
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: halfbang
+- type: marking
+  id: ADTVulpkaninHalfbang2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: halfbang2
+- type: marking
+  id: ADTVulpkaninHalfshaved
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: halfshaved
+- type: marking
+  id: ADTVulpkaninHedgehog
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: hedgehog
+- type: marking
+  id: ADTVulpkaninHimecut
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: himecut
+- type: marking
+  id: ADTVulpkaninHimecut2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: himecut2
+- type: marking
+  id: ADTVulpkaninShorthime
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: shorthime
+- type: marking
+  id: ADTVulpkaninHimeup
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: himeup
+- type: marking
+  id: ADTVulpkaninHitop
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: hitop
+- type: marking
+  id: ADTVulpkaninJade
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: jade
+- type: marking
+  id: ADTVulpkaninJensen
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: jensen
+- type: marking
+  id: ADTVulpkaninJoestar
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: joestar
+- type: marking
+  id: ADTVulpkaninKeanu
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: keanu
+- type: marking
+  id: ADTVulpkaninKusanagi
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: kusanagi
+- type: marking
+  id: ADTVulpkaninLong
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: long
+- type: marking
+  id: ADTVulpkaninLong2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: long2
+- type: marking
+  id: ADTVulpkaninLong3
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: long3
+- type: marking
+  id: ADTVulpkaninLongovereye
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: longovereye
+- type: marking
+  id: ADTVulpkaninLbangs
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: lbangs
+- type: marking
+  id: ADTVulpkaninLongemo
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: longemo
+- type: marking
+  id: ADTVulpkaninLongfringe
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: longfringe
+- type: marking
+  id: ADTVulpkaninLongsidepart
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: longsidepart
+- type: marking
+  id: ADTVulpkaninMegaeyebrows
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: megaeyebrows
+- type: marking
+  id: ADTVulpkaninMessy
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: messy
+- type: marking
+  id: ADTVulpkaninModern
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: modern
+- type: marking
+  id: ADTVulpkaninMohawk
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: d
+- type: marking
+  id: ADTVulpkaninNitori
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: nitori
+- type: marking
+  id: ADTVulpkaninReversemohawk
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: reversemohawk
+- type: marking
+  id: ADTVulpkaninUnshavenMohawk
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: unshaven_mohawk
+- type: marking
+  id: ADTVulpkaninMulder
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: mulder
+- type: marking
+  id: ADTVulpkaninOdango
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: odango
+- type: marking
+  id: ADTVulpkaninOmbre
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: ombre
+- type: marking
+  id: ADTVulpkaninOneshoulder
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: oneshoulder
+- type: marking
+  id: ADTVulpkaninShortovereye
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: shortovereye
+- type: marking
+  id: ADTVulpkaninOxton
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: oxton
+- type: marking
+  id: ADTVulpkaninParted
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: parted
+- type: marking
+  id: ADTVulpkaninPart
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: part
+- type: marking
+  id: ADTVulpkaninKagami
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: kagami
+- type: marking
+  id: ADTVulpkaninPigtails
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: pigtails
+- type: marking
+  id: ADTVulpkaninPigtails2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: pigtails2
+- type: marking
+  id: ADTVulpkaninPixie
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: pixie
+- type: marking
+  id: ADTVulpkaninPompadour
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: pompadour
+- type: marking
+  id: ADTVulpkaninBigpompadour
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bigpompadour
+- type: marking
+  id: ADTVulpkaninPonytail
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: ponytail
+- type: marking
+  id: ADTVulpkaninPonytail2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: ponytail2
+- type: marking
+  id: ADTVulpkaninPonytail3
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: ponytail3
+- type: marking
+  id: ADTVulpkaninPonytail4
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: ponytail4
+- type: marking
+  id: ADTVulpkaninPonytail5
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: ponytail5
+- type: marking
+  id: ADTVulpkaninPonytail6
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: ponytail6
+- type: marking
+  id: ADTVulpkaninPonytail7
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: ponytail7
+- type: marking
+  id: ADTVulpkaninHighponytail
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: highponytail
+- type: marking
+  id: ADTVulpkaninStail
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: stail
+- type: marking
+  id: ADTVulpkaninLongstraightponytail
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: longstraightponytail
+- type: marking
+  id: ADTVulpkaninCountry
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: country
+- type: marking
+  id: ADTVulpkaninFringetail
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: fringetail
+- type: marking
+  id: ADTVulpkaninSidetail
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: sidetail
+- type: marking
+  id: ADTVulpkaninSidetail2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: sidetail2
+- type: marking
+  id: ADTVulpkaninSidetail3
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: sidetail3
+- type: marking
+  id: ADTVulpkaninSidetail4
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: sidetail4
+- type: marking
+  id: ADTVulpkaninSpikyponytail
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: spikyponytail
+- type: marking
+  id: ADTVulpkaninPoofy
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: poofy
+- type: marking
+  id: ADTVulpkaninQuiff
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: quiff
+- type: marking
+  id: ADTVulpkaninRonin
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: ronin
+- type: marking
+  id: ADTVulpkaninShaved
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: shaved
+- type: marking
+  id: ADTVulpkaninShavedpart
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: shavedpart
+- type: marking
+  id: ADTVulpkaninShortbangs
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: shortbangs
+- type: marking
+  id: ADTVulpkaninA
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: a
+- type: marking
+  id: ADTVulpkaninShorthair2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: shorthair2
+- type: marking
+  id: ADTVulpkaninShorthair3
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: shorthair3
+- type: marking
+  id: ADTVulpkaninD
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: d
+- type: marking
+  id: ADTVulpkaninE
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: e
+- type: marking
+  id: ADTVulpkaninF
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: f
+- type: marking
+  id: ADTVulpkaninShorthairg
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: shorthairg
+- type: marking
+  id: ADTVulpkanin80s
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: 80s
+- type: marking
+  id: ADTVulpkaninRosa
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: rosa
+- type: marking
+  id: ADTVulpkaninB
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: b
+- type: marking
+  id: ADTVulpkaninSidecut
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: sidecut
+- type: marking
+  id: ADTVulpkaninSkinhead
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: skinhead
+- type: marking
+  id: ADTVulpkaninProtagonist
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: protagonist
+- type: marking
+  id: ADTVulpkaninSpikey
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: spikey
+- type: marking
+  id: ADTVulpkaninSpiky
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: spiky
+- type: marking
+  id: ADTVulpkaninSpiky2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: spiky2
+- type: marking
+  id: ADTVulpkaninSwept
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: swept
+- type: marking
+  id: ADTVulpkaninSwept2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: swept2
+- type: marking
+  id: ADTVulpkaninThinning
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: thinning
+- type: marking
+  id: ADTVulpkaninThinningfront
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: thinningfront
+- type: marking
+  id: ADTVulpkaninThinningrear
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: thinningrear
+- type: marking
+  id: ADTVulpkaninTopknot
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: topknot
+- type: marking
+  id: ADTVulpkaninTressshoulder
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: tressshoulder
+- type: marking
+  id: ADTVulpkaninTrimmed
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: trimmed
+- type: marking
+  id: ADTVulpkaninTrimflat
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: trimflat
+- type: marking
+  id: ADTVulpkaninTwintail
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: twintail
+- type: marking
+  id: ADTVulpkaninUndercut
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: undercut
+- type: marking
+  id: ADTVulpkaninUndercutleft
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: undercutleft
+- type: marking
+  id: ADTVulpkaninUndercutright
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: undercutright
+- type: marking
+  id: ADTVulpkaninUnkept
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: unkept
+- type: marking
+  id: ADTVulpkaninUpdo
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: updo
+- type: marking
+  id: ADTVulpkaninVlong
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: vlong
+- type: marking
+  id: ADTVulpkaninLongest
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: longest
+- type: marking
+  id: ADTVulpkaninLongest2
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: longest2
+- type: marking
+  id: ADTVulpkaninVeryshortovereyealternate
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: veryshortovereyealternate
+- type: marking
+  id: ADTVulpkaninVlongfringe
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: vlongfringe
+- type: marking
+  id: ADTVulpkaninVolaju
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: volaju
+- type: marking
+  id: ADTVulpkaninWisp
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [VulpkaninSpecies]
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: wisp
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/Vulpkanin.yml b/Resources/Prototypes/ADT/Vulpkanin/Entities/Mobs/Player/Vulpkanin.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/player/Vulpkanin.yml
rename to Resources/Prototypes/ADT/Vulpkanin/Entities/Mobs/Player/Vulpkanin.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/Vulpkanin.yml b/Resources/Prototypes/ADT/Vulpkanin/Entities/Mobs/Species/Vulpkanin.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Mobs/Species/Vulpkanin.yml
rename to Resources/Prototypes/ADT/Vulpkanin/Entities/Mobs/Species/Vulpkanin.yml
diff --git a/Resources/Prototypes/ADT/Datasets/Names/first_female_vulp.yml b/Resources/Prototypes/ADT/Vulpkanin/Names/first_female_vulp.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Datasets/Names/first_female_vulp.yml
rename to Resources/Prototypes/ADT/Vulpkanin/Names/first_female_vulp.yml
diff --git a/Resources/Prototypes/ADT/Datasets/Names/first_male_vulp.yml b/Resources/Prototypes/ADT/Vulpkanin/Names/first_male_vulp.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Datasets/Names/first_male_vulp.yml
rename to Resources/Prototypes/ADT/Vulpkanin/Names/first_male_vulp.yml
diff --git a/Resources/Prototypes/ADT/Datasets/Names/last_vulp.yml b/Resources/Prototypes/ADT/Vulpkanin/Names/last_vulp.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Datasets/Names/last_vulp.yml
rename to Resources/Prototypes/ADT/Vulpkanin/Names/last_vulp.yml
diff --git a/Resources/Prototypes/ADT/Species/Vulpkanin.yml b/Resources/Prototypes/ADT/Vulpkanin/Species/Vulpkanin.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Species/Vulpkanin.yml
rename to Resources/Prototypes/ADT/Vulpkanin/Species/Vulpkanin.yml
diff --git a/Resources/Prototypes/ADT/Alerts/changeling.yml b/Resources/Prototypes/ADT/changeling/alert_changeling.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Alerts/changeling.yml
rename to Resources/Prototypes/ADT/changeling/alert_changeling.yml
diff --git a/Resources/Prototypes/ADT/Actions/changeling.yml b/Resources/Prototypes/ADT/changeling/changeling.yml
similarity index 85%
rename from Resources/Prototypes/ADT/Actions/changeling.yml
rename to Resources/Prototypes/ADT/changeling/changeling.yml
index 3b3cc4cdb6f..5a14ad82538 100644
--- a/Resources/Prototypes/ADT/Actions/changeling.yml
+++ b/Resources/Prototypes/ADT/changeling/changeling.yml
@@ -1,70 +1,3 @@
-- type: entity
-  id: LingUntActionStealth
-  name: action-stealth
-  description: action-stealth-desc
-  noSpawn: true
-  components:
-  - type: InstantAction
-    icon:
-      sprite: Interface/Actions/actions_ling.rsi
-      state: chameleon
-    itemIconStyle: BigAction
-    checkCanInteract: false
-    event: !type:CompInvisibilityActionEvent
-    useDelay: 30
-
-- type: entity
-  id: LingUntActionStasisHeal
-  name: action-stasis-heal
-  description: action-stasis-heal-desc
-  noSpawn: true
-  components:
-  - type: InstantAction
-    icon:
-      sprite: Interface/Actions/actions_ling.rsi
-      state: fleshmend
-    itemIconStyle: BigAction
-    checkCanInteract: false
-    event: !type:CompStasisHealActionEvent
-    useDelay: 5
-
-- type: entity
-  id: LingUntActionJump
-  name: action-jump
-  description: action-jump-desc
-  noSpawn: true
-  components:
-  - type: WorldTargetAction
-    useDelay: 75
-    range: 16 # default examine-range.
-    # ^ should probably add better validation that the clicked location is on the users screen somewhere,
-    itemIconStyle: BigAction
-    checkCanAccess: false
-    repeat: true
-    icon:
-      sprite: Clothing/Shoes/Boots/combatboots.rsi
-      state: icon
-    event: !type:CompJumpActionEvent
-
-- type: entity
-  id: LingUntActionShoot
-  name: action-shoot
-  description: action-shoot-desc
-  noSpawn: true
-  components:
-  - type: WorldTargetAction
-    useDelay: 60
-    range: 16 # default examine-range.
-    # ^ should probably add better validation that the clicked location is on the users screen somewhere,
-    itemIconStyle: BigAction
-    checkCanAccess: false
-    repeat: true
-    icon:
-      sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
-      state: icon
-    event: !type:CompProjectileActionEvent
-
-
 - type: entity
   id: ActionChangelingEvolutionMenu
   name: action-evolution-menu
diff --git a/Resources/Prototypes/ADT/Catalog/ling_catalog.yml b/Resources/Prototypes/ADT/changeling/ling_catalog.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Catalog/ling_catalog.yml
rename to Resources/Prototypes/ADT/changeling/ling_catalog.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/changeling.yml b/Resources/Prototypes/ADT/changeling/mobs.yml
similarity index 57%
rename from Resources/Prototypes/ADT/Entities/Mobs/player/changeling.yml
rename to Resources/Prototypes/ADT/changeling/mobs.yml
index c828df2c902..1d2d3bd3d97 100644
--- a/Resources/Prototypes/ADT/Entities/Mobs/player/changeling.yml
+++ b/Resources/Prototypes/ADT/changeling/mobs.yml
@@ -236,22 +236,90 @@
     spread: true
     eggsAction: ActionLingHatchFast
 
+- type: reagent
+  id: LingToxin
+  name: reagent-name-toxin
+  group: Toxins
+  desc: reagent-desc-toxin
+  flavor: bitter
+  color: "#cf3600"
+  physicalDesc: reagent-physical-desc-opaque
+  plantMetabolism:
+  - !type:PlantAdjustToxins
+    amount: 10
+  - !type:PlantAdjustHealth
+    amount: -5
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Poison: 2
 
 
+- type: reagent
+  id: ADTLingEggs # Немножко костылей, но кому не пофиг?
+  name: reagent-name-ling
+  group: Toxins
+  desc: reagent-desc-ling
+  flavor: bitter
+  physicalDesc: reagent-physical-desc-skunky
+  color: "#ffd478"
+  worksOnTheDead: true
+  metabolisms:
+    Medicine:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Poison: 30
 
-#Котя это что вообще такое
-- type: entity  # Как будут спрайты доделаю. 
-  name: Urist McWeb
-  parent: BaseMobArachnid
-  id: ADTMobLingUnt
+- type: entity
+  name: synthetic changeling larva
+  parent: FoodBreadSliceBase
+  id: ADTLingLarva
+  description: No... Don't do it...
   components:
-  - type: InvisibilityAct
-    minVisibility: 0
-  - type: JumpAct
-    jumpAction: LingUntActionJump
-  - type: ProjectileAct
-    projAction: LingUntActionShoot
-    prototype: ADTBulletLingGas
+  - type: Food
+  - type: Item
+    sprite: ADT/Objects/Specific/genо_larva_white.rsi
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      right:
+      - state: inhand-right
+  - type: Sprite
+    sprite: ADT/Objects/Specific/genо_larva_white.rsi
+    layers:
+    - state: icon
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 4
+        reagents:
+        - ReagentId: ADTLingEggs
+          Quantity: 4 # Just using the same values as the bun values, since the recipe for taco shells is roughly the same as buns.
+  - type: Tag
+    tags:
+    - ADTCarnivoreFriendlyFood
+  - type: FlavorProfile
+    flavors:
+      - terrible
+
+- type: reaction
+  id: ADTLingLarva #без понятия, как там у тебя личинка называется
+  quantized: true
+  reactants:
+    ADTMPolymorphine:
+      amount: 15
+    Nutriment: #ну, раз мы создаём что-то биологическое, то пусть будут ещё и биологические приколы.
+      amount: 3
+    Stimulants:
+      amount: 5
+  effects:
+    - !type:CreateEntityReactionEffect
+      entity: ADTLingLarva #сам подставишь id сущности.
 
 - type: entity
   parent: ChangelingHeadslug
@@ -261,3 +329,69 @@
   - type: GenericAntag
     rule: LingMidround
 
+- type: entity
+  parent: BaseGameRule
+  id: MidroundChangelingSpawn
+  noSpawn: true
+  components:
+  - type: StationEvent
+    weight: 10
+    duration: 1
+    earliestStart: 30
+    minimumPlayers: 40
+  - type: RandomSpawnRule
+    prototype: SpawnPointGhostLing
+
+- type: entity
+  noSpawn: true
+  parent: BaseGameRule
+  id: LingMidround
+  components:
+  - type: GenericAntagRule
+    agentName: ling-round-end-agent-name  
+    objectives:
+    - EscapeLingShuttleObjective
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnPointGhostLing
+  name: changeling spawn point
+  components:
+  - type: GhostRole
+    name: ghost-role-information-ling-name
+    description: ghost-role-information-ling-description
+    rules: ghost-role-information-ling-rules
+  - type: GhostRoleMobSpawner
+    prototype: ChangelingHeadslugMidround
+  - type: Sprite
+    sprite: ADT/Mobs/Aliens/headslug.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: headslug
+
+- type: reagent
+  id: LingDrugs
+  name: reagent-name-space-drugs
+  group: Narcotics
+  desc: reagent-desc-space-drugs
+  physicalDesc: reagent-physical-desc-syrupy
+  flavor: bitter
+  color: "#63806e"
+  metabolisms:
+    Narcotic:
+      effects:
+      - !type:GenericStatusEffect
+        key: SeeingRainbows
+        component: SeeingRainbows
+        type: Add
+        time: 5
+        refresh: false
+      - !type:GenericStatusEffect
+        key: ADTHallucinations
+        component: LingHallucinations
+        type: Add
+        time: 10
+        refresh: false
+        conditions:
+        - !type:ReagentThreshold
+          min: 15
diff --git a/Resources/Prototypes/ADT/Objectives/changeling.yml b/Resources/Prototypes/ADT/changeling/objectives_changeling.yml
similarity index 93%
rename from Resources/Prototypes/ADT/Objectives/changeling.yml
rename to Resources/Prototypes/ADT/changeling/objectives_changeling.yml
index cd8a529539a..c2af049affe 100644
--- a/Resources/Prototypes/ADT/Objectives/changeling.yml
+++ b/Resources/Prototypes/ADT/changeling/objectives_changeling.yml
@@ -1,3 +1,15 @@
+- type: entity
+  abstract: true
+  parent: BaseObjective
+  id: BaseChangelingObjective
+  components:
+  - type: Objective
+    issuer: changeling-issuer
+  - type: RoleRequirement
+    roles:
+      components:
+      - ChangelingRole
+
 - type: entity
   noSpawn: true
   parent: [BaseChangelingObjective, BaseLivingObjective]
diff --git a/Resources/Prototypes/ADT/Roles/Antags/changeling.yml b/Resources/Prototypes/ADT/changeling/role_changeling.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Roles/Antags/changeling.yml
rename to Resources/Prototypes/ADT/changeling/role_changeling.yml
diff --git a/Resources/Prototypes/ADT/ling_unturnable.yml b/Resources/Prototypes/ADT/ling_unturnable.yml
new file mode 100644
index 00000000000..39aefbab51c
--- /dev/null
+++ b/Resources/Prototypes/ADT/ling_unturnable.yml
@@ -0,0 +1,78 @@
+- type: entity
+  id: LingUntActionStealth
+  name: action-stealth
+  description: action-stealth-desc
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon:
+      sprite: Interface/Actions/actions_ling.rsi
+      state: chameleon
+    itemIconStyle: BigAction
+    checkCanInteract: false
+    event: !type:CompInvisibilityActionEvent
+    useDelay: 30
+
+- type: entity
+  id: LingUntActionStasisHeal
+  name: action-stasis-heal
+  description: action-stasis-heal-desc
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon:
+      sprite: Interface/Actions/actions_ling.rsi
+      state: fleshmend
+    itemIconStyle: BigAction
+    checkCanInteract: false
+    event: !type:CompStasisHealActionEvent
+    useDelay: 5
+
+- type: entity
+  id: LingUntActionJump
+  name: action-jump
+  description: action-jump-desc
+  noSpawn: true
+  components:
+  - type: WorldTargetAction
+    useDelay: 75
+    range: 16 # default examine-range.
+    # ^ should probably add better validation that the clicked location is on the users screen somewhere,
+    itemIconStyle: BigAction
+    checkCanAccess: false
+    repeat: true
+    icon:
+      sprite: Clothing/Shoes/Boots/combatboots.rsi
+      state: icon
+    event: !type:CompJumpActionEvent
+
+- type: entity
+  id: LingUntActionShoot
+  name: action-shoot
+  description: action-shoot-desc
+  noSpawn: true
+  components:
+  - type: WorldTargetAction
+    useDelay: 60
+    range: 16 # default examine-range.
+    # ^ should probably add better validation that the clicked location is on the users screen somewhere,
+    itemIconStyle: BigAction
+    checkCanAccess: false
+    repeat: true
+    icon:
+      sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
+      state: icon
+    event: !type:CompProjectileActionEvent
+
+- type: entity  # Как будут спрайты доделаю. 
+  name: Urist McWeb
+  parent: BaseMobArachnid
+  id: ADTMobLingUnt
+  components:
+  - type: InvisibilityAct
+    minVisibility: 0
+  - type: JumpAct
+    jumpAction: LingUntActionJump
+  - type: ProjectileAct
+    projAction: LingUntActionShoot
+    prototype: ADTBulletLingGas
diff --git a/Resources/Prototypes/ADT/Polymorphs/polymorphs.yml b/Resources/Prototypes/ADT/polymorphs.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Polymorphs/polymorphs.yml
rename to Resources/Prototypes/ADT/polymorphs.yml
diff --git a/Resources/Prototypes/ADT/Actions/wizard.yml b/Resources/Prototypes/ADT/wizard/abilities.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Actions/wizard.yml
rename to Resources/Prototypes/ADT/wizard/abilities.yml
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Magic/books.yml b/Resources/Prototypes/ADT/wizard/spellbook.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Entities/Objects/Magic/books.yml
rename to Resources/Prototypes/ADT/wizard/spellbook.yml
diff --git a/Resources/Prototypes/ADT/Catalog/wizard.yml b/Resources/Prototypes/ADT/wizard/wizard_catalog.yml
similarity index 100%
rename from Resources/Prototypes/ADT/Catalog/wizard.yml
rename to Resources/Prototypes/ADT/wizard/wizard_catalog.yml