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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-02-19 18:58:03 -05:00
committed by GitHub
parent efa941a8be
commit ebc7a24e47
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vorestation.dme
View File

@@ -3750,11 +3750,8 @@
#include "code\modules\projectiles\gun.dm"
#include "code\modules\projectiles\gun_ch.dm"
#include "code\modules\projectiles\projectile.dm"
<<<<<<< HEAD
#include "code\modules\projectiles\projectile_ch.dm"
=======
#include "code\modules\projectiles\ammunition\ammo_boxes.dm"
>>>>>>> 1432ca2b223... Merge pull request #12253 from GhostActual/Donk-Co.-Toys
#include "code\modules\projectiles\ammunition\magazines.dm"
#include "code\modules\projectiles\ammunition\magazines_vr.dm"
#include "code\modules\projectiles\ammunition\magazines_yw.dm"
@@ -3775,11 +3772,8 @@
#include "code\modules\projectiles\guns\magic.dm"
#include "code\modules\projectiles\guns\modular_guns.dm"
#include "code\modules\projectiles\guns\projectile.dm"
<<<<<<< HEAD
#include "code\modules\projectiles\guns\projectile_ch.dm"
=======
#include "code\modules\projectiles\guns\toy.dm"
>>>>>>> 1432ca2b223... Merge pull request #12253 from GhostActual/Donk-Co.-Toys
#include "code\modules\projectiles\guns\vox.dm"
#include "code\modules\projectiles\guns\energy\bsharpoon_vr.dm"
#include "code\modules\projectiles\guns\energy\crestrose_vr.dm"