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

More merge conflict fixes

Browse Source 
I think I got them all.
This commit is contained in:
Unknown
2018-12-13 00:33:32 -05:00
parent a7f5702981
commit b48efb138f
3 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
code/modules/reagents/reagent_containers/glass/bottle_vr.dm → code/modules/food/glass/bottle_vr.dm
View File

0
code/game/machinery/kitchen/smartfridge_vr.dm → code/modules/food/kitchen/smartfridge_vr.dm
View File

2
vorestation.dme
View File

@@ -1775,11 +1775,13 @@
#include "code\modules\food\food\drinks\bottle\robot.dm" #include "code\modules\food\food\drinks\bottle\robot.dm"
#include "code\modules\food\food\snacks\meat.dm" #include "code\modules\food\food\snacks\meat.dm"
#include "code\modules\food\glass\bottle.dm" #include "code\modules\food\glass\bottle.dm"
#include "code\modules\food\glass\bottle_vr.dm"
#include "code\modules\food\glass\bottle\robot.dm" #include "code\modules\food\glass\bottle\robot.dm"
#include "code\modules\food\kitchen\gibber.dm" #include "code\modules\food\kitchen\gibber.dm"
#include "code\modules\food\kitchen\icecream.dm" #include "code\modules\food\kitchen\icecream.dm"
#include "code\modules\food\kitchen\microwave.dm" #include "code\modules\food\kitchen\microwave.dm"
#include "code\modules\food\kitchen\smartfridge.dm" #include "code\modules\food\kitchen\smartfridge.dm"
#include "code\modules\food\kitchen\smartfridge_vr.dm"
#include "code\modules\food\kitchen\cooking_machines\_cooker.dm" #include "code\modules\food\kitchen\cooking_machines\_cooker.dm"
#include "code\modules\food\kitchen\cooking_machines\_cooker_output.dm" #include "code\modules\food\kitchen\cooking_machines\_cooker_output.dm"
#include "code\modules\food\kitchen\cooking_machines\candy.dm" #include "code\modules\food\kitchen\cooking_machines\candy.dm"