https://github.com/tgstation/tgstation/pull/49330/ and https://github.com/tgstation/tgstation/pull/49982/

2020-04-23 14:19:50 +03:00
parent fe26034410
commit 0b34e20f56
16 changed files with 1303 additions and 92 deletions
@@ -12,7 +12,7 @@ for f in *.merge; do
 done

 echo "Installing tgui hooks"
-../../tgui-next/bin/tgui --install-git-hooks
+../../tgui/bin/tgui --install-git-hooks

 echo "Installing Python dependencies"
 ./python.sh -m pip install -r ../mapmerge2/requirements.txt