cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 20:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update vorestation.dme

Browse Source
This commit is contained in:
Novacat
2019-08-21 17:51:50 -04:00
committed by GitHub
parent 8f067fe785
commit ec3bee10b6
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
@@ -2851,11 +2851,8 @@
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Food-Drinks.dm"
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Food-Drinks_vr.dm"
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Medicine.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Medicine_vr.dm"
=======
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Modifiers.dm"
>>>>>>> 0069b9d... Merge pull request #6396 from Mechoid/ChemistryAdvancement:polaris.dme
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Other.dm"
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Toxins.dm"
#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Vore_vr.dm"
@@ -2878,11 +2875,8 @@
#include "code\modules\reagents\reagent_containers\glass.dm"
#include "code\modules\reagents\reagent_containers\glass_vr.dm"
#include "code\modules\reagents\reagent_containers\hypospray.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\reagents\reagent_containers\hypospray_vr.dm"
=======
#include "code\modules\reagents\reagent_containers\patch.dm"
>>>>>>> 0069b9d... Merge pull request #6396 from Mechoid/ChemistryAdvancement:polaris.dme
#include "code\modules\reagents\reagent_containers\pill.dm"
#include "code\modules\reagents\reagent_containers\pill_vr.dm"
#include "code\modules\reagents\reagent_containers\spray.dm"