From b8b092c70b3890b4f6f063dbf5aa40a3f2ce51a4 Mon Sep 17 00:00:00 2001
From: EmeraldSundisk <thachazman@hotmail.com>
Date: Fri, 8 Nov 2019 14:04:25 -0800
Subject: [PATCH] Update tgstation.dme

---
 tgstation.dme | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tgstation.dme b/tgstation.dme
index e4ebe646e8..f46efa29c6 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3125,8 +3125,17 @@
 #include "modular_citadel\code\modules\vore\eating\vorepanel_vr.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