diff --git a/code/__defines/math.dm b/code/__defines/math.dm index f3ad19e1093..f4539605f22 100644 --- a/code/__defines/math.dm +++ b/code/__defines/math.dm @@ -28,8 +28,6 @@ #define ROUND_UP(x) ( -round(-(x))) #define CEILING(x, y) ( -round(-(x) / (y)) * (y) ) -#define ROUND_UP(x) ( -round(-(x))) - // round() acts like floor(x, 1) by default but can't handle other values #define FLOOR(x, y) ( round((x) / (y)) * (y) ) diff --git a/code/modules/ai/ai_holder.dm b/code/modules/ai/ai_holder.dm index 7eef273d638..07186429cd3 100644 --- a/code/modules/ai/ai_holder.dm +++ b/code/modules/ai/ai_holder.dm @@ -64,7 +64,7 @@ // consider sleeping the AI instead. var/process_flags = 0 // Where we're processing, see flag defines. var/list/snapshot = null // A list used in mass-editing of AI datums, holding a snapshot of the 'before' state - var/list/static/fastprocess_stances = list( + var/static/list/fastprocess_stances = list( STANCE_ALERT, STANCE_APPROACH, STANCE_FIGHT, @@ -75,7 +75,7 @@ STANCE_FLEE, STANCE_DISABLED ) - var/list/static/noprocess_stances = list( + var/static/list/noprocess_stances = list( STANCE_SLEEP ) diff --git a/tools/ci/validate_files.sh b/tools/ci/validate_files.sh index c0e3165a285..57c8b332f55 100755 --- a/tools/ci/validate_files.sh +++ b/tools/ci/validate_files.sh @@ -80,6 +80,13 @@ echo -e "${RED}DISABLED" # FAILED=1 # fi +part "improperly pathed static lists" +if $grep -i 'var/list/static/.*' $code_files; then + echo + echo -e "${RED}ERROR: Found incorrect static list definition 'var/list/static/', it should be 'var/static/list/' instead.${NC}" + st=1 +fi; + part "changelog" #Checking for a change to html/changelogs/example.yml md5sum -c - <<< "ea467b7b75774b41ecdf35e07091d96f *html/changelogs/example.yml"