From ec45d015bb07147960641d27459878d735331da6 Mon Sep 17 00:00:00 2001
From: Letter N <24603524+LetterN@users.noreply.github.com>
Date: Thu, 4 Mar 2021 22:16:38 +0800
Subject: [PATCH] a

---
 tools/ci/build.ps1              |  3 +++
 tools/ci/build_tgui.sh          | 19 -------------------
 tools/ci/check_grep.sh          |  4 ++++
 tools/ci/install_build_tools.sh | 12 ------------
 tools/ci/install_node.sh        | 10 ++++++++++
 tools/ci/run_server.sh          |  1 -
 6 files changed, 17 insertions(+), 32 deletions(-)
 delete mode 100755 tools/ci/build_tgui.sh
 delete mode 100755 tools/ci/install_build_tools.sh
 create mode 100755 tools/ci/install_node.sh

diff --git a/tools/ci/build.ps1 b/tools/ci/build.ps1
index 8c9906dfe5..737b90a9f3 100755
--- a/tools/ci/build.ps1
+++ b/tools/ci/build.ps1
@@ -4,5 +4,8 @@ if(!(Test-Path -Path "C:/byond")){
     Remove-Item C:/byond.zip
 }
 
+bash tools/ci/install_node.sh
+bash tgui/bin/tgui --build
+
 &"C:/byond/bin/dm.exe" -max_errors 0 tgstation.dme
 exit $LASTEXITCODE
diff --git a/tools/ci/build_tgui.sh b/tools/ci/build_tgui.sh
deleted file mode 100755
index 0684f451bb..0000000000
--- a/tools/ci/build_tgui.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-## Change to project root relative to the script
-cd "$(dirname "${0}")/../.."
-base_dir="$(pwd)"
-
-## The final authority on what's required to fully build the project
-source dependencies.sh
-
-## Setup NVM
-if [[ -e ~/.nvm/nvm.sh ]]; then
-	source ~/.nvm/nvm.sh
-	nvm use "${NODE_VERSION}"
-fi
-
-echo "Building 'tgui'"
-cd "${base_dir}/tgui"
-bin/tgui --ci
diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh
index 44a00adb9f..c2d1bd5b49 100755
--- a/tools/ci/check_grep.sh
+++ b/tools/ci/check_grep.sh
@@ -92,6 +92,10 @@ if ls _maps/*.json | grep -P "[A-Z]"; then
     echo "Uppercase in a map json detected, these must be all lowercase."
     st=1
 fi;
+if grep -i '/obj/effect/mapping_helpers/custom_icon' _maps/**/*.dmm; then
+    echo "Custom icon helper found. Please include dmis as standard assets instead for built-in maps."
+    st=1
+fi;
 for json in _maps/*.json
 do
     map_path=$(jq -r '.map_path' $json)
diff --git a/tools/ci/install_build_tools.sh b/tools/ci/install_build_tools.sh
deleted file mode 100755
index 6c3e267fca..0000000000
--- a/tools/ci/install_build_tools.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-source dependencies.sh
-
-source ~/.nvm/nvm.sh
-nvm install $NODE_VERSION
-nvm use $NODE_VERSION
-npm install --global yarn
-
-pip3 install --user PyYaml
-pip3 install --user beautifulsoup4
diff --git a/tools/ci/install_node.sh b/tools/ci/install_node.sh
new file mode 100755
index 0000000000..c21b8f0110
--- /dev/null
+++ b/tools/ci/install_node.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -euo pipefail
+
+source dependencies.sh
+
+if [[ -e ~/.nvm/nvm.sh ]]; then
+	source ~/.nvm/nvm.sh
+	nvm install $NODE_VERSION
+	nvm use $NODE_VERSION
+fi
diff --git a/tools/ci/run_server.sh b/tools/ci/run_server.sh
index f54c541bf6..4d943846f0 100755
--- a/tools/ci/run_server.sh
+++ b/tools/ci/run_server.sh
@@ -2,7 +2,6 @@
 set -euo pipefail
 
 tools/deploy.sh ci_test
-rm ci_test/*.dll
 mkdir ci_test/config
 
 #test config