diff --git a/tgstation.dme b/tgstation.dme index a3b3ea61d7..25b7c3e6f3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3173,18 +3173,4 @@ #include "modular_citadel\code\modules\reagents\reagents\cit_reagents.dm" #include "modular_citadel\code\modules\research\designs\autoylathe_designs.dm" #include "modular_citadel\interface\skin.dmf" -#include "F:\Games\GITHUBHARD\UNGA\Blinstation.dmm" -#include "F:\Games\GITHUBHARD\UNGA\BlinStation2.dmm" -#include "F:\Games\GITHUBHARD\UNGA\chrimbus.dmm" -<<<<<<< Updated upstream -#include "F:\Games\GITHUBHARD\Firestorm.dmm" -======= -#include "F:\Games\GITHUBHARD\UNGA\chrimbus2.dmm" -#include "F:\Games\GITHUBHARD\EchoStation.dmm" ->>>>>>> Stashed changes -#include "F:\Games\GITHUBHARD\UNGA\Infernus.dmm" -#include "F:\Games\GITHUBHARD\UNGA\InfernusStation.dmm" -#include "F:\Games\GITHUBHARD\UNGA\OhmStation.dmm" -#include "F:\Games\GITHUBHARD\UNGA\snowball.dmm" -#include "F:\Games\GITHUBHARD\UNGA\spook2.dmm" // END_INCLUDE