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

Update vorestation.dme

Browse Source
This commit is contained in:
Novacat
2020-08-25 20:37:53 -04:00
committed by GitHub
parent b2250d9b47
commit d9f2e5dd07
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vorestation.dme
View File

@@ -3230,11 +3230,8 @@
#include "code\modules\projectiles\projectile\bullets_vr.dm" #include "code\modules\projectiles\projectile\bullets_vr.dm"
#include "code\modules\projectiles\projectile\change.dm" #include "code\modules\projectiles\projectile\change.dm"
#include "code\modules\projectiles\projectile\energy.dm" #include "code\modules\projectiles\projectile\energy.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\projectiles\projectile\energy_vr.dm" #include "code\modules\projectiles\projectile\energy_vr.dm"
=======
#include "code\modules\projectiles\projectile\explosive.dm" #include "code\modules\projectiles\projectile\explosive.dm"
>>>>>>> 7595e09... Merge pull request #7474 from lbnesquik/Kot-Mecha-missile-tweak:polaris.dme
#include "code\modules\projectiles\projectile\force.dm" #include "code\modules\projectiles\projectile\force.dm"
#include "code\modules\projectiles\projectile\hook.dm" #include "code\modules\projectiles\projectile\hook.dm"
#include "code\modules\projectiles\projectile\magnetic.dm" #include "code\modules\projectiles\projectile\magnetic.dm"