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

Update vorestation.dme

Browse Source
This commit is contained in:
Nadyr
2021-05-08 08:17:01 -04:00
committed by GitHub
parent dcdd455b84
commit 9fbdc5b39c
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

@@ -2311,12 +2311,8 @@
#include "code\modules\food\drinkingglass\shaker.dm"
#include "code\modules\food\drinkingglass\shaker_vr.dm"
#include "code\modules\food\food\cans.dm"
<<<<<<< HEAD
#include "code\modules\food\food\cans_ch.dm"
||||||| parent of 2fa3ce770e... Merge pull request #10234 from klaasjared/Bringing-back-the-Bepsi
=======
#include "code\modules\food\food\cans_vr.dm"
>>>>>>> 2fa3ce770e... Merge pull request #10234 from klaasjared/Bringing-back-the-Bepsi
#include "code\modules\food\food\condiment.dm"
#include "code\modules\food\food\drinks.dm"
#include "code\modules\food\food\lunch.dm"