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

Update vorestation.dme

Browse Source
This commit is contained in:
Novacat
2021-05-13 15:03:20 -04:00
committed by GitHub
parent b222db5388
commit 3f19eafeaa
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vorestation.dme
-3
View File
@@ -3821,7 +3821,6 @@
#include "code\modules\virus2\helpers.dm"
#include "code\modules\virus2\isolator.dm"
#include "code\modules\virus2\items_devices.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\vore\hook-defs_vr.dm"
#include "code\modules\vore\trycatch_vr.dm"
#include "code\modules\vore\appearance\preferences_vr.dm"
@@ -3852,7 +3851,6 @@
#include "code\modules\vore\resizing\sizegun_vr.dm"
#include "code\modules\vore\smoleworld\smoleworld_vr.dm"
#include "code\modules\vore\weight\fitness_machines_vr.dm"
=======
#include "code\modules\webhooks\_webhook.dm"
#include "code\modules\webhooks\webhook_ahelp2discord.dm"
#include "code\modules\webhooks\webhook_custom_event.dm"
@@ -3860,7 +3858,6 @@
#include "code\modules\webhooks\webhook_roundend.dm"
#include "code\modules\webhooks\webhook_roundprep.dm"
#include "code\modules\webhooks\webhook_roundstart.dm"
>>>>>>> 4deffc7... Ports Nebula's Discord Webhook Integration (#8071):polaris.dme
#include "code\modules\xenoarcheaology\anomaly_container.dm"
#include "code\modules\xenoarcheaology\boulder.dm"
#include "code\modules\xenoarcheaology\effect.dm"