Post DDOS Linter Fixes (#7193)

Author: Zandario

code/__HELPERS/lists/merge.dm

@@ -15,7 +15,7 @@
  *
  * TODO: better name
  */
-/proc/merge_double_lazy_assoc_list(list/A, list/B)
+/proc/merge_double_lazy_assoc_list(list/list/A, list/list/B)
 	. = A.Copy()
 	for(var/key in B)
 		if(.[key])
@@ -41,7 +41,7 @@
  *
  * list("A" = list("a", "b", "c", "d"))
  */
-/proc/merge_2_nested_list(list/A, list/B)
+/proc/merge_2_nested_list(list/list/A, list/list/B)
 	. = list()
 	for(var/k1 in A)
 		.[k1] = A[k1].Copy()

tools/ci/download_byond.sh

@@ -3,7 +3,4 @@ set -e
 source dependencies.sh
 
 echo "Downloading BYOND version $BYOND_MAJOR.$BYOND_MINOR"
-DOWNLOAD_URL="http://www.byond.com/download/build/$BYOND_MAJOR/$BYOND_MAJOR.${BYOND_MINOR}_byond.zip"
-echo "Download URL: $DOWNLOAD_URL"
-
-curl --fail -L "$DOWNLOAD_URL" -o C:/byond.zip -A "Citadel-Station-13-RP/1.0 Continuous Integration"
+curl -H "User-Agent: citadelstation/1.0 CI Script" "http://www.byond.com/download/build/$BYOND_MAJOR/$BYOND_MAJOR.${BYOND_MINOR}_byond.zip" -o C:/byond.zip

tools/ci/install/install_byond.sh

@@ -11,7 +11,7 @@ else
   rm -rf "$HOME/BYOND"
   mkdir -p "$HOME/BYOND"
   cd "$HOME/BYOND"
-  curl "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip
+  curl -H "User-Agent: citadelstation/1.0 CI Script" "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip
   unzip byond.zip
   rm byond.zip
   cd byond