cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update vorestation.dme

Browse Source
This commit is contained in:
Aronai Sieyes
2020-05-22 21:41:48 -04:00
committed by GitHub
parent 7e650fb60b
commit 57e41152ee
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vorestation.dme
View File

@@ -1878,13 +1878,9 @@
#include "code\modules\clothing\spacesuits\rig\suits\pmc.dm" #include "code\modules\clothing\spacesuits\rig\suits\pmc.dm"
#include "code\modules\clothing\spacesuits\rig\suits\robotics.dm" #include "code\modules\clothing\spacesuits\rig\suits\robotics.dm"
#include "code\modules\clothing\spacesuits\rig\suits\station.dm" #include "code\modules\clothing\spacesuits\rig\suits\station.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\clothing\spacesuits\rig\suits\station_vr.dm" #include "code\modules\clothing\spacesuits\rig\suits\station_vr.dm"
#include "code\modules\clothing\spacesuits\void\event.dm" #include "code\modules\clothing\spacesuits\void\event.dm"
#include "code\modules\clothing\spacesuits\void\event_vr.dm" #include "code\modules\clothing\spacesuits\void\event_vr.dm"
=======
#include "code\modules\clothing\spacesuits\void\event.dm"
>>>>>>> 5505a61... [Project] Vintage Voidsuits (#7152):polaris.dme
#include "code\modules\clothing\spacesuits\void\merc.dm" #include "code\modules\clothing\spacesuits\void\merc.dm"
#include "code\modules\clothing\spacesuits\void\military_vr.dm" #include "code\modules\clothing\spacesuits\void\military_vr.dm"
#include "code\modules\clothing\spacesuits\void\station.dm" #include "code\modules\clothing\spacesuits\void\station.dm"