TG sync Sunday (#201)

* stage one

* datums and shit

* game stuff

* modules

* tgstation.dme

* tools

* these things for icons

* compiling fixes

* merge spree on TG

* other updates

* updated maps with deepfryers

* My helpers were not helping
This commit is contained in:
Poojawa
2017-02-06 00:36:56 -06:00
committed by GitHub
parent aeeca195c7
commit 73b6b33f79
279 changed files with 3548 additions and 2585 deletions

View File

@@ -7,5 +7,9 @@ shopt -s globstar
if [ "$BUILD_TOOLS" = false ]; then
(! grep 'step_[xy]' _maps/**/*.dmm)
source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup
tools/travis/dm.sh -DTRAVISBUILDING -M${DM_MAPFILE} tgstation.dme
if [ "$BUILD_TESTING" = true ]; then
tools/travis/dm.sh -DTRAVISBUILDING -M${DM_MAPFILE} tgstation.dme
else
tools/travis/dm.sh -DTRAVISBUILDING -DTRAVISTESTING -Mruntimestation tgstation.dme
fi;
fi;