From c79b0c167296274919713da354037c2ebffc4eb6 Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Sun, 10 Mar 2013 19:00:05 +1000 Subject: [PATCH] moved and renamed a bunch of files to be more consistent + intuitive Signed-off-by: Cael_Aislinn --- baystation12.dme | 72 +++++++++---------- .../artifact_unknown.dm} | 0 .../artifact_unknown_old.dm} | 0 .../unknown_effect.dm => artifact/effect.dm} | 0 .../effect_old.dm} | 0 .../effects/unknown_affect_cold.dm | 0 .../effects/unknown_effect_badfeeling.dm | 0 .../effects/unknown_effect_cellcharge.dm | 0 .../effects/unknown_effect_celldrain.dm | 0 .../effects/unknown_effect_dnaswitch.dm | 0 .../effects/unknown_effect_emp.dm | 0 .../effects/unknown_effect_forcefield.dm | 0 .../effects/unknown_effect_gasco2.dm | 0 .../effects/unknown_effect_gasnitro.dm | 0 .../effects/unknown_effect_gasoxy.dm | 0 .../effects/unknown_effect_gasplasma.dm | 0 .../effects/unknown_effect_gassleeping.dm | 0 .../effects/unknown_effect_goodfeeling.dm | 0 .../effects/unknown_effect_heal.dm | 0 .../effects/unknown_effect_heat.dm | 0 .../effects/unknown_effect_hurt.dm | 0 .../effects/unknown_effect_radiate.dm | 0 .../effects/unknown_effect_roboheal.dm | 0 .../effects/unknown_effect_robohurt.dm | 0 .../effects/unknown_effect_sleepy.dm | 0 .../effects/unknown_effect_stun.dm | 0 .../effects/unknown_effect_teleport.dm | 0 .../{analysis => machinery}/accelerator.dm | 0 .../{unknown => machinery}/analysis.dm | 0 .../{unknown => machinery}/analysis_old.dm | 0 .../fourier_transform.dm | 0 .../gas_chromatography.dm | 0 .../harvester.dm} | 0 .../{analysis => machinery}/hyperspectral.dm | 0 .../{analysis => machinery}/ion_mobility.dm | 0 .../{analysis => machinery}/isotope_ratio.dm | 0 .../{analysis => machinery}/machinery_base.dm | 0 .../{unknown => machinery}/scanner.dm | 0 .../{unknown => machinery}/unknown_db.dm | 0 .../ano_device_battery.dm} | 0 40 files changed, 36 insertions(+), 36 deletions(-) rename code/modules/research/xenoarchaeology/{unknown/unknown.dm => artifact/artifact_unknown.dm} (100%) rename code/modules/research/xenoarchaeology/{unknown/unknown_old.dm => artifact/artifact_unknown_old.dm} (100%) rename code/modules/research/xenoarchaeology/{unknown/unknown_effect.dm => artifact/effect.dm} (100%) rename code/modules/research/xenoarchaeology/{unknown/unknown_effect_old.dm => artifact/effect_old.dm} (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_affect_cold.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_badfeeling.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_cellcharge.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_celldrain.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_dnaswitch.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_emp.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_forcefield.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_gasco2.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_gasnitro.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_gasoxy.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_gasplasma.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_gassleeping.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_goodfeeling.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_heal.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_heat.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_hurt.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_radiate.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_roboheal.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_robohurt.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_sleepy.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_stun.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => artifact}/effects/unknown_effect_teleport.dm (100%) rename code/modules/research/xenoarchaeology/{analysis => machinery}/accelerator.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => machinery}/analysis.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => machinery}/analysis_old.dm (100%) rename code/modules/research/xenoarchaeology/{analysis => machinery}/fourier_transform.dm (100%) rename code/modules/research/xenoarchaeology/{analysis => machinery}/gas_chromatography.dm (100%) rename code/modules/research/xenoarchaeology/{unknown/unknown_harvester.dm => machinery/harvester.dm} (100%) rename code/modules/research/xenoarchaeology/{analysis => machinery}/hyperspectral.dm (100%) rename code/modules/research/xenoarchaeology/{analysis => machinery}/ion_mobility.dm (100%) rename code/modules/research/xenoarchaeology/{analysis => machinery}/isotope_ratio.dm (100%) rename code/modules/research/xenoarchaeology/{analysis => machinery}/machinery_base.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => machinery}/scanner.dm (100%) rename code/modules/research/xenoarchaeology/{unknown => machinery}/unknown_db.dm (100%) rename code/modules/research/xenoarchaeology/{unknown/unknown_synthetic.dm => tools/ano_device_battery.dm} (100%) diff --git a/baystation12.dme b/baystation12.dme index 5e5f4b0775b..42d2261fb35 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1143,24 +1143,53 @@ #include "code\modules\research\xenoarchaeology\geosample.dm" #include "code\modules\research\xenoarchaeology\misc.dm" #include "code\modules\research\xenoarchaeology\readme.dm" -#include "code\modules\research\xenoarchaeology\analysis\accelerator.dm" -#include "code\modules\research\xenoarchaeology\analysis\fourier_transform.dm" -#include "code\modules\research\xenoarchaeology\analysis\gas_chromatography.dm" -#include "code\modules\research\xenoarchaeology\analysis\hyperspectral.dm" -#include "code\modules\research\xenoarchaeology\analysis\ion_mobility.dm" -#include "code\modules\research\xenoarchaeology\analysis\isotope_ratio.dm" -#include "code\modules\research\xenoarchaeology\analysis\machinery_base.dm" #include "code\modules\research\xenoarchaeology\artifact\artifact.dm" #include "code\modules\research\xenoarchaeology\artifact\artifact_autocloner.dm" #include "code\modules\research\xenoarchaeology\artifact\artifact_crystal.dm" #include "code\modules\research\xenoarchaeology\artifact\artifact_gigadrill.dm" #include "code\modules\research\xenoarchaeology\artifact\artifact_hoverpod.dm" #include "code\modules\research\xenoarchaeology\artifact\artifact_replicator.dm" +#include "code\modules\research\xenoarchaeology\artifact\artifact_unknown.dm" +#include "code\modules\research\xenoarchaeology\artifact\effect.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_affect_cold.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_badfeeling.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_cellcharge.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_celldrain.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_dnaswitch.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_emp.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_forcefield.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_gasco2.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_gasnitro.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_gasoxy.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_gasplasma.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_gassleeping.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_goodfeeling.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_heal.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_heat.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_hurt.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_radiate.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_roboheal.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_robohurt.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_sleepy.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_stun.dm" +#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_effect_teleport.dm" #include "code\modules\research\xenoarchaeology\finds\finds.dm" #include "code\modules\research\xenoarchaeology\finds\finds_defines.dm" #include "code\modules\research\xenoarchaeology\finds\finds_fossils.dm" #include "code\modules\research\xenoarchaeology\finds\finds_misc.dm" #include "code\modules\research\xenoarchaeology\finds\finds_talkingitem.dm" +#include "code\modules\research\xenoarchaeology\machinery\accelerator.dm" +#include "code\modules\research\xenoarchaeology\machinery\analysis.dm" +#include "code\modules\research\xenoarchaeology\machinery\fourier_transform.dm" +#include "code\modules\research\xenoarchaeology\machinery\gas_chromatography.dm" +#include "code\modules\research\xenoarchaeology\machinery\harvester.dm" +#include "code\modules\research\xenoarchaeology\machinery\hyperspectral.dm" +#include "code\modules\research\xenoarchaeology\machinery\ion_mobility.dm" +#include "code\modules\research\xenoarchaeology\machinery\isotope_ratio.dm" +#include "code\modules\research\xenoarchaeology\machinery\machinery_base.dm" +#include "code\modules\research\xenoarchaeology\machinery\scanner.dm" +#include "code\modules\research\xenoarchaeology\machinery\unknown_db.dm" +#include "code\modules\research\xenoarchaeology\tools\ano_device_battery.dm" #include "code\modules\research\xenoarchaeology\tools\anomaly_suit.dm" #include "code\modules\research\xenoarchaeology\tools\bunsen_burner.dm" #include "code\modules\research\xenoarchaeology\tools\suspension_generator.dm" @@ -1169,35 +1198,6 @@ #include "code\modules\research\xenoarchaeology\tools\tools_depthscanner.dm" #include "code\modules\research\xenoarchaeology\tools\tools_locater.dm" #include "code\modules\research\xenoarchaeology\tools\tools_pickaxe.dm" -#include "code\modules\research\xenoarchaeology\unknown\analysis.dm" -#include "code\modules\research\xenoarchaeology\unknown\scanner.dm" -#include "code\modules\research\xenoarchaeology\unknown\unknown.dm" -#include "code\modules\research\xenoarchaeology\unknown\unknown_db.dm" -#include "code\modules\research\xenoarchaeology\unknown\unknown_effect.dm" -#include "code\modules\research\xenoarchaeology\unknown\unknown_harvester.dm" -#include "code\modules\research\xenoarchaeology\unknown\unknown_synthetic.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_affect_cold.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_badfeeling.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_cellcharge.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_celldrain.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_dnaswitch.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_emp.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_forcefield.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_gasco2.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_gasnitro.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_gasoxy.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_gasplasma.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_gassleeping.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_goodfeeling.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_heal.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_heat.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_hurt.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_radiate.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_roboheal.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_robohurt.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_sleepy.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_stun.dm" -#include "code\modules\research\xenoarchaeology\unknown\effects\unknown_effect_teleport.dm" #include "code\modules\scripting\Errors.dm" #include "code\modules\scripting\IDE.dm" #include "code\modules\scripting\Options.dm" diff --git a/code/modules/research/xenoarchaeology/unknown/unknown.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/unknown.dm rename to code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm diff --git a/code/modules/research/xenoarchaeology/unknown/unknown_old.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown_old.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/unknown_old.dm rename to code/modules/research/xenoarchaeology/artifact/artifact_unknown_old.dm diff --git a/code/modules/research/xenoarchaeology/unknown/unknown_effect.dm b/code/modules/research/xenoarchaeology/artifact/effect.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/unknown_effect.dm rename to code/modules/research/xenoarchaeology/artifact/effect.dm diff --git a/code/modules/research/xenoarchaeology/unknown/unknown_effect_old.dm b/code/modules/research/xenoarchaeology/artifact/effect_old.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/unknown_effect_old.dm rename to code/modules/research/xenoarchaeology/artifact/effect_old.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_affect_cold.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_affect_cold.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_badfeeling.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_badfeeling.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_cellcharge.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_cellcharge.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_celldrain.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_celldrain.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_dnaswitch.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_dnaswitch.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_dnaswitch.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_dnaswitch.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_emp.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_emp.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_emp.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_emp.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_forcefield.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_forcefield.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_forcefield.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_forcefield.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_gasco2.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasco2.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_gasco2.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasco2.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_gasnitro.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasnitro.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_gasnitro.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasnitro.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_gasoxy.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasoxy.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_gasoxy.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasoxy.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_gasplasma.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasplasma.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_gasplasma.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gasplasma.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_gassleeping.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gassleeping.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_gassleeping.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_gassleeping.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_goodfeeling.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_goodfeeling.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_heal.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_heal.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_heat.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_heat.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_hurt.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_hurt.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_radiate.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_radiate.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_radiate.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_radiate.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_roboheal.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_roboheal.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_robohurt.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_robohurt.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_sleepy.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_sleepy.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_stun.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_stun.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm diff --git a/code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_teleport.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/effects/unknown_effect_teleport.dm rename to code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm diff --git a/code/modules/research/xenoarchaeology/analysis/accelerator.dm b/code/modules/research/xenoarchaeology/machinery/accelerator.dm similarity index 100% rename from code/modules/research/xenoarchaeology/analysis/accelerator.dm rename to code/modules/research/xenoarchaeology/machinery/accelerator.dm diff --git a/code/modules/research/xenoarchaeology/unknown/analysis.dm b/code/modules/research/xenoarchaeology/machinery/analysis.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/analysis.dm rename to code/modules/research/xenoarchaeology/machinery/analysis.dm diff --git a/code/modules/research/xenoarchaeology/unknown/analysis_old.dm b/code/modules/research/xenoarchaeology/machinery/analysis_old.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/analysis_old.dm rename to code/modules/research/xenoarchaeology/machinery/analysis_old.dm diff --git a/code/modules/research/xenoarchaeology/analysis/fourier_transform.dm b/code/modules/research/xenoarchaeology/machinery/fourier_transform.dm similarity index 100% rename from code/modules/research/xenoarchaeology/analysis/fourier_transform.dm rename to code/modules/research/xenoarchaeology/machinery/fourier_transform.dm diff --git a/code/modules/research/xenoarchaeology/analysis/gas_chromatography.dm b/code/modules/research/xenoarchaeology/machinery/gas_chromatography.dm similarity index 100% rename from code/modules/research/xenoarchaeology/analysis/gas_chromatography.dm rename to code/modules/research/xenoarchaeology/machinery/gas_chromatography.dm diff --git a/code/modules/research/xenoarchaeology/unknown/unknown_harvester.dm b/code/modules/research/xenoarchaeology/machinery/harvester.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/unknown_harvester.dm rename to code/modules/research/xenoarchaeology/machinery/harvester.dm diff --git a/code/modules/research/xenoarchaeology/analysis/hyperspectral.dm b/code/modules/research/xenoarchaeology/machinery/hyperspectral.dm similarity index 100% rename from code/modules/research/xenoarchaeology/analysis/hyperspectral.dm rename to code/modules/research/xenoarchaeology/machinery/hyperspectral.dm diff --git a/code/modules/research/xenoarchaeology/analysis/ion_mobility.dm b/code/modules/research/xenoarchaeology/machinery/ion_mobility.dm similarity index 100% rename from code/modules/research/xenoarchaeology/analysis/ion_mobility.dm rename to code/modules/research/xenoarchaeology/machinery/ion_mobility.dm diff --git a/code/modules/research/xenoarchaeology/analysis/isotope_ratio.dm b/code/modules/research/xenoarchaeology/machinery/isotope_ratio.dm similarity index 100% rename from code/modules/research/xenoarchaeology/analysis/isotope_ratio.dm rename to code/modules/research/xenoarchaeology/machinery/isotope_ratio.dm diff --git a/code/modules/research/xenoarchaeology/analysis/machinery_base.dm b/code/modules/research/xenoarchaeology/machinery/machinery_base.dm similarity index 100% rename from code/modules/research/xenoarchaeology/analysis/machinery_base.dm rename to code/modules/research/xenoarchaeology/machinery/machinery_base.dm diff --git a/code/modules/research/xenoarchaeology/unknown/scanner.dm b/code/modules/research/xenoarchaeology/machinery/scanner.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/scanner.dm rename to code/modules/research/xenoarchaeology/machinery/scanner.dm diff --git a/code/modules/research/xenoarchaeology/unknown/unknown_db.dm b/code/modules/research/xenoarchaeology/machinery/unknown_db.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/unknown_db.dm rename to code/modules/research/xenoarchaeology/machinery/unknown_db.dm diff --git a/code/modules/research/xenoarchaeology/unknown/unknown_synthetic.dm b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm similarity index 100% rename from code/modules/research/xenoarchaeology/unknown/unknown_synthetic.dm rename to code/modules/research/xenoarchaeology/tools/ano_device_battery.dm