From fc76eca85ff8460fe56c48205e08fa78d2f59be7 Mon Sep 17 00:00:00 2001
From: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
Date: Sun, 21 Jul 2024 02:06:38 -0500
Subject: [PATCH 1/3] tools updates

unmirrored changes:
- We don't yet have our sql schema
- ticked files are handled by pr extra inventory pr
- we haven't yet use the repath for maps (is it even necessary? I mean... vscode search exists-)
- I have no idea how the github webhook prepocessor works
---
 .github/workflows/ci_suite.yml                |  1 +
 modular_zzplurt/tools/ci/splurt_check_grep.sh | 12 +++++++
 tools/build/build.js                          |  1 +
 .../schemas/modular_splurt.json               |  7 ++++
 .../schemas/tgstation_dme.json                |  3 +-
 tools/trait_validity/check.py                 | 34 +++++++++++++++++++
 6 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 modular_zzplurt/tools/ci/splurt_check_grep.sh
 create mode 100644 tools/ticked_file_enforcement/schemas/modular_splurt.json

diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
index 216111097fe51..e379cade75a2f 100644
--- a/.github/workflows/ci_suite.yml
+++ b/.github/workflows/ci_suite.yml
@@ -74,6 +74,7 @@ jobs:
         run: |
           bash tools/ci/check_grep.sh
           bash skyrat/tools/skyrat_check_grep.sh # SKYRAT EDIT ADDITION - checking modular_skyrat code
+          bash modular_zzplurt/tools/ci/splurt_check_grep.sh # SPLURT EDIT ADDITION - checking modular_zzplurt code
       - name: Ticked File Enforcement
         if: steps.linter-setup.conclusion == 'success' && !cancelled()
         run: |
diff --git a/modular_zzplurt/tools/ci/splurt_check_grep.sh b/modular_zzplurt/tools/ci/splurt_check_grep.sh
new file mode 100644
index 0000000000000..c44413866512d
--- /dev/null
+++ b/modular_zzplurt/tools/ci/splurt_check_grep.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+#ANSI Escape Codes for colors to increase contrast of errors
+RED="\033[0;31m"
+GREEN="\033[0;32m"
+BLUE="\033[0;34m"
+NC="\033[0m" # No Color
+
+echo -e "${BLUE}Re-running grep checks, but looking in modular_zzplurt...${NC}"
+
+# Run the linters again, but modular splurt code.
+sed "s|code/\*\*/\*\.dm|modular_zzplurt/\*\*/\*\.dm|g" <tools/ci/check_grep.sh | bash
diff --git a/tools/build/build.js b/tools/build/build.js
index 4fc11929d7428..cc2e8b0443425 100644
--- a/tools/build/build.js
+++ b/tools/build/build.js
@@ -218,6 +218,7 @@ export const DmTarget = new Juke.Target({
     'interface/**',
     'modular_skyrat/**', ///SKYRAT EDIT ADDITION - Making the CBT work
     'modular_zubbers/**', ///BUBBER EDIT ADDITION - Making the CBT work
+    'modular_splurt/**', ///SPLURT EDIT ADDITION - Making the CBT work
     `${DME_NAME}.dme`,
     NamedVersionFile,
   ],
diff --git a/tools/ticked_file_enforcement/schemas/modular_splurt.json b/tools/ticked_file_enforcement/schemas/modular_splurt.json
new file mode 100644
index 0000000000000..f39f8ca83962c
--- /dev/null
+++ b/tools/ticked_file_enforcement/schemas/modular_splurt.json
@@ -0,0 +1,7 @@
+{
+	"file": "tgstation.dme",
+	"scannable_directory": "modular_zzplurt/",
+	"subdirectories": true,
+	"excluded_files": [],
+	"forbidden_includes": []
+}
diff --git a/tools/ticked_file_enforcement/schemas/tgstation_dme.json b/tools/ticked_file_enforcement/schemas/tgstation_dme.json
index d55457e8b4ab4..e457e0555d3e7 100644
--- a/tools/ticked_file_enforcement/schemas/tgstation_dme.json
+++ b/tools/ticked_file_enforcement/schemas/tgstation_dme.json
@@ -6,6 +6,7 @@
 	"forbidden_includes": [
 		"code/modules/tgs/**/*.dm",
 		"code/modules/unit_tests/[!_]*.dm",
-		"code/modules/unit_tests/~skyrat/[!_]*.dm"
+		"code/modules/unit_tests/~skyrat/[!_]*.dm",
+		"code/modules/unit_tests/~splurt/[!_]*.dm"
 	]
 }
diff --git a/tools/trait_validity/check.py b/tools/trait_validity/check.py
index 1f83559d4e9b8..b67b1143ae592 100644
--- a/tools/trait_validity/check.py
+++ b/tools/trait_validity/check.py
@@ -15,6 +15,7 @@ def red(text):
 
 defines_file = "code/__DEFINES/traits/declarations.dm"
 skyrat_defines_file = "code/__DEFINES/~skyrat_defines/traits/declarations.dm" # SKYRAT EDIT ADDITION
+splurt_defines_file = "code/__DEFINES/~~~splurt_defines/traits/declarations.dm" # SPLURT EDIT ADDITION
 globalvars_file = "code/_globalvars/traits/_traits.dm"
 
 how_to_fix_message = f"Please ensure that all traits in the {defines_file} file are added in the {globalvars_file} file."
@@ -37,6 +38,12 @@ def post_error(define_name):
 	sys.exit(1)
 # SKYRAT EDIT ADDITION END
 
+# SPLURT EDIT ADDITION START
+if not os.path.isfile(splurt_defines_file):
+	print(red(f"Could not find the splurt defines file '{splurt_defines_file}'!"))
+	sys.exit(1)
+# SPLURT EDIT ADDITION END
+
 if not os.path.isfile(globalvars_file):
 	print(red(f"Could not find the globalvars file '{globalvars_file}'!"))
 	sys.exit(1)
@@ -96,6 +103,33 @@ def post_error(define_name):
 	defines_to_search_for.append(match.group(2))
 # SKYRAT EDIT ADDITION END
 
+# SPLURT EDIT ADDITION START
+scannable_lines = []
+with open(splurt_defines_file, 'r') as file:
+	reading = False
+
+	for line in file:
+		line = line.strip()
+
+		if line == "// BEGIN TRAIT DEFINES":
+			reading = True
+			continue
+		elif line == "// END TRAIT DEFINES":
+			break
+		elif not reading:
+			continue
+
+		scannable_lines.append(line)
+
+for potential_define in scannable_lines:
+	match = define_regex.match(potential_define)
+	if not match:
+		continue
+
+	number_of_defines += 1
+	defines_to_search_for.append(match.group(2))
+# SPLURT EDIT ADDITION END
+
 if number_of_defines == 0:
 	print(red("No defines found! This is likely an error."))
 	sys.exit(1)

From 4b91898bfc2230a8e23d7ab130e5dd0498260919 Mon Sep 17 00:00:00 2001
From: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
Date: Tue, 23 Jul 2024 16:14:24 -0500
Subject: [PATCH 2/3] Update github_webhook_processor.php

---
 tools/WebhookProcessor/github_webhook_processor.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/WebhookProcessor/github_webhook_processor.php b/tools/WebhookProcessor/github_webhook_processor.php
index 0aea0a6cc691c..1b34c294e0414 100644
--- a/tools/WebhookProcessor/github_webhook_processor.php
+++ b/tools/WebhookProcessor/github_webhook_processor.php
@@ -48,7 +48,10 @@
 	"tgstation",
 	"TerraGov-Marine-Corps",
 	// ORIGINAL END - SKYRAT EDIT: */
-	"Skyrat-tg",
+	// SPLURT EDIT - We'll use our repo
+	//"Skyrat-tg",
+	"S.P.L.U.R.T-tg",
+	// SPLURT EDIT END
 );
 
 // Any repository that matches in this blacklist will not appear on Discord.

From c4e9252ab2508989e4a4df0dec9c07e287115c2a Mon Sep 17 00:00:00 2001
From: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
Date: Tue, 23 Jul 2024 16:42:20 -0500
Subject: [PATCH 3/3] adds the file

adds a blank declarations.dm
---
 code/__DEFINES/~~~splurt_defines/traits/declarations.dm | 0
 tgstation.dme                                           | 1 +
 2 files changed, 1 insertion(+)
 create mode 100644 code/__DEFINES/~~~splurt_defines/traits/declarations.dm

diff --git a/code/__DEFINES/~~~splurt_defines/traits/declarations.dm b/code/__DEFINES/~~~splurt_defines/traits/declarations.dm
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/tgstation.dme b/tgstation.dme
index b9379a5593cc8..d5f0cbc89fa2b 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -508,6 +508,7 @@
 #include "code\__DEFINES\~~bubber_defines\transport.dm"
 #include "code\__DEFINES\~~bubber_defines\___HELPERS\global_lists.dm"
 #include "code\__DEFINES\~~bubber_defines\research\techweb_nodes.dm"
+#include "code\__DEFINES\~~~splurt_defines\traits\declarations.dm"
 #include "code\__HELPERS\_auxtools_api.dm"
 #include "code\__HELPERS\_lists.dm"
 #include "code\__HELPERS\_planes.dm"