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

Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum

Browse Source 
# Conflicts:
#	tgstation.dme
This commit is contained in:
zerothebigboy
2021-09-19 15:25:42 -04:00
parent c6ce359cda a41258c7de
commit ce43b1b49e
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tgstation.dme
+5
View File
@@ -464,11 +464,16 @@
#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"