Revert "what the fuck"

This reverts commit 16e90bea61.

Revert "fix merge conflicts, warning: still broken"

This reverts commit 1f0f411d4f.

Barotrauma/BarotraumaShared/Data/ContentPackages/Vanilla 0.9.xml

@@ -23,7 +23,6 @@
   <Item file="Content/Items/Electricity/signalitems.xml" />
   <Item file="Content/Items/Engine/engine.xml" />
   <Item file="Content/Items/Fabricators/fabricators.xml" />
-  <Item file="Content/Items/Genetic/genetic.xml" />
   <Item file="Content/Items/Labels/labels.xml" />
   <Item file="Content/Items/Ladder/ladder.xml" />
   <Item file="Content/Items/Materials/materials.xml" />
@@ -64,12 +63,6 @@
   <Item file="Content/Items/Gardening/gardeningtools.xml" />
   <Item file="Content/Items/Gardening/plantproducts.xml" />
   <Item file="Content/Map/Pirates/PirateItems.xml" />
-  <Item file="Content/Items/Jobgear/Assistant/assistant_talent_items.xml" />
-  <Item file="Content/Items/Jobgear/Mechanic/mechanic_talent_items.xml" />
-  <Item file="Content/Items/Jobgear/Security/securityofficer_talent_items.xml" />
-  <Item file="Content/Items/Jobgear/Engineer/engineer_talent_items.xml" />
-  <Item file="Content/Items/Jobgear/Medic/medic_talent_items.xml" />
-  <Item file="Content/Items/Jobgear/Captain/captain_talent_items.xml" />
   <Character file="Content/Characters/Balloon/Balloon.xml" />
   <Character file="Content/Characters/Carrier/Carrier.xml" />
   <Character file="Content/Characters/Charybdis/Charybdis.xml" />
@@ -80,7 +73,6 @@
   <Character file="Content/Characters/Endworm/Endworm.xml" />
   <Character file="Content/Characters/Fractalguardian/Fractalguardian.xml" />
   <Character file="Content/Characters/Fractalguardian2/Fractalguardian2.xml" />
-  <Character file="Content/Characters/Swarmfeeder/Swarmfeeder.xml" />
   <Character file="Content/Characters/Hammerhead/Hammerhead.xml" />
   <Character file="Content/Characters/Hammerheadgold/Hammerheadgold.xml" />
   <Character file="Content/Characters/Hammerheadmatriarch/Hammerheadmatriarch.xml" />
@@ -88,8 +80,6 @@
   <Character file="Content/Characters/Human/Human.xml" />
   <Character file="Content/Characters/Husk/Husk.xml" />
   <Character file="Content/Characters/Humanhusk/Humanhusk.xml" />
-  <Character file="Content/Characters/Legacyfractalguardian/Legacyfractalguardian.xml" />
-  <Character file="Content/Characters/Legacyfractalguardian2/Legacyfractalguardian2.xml" />
   <Character file="Content/Characters/Legacyhusk/Legacyhusk.xml" />
   <Character file="Content/Characters/Legacycharybdis/Legacycharybdis.xml" />
   <Character file="Content/Characters/Legacycrawler/Legacycrawler.xml" />
@@ -157,13 +147,6 @@
   <Text file="Content/Texts/Korean/KoreanVanilla.xml" />
   <UIStyle file="Content/UI/style.xml" />
   <Afflictions file="Content/Afflictions.xml" />
-  <Afflictions file="Content/AfflictionsGeneticMaterial.xml" />
-  <Afflictions file="Content/Talents/Assistant/AfflictionsAssistant.xml" />
-  <Afflictions file="Content/Talents/Captain/AfflictionsCaptain.xml" />
-  <Afflictions file="Content/Talents/Doctor/AfflictionsDoctor.xml" />
-  <Afflictions file="Content/Talents/Engineer/AfflictionsEngineer.xml" />
-  <Afflictions file="Content/Talents/Mechanic/AfflictionsMechanic.xml" />
-  <Afflictions file="Content/Talents/Security/AfflictionsSecurity.xml" />
   <Structure file="Content/Map/StructurePrefabs.xml" />
   <Structure file="Content/Map/Outposts/OutpostStructurePrefabs.xml" />
   <Structure file="Content/Map/Pirates/PirateStructures.xml" />
@@ -172,33 +155,6 @@
   <Structure file="Content/Map/Thalamus/thalamusstructures.xml" />
   <UpgradeModules file="Content/Upgrades/UpgradeModules.xml" />
   <RuinConfig file="Content/Map/RuinConfig.xml" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_Chambers4Way.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_Chasm.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_DeadEndL.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_DeadEndR.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_HallwayHorizontal.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_HallwayVertical.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_HallwaySphere.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_MaintenancePassages.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_MaintenancePassages2.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_SecurityModule.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_VaultModule1.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_VaultModule2.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_Chambers1.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_Chambers2.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_MaintenanceTunnels1.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_MaintenanceTunnels2R.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_MaintenanceTunnels2L.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_Entrance1.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_GeneticStorage1L.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_GeneticStorage1R.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_Chasm2.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_Chasm3.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_Entrance2.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_Entrance3.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_Storage1R.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_Storage1L.sub" />
-  <OutpostModule file="Content/Map/RuinModules/Alien_Offices1.sub" />
   <WreckAIConfig file="Content/Map/Thalamus/ThalamusAI.xml" />
   <BackgroundCreaturePrefabs file="Content/BackgroundCreatures/BackgroundCreaturePrefabs.xml" />
   <LevelObjectPrefabs file="Content/Map/Biomes/Common/CommonLevelObjects.xml" />
@@ -305,11 +261,4 @@
   <EnemySubmarine file="Content/Map/EnemySubmarines/DugongPirate.sub"/>
   <EnemySubmarine file="Content/Map/EnemySubmarines/HumpbackPirate.sub"/>
   <EnemySubmarine file="Content/Map/EnemySubmarines/Typhon2Pirate.sub"/>
-  <Talents file="Content/Talents/Assistant/TalentsAssistant.xml"/>
-  <Talents file="Content/Talents/Security/TalentsSecurity.xml"/>
-  <Talents file="Content/Talents/Engineer/TalentsEngineer.xml"/>
-  <Talents file="Content/Talents/Mechanic/TalentsMechanic.xml"/>
-  <Talents file="Content/Talents/Captain/TalentsCaptain.xml"/>
-  <Talents file="Content/Talents/Doctor/TalentsDoctor.xml"/>
-  <TalentTrees file="Content/Talents/TalentTrees.xml"/>
-</contentpackage>
+</contentpackage>