cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-28 07:39:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update vorestation.dme

Browse Source
This commit is contained in:
Nadyr
2021-04-30 02:00:26 -04:00
committed by GitHub
parent c072392f22
commit a383223df9
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vorestation.dme
+4 -9
View File
@@ -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"