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

Update vorestation.dme

Browse Source
This commit is contained in:
Novacat
2021-03-22 01:36:08 -04:00
committed by GitHub
parent 0ec52d3f20
commit bf28bee12d
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
@@ -1306,11 +1306,8 @@
#include "code\game\objects\items\weapons\grenades\spawnergrenade_vr.dm"
#include "code\game\objects\items\weapons\grenades\supermatter.dm"
#include "code\game\objects\items\weapons\id cards\cards.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\game\objects\items\weapons\id cards\cards_vr.dm"
=======
#include "code\game\objects\items\weapons\id cards\id_stacks.dm"
>>>>>>> 47d2c55... New ID Card Design (#7815):polaris.dme
#include "code\game\objects\items\weapons\id cards\station_ids.dm"
#include "code\game\objects\items\weapons\id cards\station_ids_vr.dm"
#include "code\game\objects\items\weapons\id cards\syndicate_ids.dm"