From cd62f71a52809b2b44534ec38926d7aa7a48d908 Mon Sep 17 00:00:00 2001 From: Cheridan Date: Mon, 23 Sep 2013 11:20:30 -0500 Subject: [PATCH] Updating the conflicted .dme. #lame --- tgstation.dme | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tgstation.dme b/tgstation.dme index 789d0f5be3e..d90574fd1f4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -412,6 +412,7 @@ #include "code\game\objects\structures.dm" #include "code\game\objects\weapons.dm" #include "code\game\objects\effects\aliens.dm" +#include "code\game\objects\effects\anomalies.dm" #include "code\game\objects\effects\bump_teleporter.dm" #include "code\game\objects\effects\effect_system.dm" #include "code\game\objects\effects\forcefields.dm" @@ -754,19 +755,22 @@ #include "code\modules\detectivework\footprints_and_rag.dm" #include "code\modules\detectivework\scanner.dm" #include "code\modules\events\alien_infestation.dm" +#include "code\modules\events\anomaly.dm" +#include "code\modules\events\anomaly_bluespace.dm" +#include "code\modules\events\anomaly_flux.dm" +#include "code\modules\events\anomaly_grav.dm" +#include "code\modules\events\anomaly_pyro.dm" +#include "code\modules\events\anomaly_vortex.dm" #include "code\modules\events\blob.dm" -#include "code\modules\events\bluespaceanomaly.dm" #include "code\modules\events\brand_intelligence.dm" #include "code\modules\events\carp_migration.dm" #include "code\modules\events\communications_blackout.dm" #include "code\modules\events\disease_outbreak.dm" #include "code\modules\events\dust.dm" #include "code\modules\events\electrical_storm.dm" -#include "code\modules\events\energetic_flux.dm" #include "code\modules\events\event.dm" #include "code\modules\events\event_manager.dm" #include "code\modules\events\false_alarm.dm" -#include "code\modules\events\gravitational_anomaly.dm" #include "code\modules\events\immovable_rod.dm" #include "code\modules\events\ion_storm.dm" #include "code\modules\events\mass_hallucination.dm"