cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-14 17:37:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update tgstation.dme

Browse Source
This commit is contained in:
JaySparrow
2020-06-12 16:24:17 -05:00
parent f70035c1a1
commit 0f81c6e050
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tgstation.dme
-12
View File
@@ -297,10 +297,7 @@
#include "code\datums\beam.dm"
#include "code\datums\browser.dm"
#include "code\datums\callback.dm"
<<<<<<< HEAD
=======
#include "code\datums\chatmessage.dm"
>>>>>>> parent of fe39969... Enable leash.dm
#include "code\datums\cinematic.dm"
#include "code\datums\dash_weapon.dm"
#include "code\datums\datacore.dm"
@@ -833,10 +830,7 @@
#include "code\game\objects\items\kitchen.dm"
#include "code\game\objects\items\latexballoon.dm"
#include "code\game\objects\items\manuals.dm"
<<<<<<< HEAD
=======
#include "code\game\objects\items\mesmetron.dm"
>>>>>>> parent of fe39969... Enable leash.dm
#include "code\game\objects\items\miscellaneous.dm"
#include "code\game\objects\items\mop.dm"
#include "code\game\objects\items\paint.dm"
@@ -2768,10 +2762,7 @@
#include "code\modules\surgery\nutcracker.dm"
#include "code\modules\surgery\organ_manipulation.dm"
#include "code\modules\surgery\organic_steps.dm"
<<<<<<< HEAD
=======
#include "code\modules\surgery\penis_augmentation.dm"
>>>>>>> parent of fe39969... Enable leash.dm
#include "code\modules\surgery\plastic_surgery.dm"
#include "code\modules\surgery\prosthetic_replacement.dm"
#include "code\modules\surgery\remove_embedded_object.dm"
@@ -2905,10 +2896,7 @@
#include "hyperstation\code\obj\decal.dm"
#include "hyperstation\code\obj\fluff.dm"
#include "hyperstation\code\obj\kinkyclothes.dm"
<<<<<<< HEAD
#include "hyperstation\code\obj\leash.dm"
=======
>>>>>>> parent of fe39969... Enable leash.dm
#include "hyperstation\code\obj\milking machine.dm"
#include "hyperstation\code\obj\plushes.dm"
#include "hyperstation\code\obj\pregnancytester.dm"