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
2021-02-28 18:05:37 -05:00
committed by GitHub
parent f5ade3682c
commit 86ab510e46
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
@@ -1321,11 +1321,8 @@
#include "code\game\objects\items\weapons\implants\implantfreedom.dm"
#include "code\game\objects\items\weapons\implants\implantlanguage.dm"
#include "code\game\objects\items\weapons\implants\implantpad.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\game\objects\items\weapons\implants\implantreagent_vr.dm"
=======
#include "code\game\objects\items\weapons\implants\implantrestrainingbolt.dm"
>>>>>>> 8dc0404... Adds the Restraining Bolt. (#7820):polaris.dme
#include "code\game\objects\items\weapons\implants\implantuplink.dm"
#include "code\game\objects\items\weapons\implants\neuralbasic.dm"
#include "code\game\objects\items\weapons\material\ashtray.dm"