From a383223df9b86bde09411cd70d8a772e2542eb02 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Fri, 30 Apr 2021 02:00:26 -0400
Subject: [PATCH] Update vorestation.dme

---
 vorestation.dme | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/vorestation.dme b/vorestation.dme
index 52a5485718..2ec390317c 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2570,14 +2570,6 @@
 #include "code\modules\materials\fifty_spawner_mats.dm"
 #include "code\modules\materials\fifty_spawner_mats_vr.dm"
 #include "code\modules\materials\material_synth.dm"
-<<<<<<< HEAD
-#include "code\modules\materials\materials.dm"
-#include "code\modules\materials\materials_ch.dm"
-#include "code\modules\materials\materials_vr.dm"
-||||||| parent of d9937399de... Merge pull request #10192 from VOREStation/upstream-merge-8022
-#include "code\modules\materials\materials.dm"
-#include "code\modules\materials\materials_vr.dm"
-=======
 #include "code\modules\materials\materials\_materials.dm"
 #include "code\modules\materials\materials\_materials_vr.dm"
 #include "code\modules\materials\materials\alien_alloy.dm"
@@ -2588,6 +2580,7 @@
 #include "code\modules\materials\materials\holographic.dm"
 #include "code\modules\materials\materials\other_vr.dm"
 #include "code\modules\materials\materials\plastic.dm"
+#include "code\modules\materials\materials\plastic_ch.dm"
 #include "code\modules\materials\materials\snow.dm"
 #include "code\modules\materials\materials\stone.dm"
 #include "code\modules\materials\materials\supermatter.dm"
@@ -2597,13 +2590,16 @@
 #include "code\modules\materials\materials\metals\metals_vr.dm"
 #include "code\modules\materials\materials\metals\plasteel.dm"
 #include "code\modules\materials\materials\metals\plasteel_vr.dm"
+#include "code\modules\materials\materials\metals\plasteel_ch.dm"
 #include "code\modules\materials\materials\metals\steel.dm"
 #include "code\modules\materials\materials\metals\steel_vr.dm"
 #include "code\modules\materials\materials\organic\animal_products.dm"
 #include "code\modules\materials\materials\organic\cloth.dm"
+#include "code\modules\materials\materials\organic\cloth_ch.dm"
 #include "code\modules\materials\materials\organic\leather.dm"
 #include "code\modules\materials\materials\organic\resin.dm"
 #include "code\modules\materials\materials\organic\wood.dm"
+#include "code\modules\materials\materials\organic\wood_ch.dm"
 #include "code\modules\materials\sheets\_sheets.dm"
 #include "code\modules\materials\sheets\gems.dm"
 #include "code\modules\materials\sheets\glass.dm"
@@ -2625,7 +2621,6 @@
 #include "code\modules\materials\sheets\organic\tanning\hide_hairless.dm"
 #include "code\modules\materials\sheets\organic\tanning\leather_wet.dm"
 #include "code\modules\materials\sheets\organic\tanning\tanning_rack.dm"
->>>>>>> d9937399de... Merge pull request #10192 from VOREStation/upstream-merge-8022
 #include "code\modules\media\media_machinery.dm"
 #include "code\modules\media\media_player_html5.dm"
 #include "code\modules\media\media_player_vlc.dm"