cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 21:19:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update vorestation.dme

Browse Source
This commit is contained in:
Novacat
2020-08-31 19:20:30 -04:00
committed by GitHub
parent 87221b5e66
commit e76f319faa
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vorestation.dme
-3
View File
@@ -1864,11 +1864,8 @@
#include "code\modules\clothing\masks\breath.dm"
#include "code\modules\clothing\masks\breath_vr.dm"
#include "code\modules\clothing\masks\gasmask.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\clothing\masks\gasmask_vr.dm"
=======
#include "code\modules\clothing\masks\hailer.dm"
>>>>>>> cc3591c... Merge pull request #7552 from SplinterGP/master:polaris.dme
#include "code\modules\clothing\masks\miscellaneous.dm"
#include "code\modules\clothing\masks\voice.dm"
#include "code\modules\clothing\rings\material.dm"