cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 12:05:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update vorestation.dme

Browse Source
This commit is contained in:
Novacat
2020-07-30 15:20:34 -04:00
committed by GitHub
parent de6f55a86d
commit ffbc61e37e
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vorestation.dme
-6
View File
@@ -2077,10 +2077,7 @@
#include "code\modules\food\recipes_fryer.dm"
#include "code\modules\food\recipes_grill.dm"
#include "code\modules\food\recipes_microwave.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\food\recipes_microwave_vr.dm"
=======
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking:polaris.dme
#include "code\modules\food\recipes_oven.dm"
#include "code\modules\food\drinkingglass\drinkingglass.dm"
#include "code\modules\food\drinkingglass\extras.dm"
@@ -2113,10 +2110,7 @@
#include "code\modules\food\kitchen\icecream.dm"
#include "code\modules\food\kitchen\microwave.dm"
#include "code\modules\food\kitchen\smartfridge.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\food\kitchen\smartfridge_vr.dm"
=======
>>>>>>> d003767... Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking:polaris.dme
#include "code\modules\food\kitchen\cooking_machines\_appliance.dm"
#include "code\modules\food\kitchen\cooking_machines\_cooker.dm"
#include "code\modules\food\kitchen\cooking_machines\_cooker_output.dm"