From 0f81c6e0507e53650f275bf97c080d0d38daabea Mon Sep 17 00:00:00 2001 From: JaySparrow Date: Fri, 12 Jun 2020 16:24:17 -0500 Subject: [PATCH] Update tgstation.dme --- tgstation.dme | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tgstation.dme b/tgstation.dme index 156997b9..6ec9a6c8 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -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"