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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-02-06 19:49:36 -05:00
committed by GitHub
parent d38c2c3ac3
commit 010390191c
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vorestation.dme
-4
View File
@@ -4415,15 +4415,12 @@
#include "maps\southern_cross\loadout\loadout_suit.dm"
#include "maps\southern_cross\loadout\loadout_uniform.dm"
#include "maps\southern_cross\loadout\loadout_vr.dm"
<<<<<<< HEAD
#include "maps\southern_cross\overmap\shuttles.dm"
#include "maps\southern_cross\structures\closets\engineering.dm"
#include "maps\southern_cross\structures\closets\medical.dm"
#include "maps\southern_cross\structures\closets\misc.dm"
#include "maps\southern_cross\structures\closets\research.dm"
#include "maps\southern_cross\structures\closets\security.dm"
=======
>>>>>>> de1f9190b8b... Merge pull request #12143 from Very-Soft/returntotether
#include "maps\submaps\_helpers.dm"
#include "maps\submaps\engine_submaps\engine.dm"
#include "maps\submaps\engine_submaps\engine_areas.dm"
@@ -4438,6 +4435,5 @@
#include "maps\submaps\surface_submaps\plains\plains_areas.dm"
#include "maps\submaps\surface_submaps\wilderness\wilderness.dm"
#include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm"
#include "maps\tether\tether.dm"
#include "maps\~map_system\maps.dm"
// END_INCLUDE