diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
index aaa87fd6d3..4f26fbbe43 100644
--- a/.github/workflows/ci_suite.yml
+++ b/.github/workflows/ci_suite.yml
@@ -8,6 +8,7 @@ on:
     - master
 jobs:
   run_linters:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Run Linters
     runs-on: ubuntu-latest
     steps:
@@ -40,6 +41,7 @@ jobs:
           outputFile: output-annotations.txt
 
   compile_all_maps:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Compile Maps
     runs-on: ubuntu-latest
     steps:
@@ -56,6 +58,7 @@ jobs:
           python3 tools/ci/template_dm_generator.py
           bash tools/ci/dm.sh -DCIBUILDING -DCITESTING -DALL_MAPS tgstation.dme
   run_all_tests:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Integration Tests
     runs-on: ubuntu-latest
     services:
@@ -93,6 +96,7 @@ jobs:
           bash tools/ci/dm.sh -DCIBUILDING tgstation.dme
           bash tools/ci/run_server.sh
   test_windows:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Windows Build
     runs-on: windows-latest
     steps:
diff --git a/.github/workflows/generate_documentation.yml b/.github/workflows/generate_documentation.yml
index 9407693d4f..d0d61be073 100644
--- a/.github/workflows/generate_documentation.yml
+++ b/.github/workflows/generate_documentation.yml
@@ -5,6 +5,7 @@ on:
     - master
 jobs:
   generate_documentation:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh
index 8fe8d1db2b..c02a4dfe7e 100755
--- a/tools/ci/check_grep.sh
+++ b/tools/ci/check_grep.sh
@@ -31,15 +31,11 @@ fi;
 #     echo "ERROR: d1/d2 cable variables detected in maps, please remove them."
 #     st=1
 # fi;
-echo "Checking for pixel_[xy]"
-if grep -P 'pixel_[xy] = 0' _maps/**/*.dmm;	then
-    echo "pixel_x/pixel_y = 0 variables detected in maps, please review to ensure they are not dirty varedits."
+echo "Checking for stacked cables"
+if grep -P '"\w+" = \(\n([^)]+\n)*/obj/structure/cable,\n([^)]+\n)*/obj/structure/cable,\n([^)]+\n)*/area/.+\)' _maps/**/*.dmm;	then
+    echo "found multiple cables on the same tile, please remove them."
+    st=1
 fi;
-# echo "Checking for stacked cables"
-# if grep -P '"\w+" = \(\n([^)]+\n)*/obj/structure/cable,\n([^)]+\n)*/obj/structure/cable,\n([^)]+\n)*/area/.+\)' _maps/**/*.dmm;	then
-#     echo "found multiple cables on the same tile, please remove them."
-#     st=1
-# fi;
 if grep -P '^/area/.+[\{]' _maps/**/*.dmm;	then
     echo "ERROR: Vareditted /area path use detected in maps, please replace with proper paths."
     st=1