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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-07-19 20:48:11 -04:00
committed by GitHub
parent 28642c7888
commit 148241a62e
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vorestation.dme
-8
View File
@@ -4453,29 +4453,21 @@
#include "maps\atoll\atoll_objs.dm"
#include "maps\atoll\atoll_turfs.dm"
#include "maps\gateway_archive_vr\blackmarketpackers.dm"
<<<<<<< HEAD
#include "maps\southern_cross\southern_cross.dm"
#include "maps\southern_cross\items\encryptionkey_sc.dm"
#include "maps\southern_cross\items\headset_sc.dm"
=======
#include "maps\groundbase\groundbase.dm"
#include "maps\offmap_vr\om_ships\abductor.dm"
>>>>>>> 3c288de197... Merge pull request #13353 from Very-Soft/backtogb
#include "maps\southern_cross\items\clothing\sc_accessory.dm"
#include "maps\southern_cross\items\clothing\sc_suit.dm"
#include "maps\southern_cross\items\clothing\sc_under.dm"
#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"
=======
>>>>>>> 3c288de197... Merge pull request #13353 from Very-Soft/backtogb
#include "maps\submaps\_helpers.dm"
#include "maps\submaps\_readme.dm"
#include "maps\submaps\engine_submaps\engine.dm"