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

Update vorestation.dme

Browse Source
This commit is contained in:
Novacat
2019-11-24 17:28:23 -05:00
committed by GitHub
parent acf72f115a
commit dc36863e27
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
@@ -2392,21 +2392,15 @@
#include "code\modules\mob\living\silicon\robot\drone\drone_items.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_manufacturer.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_say.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\mob\living\silicon\robot\drone\drone_vr.dm"
=======
#include "code\modules\mob\living\silicon\robot\drone\swarm.dm"
#include "code\modules\mob\living\silicon\robot\drone\swarm_abilities.dm"
#include "code\modules\mob\living\silicon\robot\drone\swarm_items.dm"
>>>>>>> 7ecdcb4... Security / PseudoCargo Expansion (#6482):polaris.dme
#include "code\modules\mob\living\silicon\robot\robot_modules\event.dm"
#include "code\modules\mob\living\silicon\robot\robot_modules\event_vr.dm"
#include "code\modules\mob\living\silicon\robot\robot_modules\station.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\mob\living\silicon\robot\robot_modules\station_vr.dm"
=======
#include "code\modules\mob\living\silicon\robot\robot_modules\swarm.dm"
>>>>>>> 7ecdcb4... Security / PseudoCargo Expansion (#6482):polaris.dme
#include "code\modules\mob\living\silicon\robot\robot_modules\syndicate.dm"
#include "code\modules\mob\living\silicon\robot\subtypes\gravekeeper.dm"
#include "code\modules\mob\living\silicon\robot\subtypes\lost_drone.dm"