cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update vorestation.dme

Browse Source
This commit is contained in:
Novacat
2021-02-28 17:57:38 -05:00
committed by GitHub
parent d7c949c010
commit d2d9f65a03
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
@@ -2587,11 +2587,8 @@
#include "code\modules\mob\living\carbon\human\human_defines.dm"
#include "code\modules\mob\living\carbon\human\human_defines_vr.dm"
#include "code\modules\mob\living\carbon\human\human_helpers.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\mob\living\carbon\human\human_helpers_vr.dm"
=======
#include "code\modules\mob\living\carbon\human\human_modular_limbs.dm"
>>>>>>> c31a3e7... Merge pull request #7905 from MistakeNot4892/beepboop:polaris.dme
#include "code\modules\mob\living\carbon\human\human_movement.dm"
#include "code\modules\mob\living\carbon\human\human_organs.dm"
#include "code\modules\mob\living\carbon\human\human_powers.dm"