shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update tgstation.dme

Browse Source
This commit is contained in:
Poojawa
2017-10-21 22:16:01 -05:00
committed by GitHub
parent d0789ecaf9
commit 3b0da0a0f3
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tgstation.dme
-15
View File
@@ -1266,19 +1266,16 @@
#include "code\modules\clothing\glasses\_glasses.dm"
#include "code\modules\clothing\glasses\engine_goggles.dm"
#include "code\modules\clothing\glasses\hud.dm"
<<<<<<< HEAD
#include "code\modules\clothing\glasses\vg_glasses.dm"
#include "code\modules\clothing\gloves\boxing.dm"
#include "code\modules\clothing\gloves\color.dm"
#include "code\modules\clothing\gloves\miscellaneous.dm"
#include "code\modules\clothing\gloves\vg_gloves.dm"
=======
#include "code\modules\clothing\gloves\_gloves.dm"
#include "code\modules\clothing\gloves\boxing.dm"
#include "code\modules\clothing\gloves\color.dm"
#include "code\modules\clothing\gloves\miscellaneous.dm"
#include "code\modules\clothing\head\_head.dm"
>>>>>>> f910aa9... Merge pull request #31960 from lzimann/split
#include "code\modules\clothing\head\beanie.dm"
#include "code\modules\clothing\head\cit_hats.dm"
#include "code\modules\clothing\head\collectable.dm"
@@ -1288,22 +1285,16 @@
#include "code\modules\clothing\head\misc.dm"
#include "code\modules\clothing\head\misc_special.dm"
#include "code\modules\clothing\head\soft_caps.dm"
<<<<<<< HEAD
#include "code\modules\clothing\head\vg_hats.dm"
=======
#include "code\modules\clothing\masks\_masks.dm"
>>>>>>> f910aa9... Merge pull request #31960 from lzimann/split
#include "code\modules\clothing\masks\boxing.dm"
#include "code\modules\clothing\masks\breath.dm"
#include "code\modules\clothing\masks\gasmask.dm"
#include "code\modules\clothing\masks\hailer.dm"
#include "code\modules\clothing\masks\miscellaneous.dm"
<<<<<<< HEAD
#include "code\modules\clothing\masks\vg_masks.dm"
#include "code\modules\clothing\neck\neck.dm"
=======
#include "code\modules\clothing\neck\_neck.dm"
>>>>>>> f910aa9... Merge pull request #31960 from lzimann/split
#include "code\modules\clothing\outfits\ert.dm"
#include "code\modules\clothing\outfits\event.dm"
#include "code\modules\clothing\outfits\standard.dm"
@@ -1312,22 +1303,16 @@
#include "code\modules\clothing\shoes\colour.dm"
#include "code\modules\clothing\shoes\magboots.dm"
#include "code\modules\clothing\shoes\miscellaneous.dm"
<<<<<<< HEAD
#include "code\modules\clothing\shoes\vg_shoes.dm"
=======
#include "code\modules\clothing\spacesuits\_spacesuits.dm"
>>>>>>> f910aa9... Merge pull request #31960 from lzimann/split
#include "code\modules\clothing\spacesuits\chronosuit.dm"
#include "code\modules\clothing\spacesuits\flightsuit.dm"
#include "code\modules\clothing\spacesuits\hardsuit.dm"
#include "code\modules\clothing\spacesuits\miscellaneous.dm"
#include "code\modules\clothing\spacesuits\plasmamen.dm"
#include "code\modules\clothing\spacesuits\syndi.dm"
<<<<<<< HEAD
#include "code\modules\clothing\spacesuits\vg_spess.dm"
=======
#include "code\modules\clothing\suits\_suits.dm"
>>>>>>> f910aa9... Merge pull request #31960 from lzimann/split
#include "code\modules\clothing\suits\armor.dm"
#include "code\modules\clothing\suits\bio.dm"
#include "code\modules\clothing\suits\cloaks.dm"