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:
zeroisthebiggay
2021-09-19 15:27:23 -04:00
committed by GitHub
parent ce43b1b49e
commit d6516d25de
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tgstation.dme
-6
View File
@@ -463,17 +463,11 @@
#include "code\datums\achievements\misc_scores.dm"
#include "code\datums\achievements\skill_achievements.dm"
#include "code\datums\actions\beam_rifle.dm"
<<<<<<< HEAD
<<<<<<< HEAD
=======
#include "code\datums\actions\ninja.dm"
#include "code\datums\atmosphere\_atmosphere.dm"
#include "code\datums\atmosphere\planetary.dm"
>>>>>>> 5aea7175ea7d3e53dee51c9a5fd7cfc6e59907b8
=======
#include "code\datums\atmosphere\_atmosphere.dm"
#include "code\datums\atmosphere\planetary.dm"
>>>>>>> a41258c7def6129040004d9aa51d46f6950acabe
#include "code\datums\brain_damage\brain_trauma.dm"
#include "code\datums\brain_damage\hypnosis.dm"
#include "code\datums\brain_damage\imaginary_friend.dm"