tgui

tgui update
SPLURT-Station · Mar 13, 2024 · 29b862c · 29b862c
1 parent 70fab82
commit 29b862c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/tgui/packages/tgui-dev-server/dreamseeker.js b/tgui/packages/tgui-dev-server/dreamseeker.js
@@ -28,6 +28,9 @@ export class DreamSeeker {
       .map(key => encodeURIComponent(key)
         + '=' + encodeURIComponent(params[key]))
       .join('&');
+    logger.log(
+      `topic call at ${this.client.defaults.baseURL + '/dummy?' + query}`
+    );
     return this.client.get('/dummy?' + query);
   }
 }

diff --git a/tgui/packages/tgui-dev-server/reloader.js b/tgui/packages/tgui-dev-server/reloader.js
@@ -67,8 +67,6 @@ export const findCacheRoot = async () => {
 
 const onCacheRootFound = cacheRoot => {
   logger.log(`found cache at '${cacheRoot}'`);
-  // Plant a dummy
-  fs.closeSync(fs.openSync(cacheRoot + '/dummy', 'w'));
 };
 
 export const reloadByondCache = async bundleDir => {
@@ -93,6 +91,9 @@ export const reloadByondCache = async bundleDir => {
     // Clear garbage
     const garbage = await resolveGlob(cacheDir, './*.+(bundle|chunk|hot-update).*');
     try {
+      // Plant a dummy browser window file, we'll be using this to avoid world topic
+      fs.closeSync(fs.openSync(cacheRoot + '/dummy', 'w'));
+
       for (let file of garbage) {
         fs.unlinkSync(file);
       }

diff --git a/tgui/public/tgui.html b/tgui/public/tgui.html
@@ -48,8 +48,9 @@
   // Basic checks to detect whether this page runs in BYOND
   var isByond = (tridentVersion !== null || window.cef_to_byond)
     && location.hostname === '127.0.0.1'
-    && location.pathname.indexOf('/tmp') === 0
     && location.search !== '?external';
+    //As of BYOND 515 the path doesn't seem to include tmp dir anymore if you're trying to open tgui in external browser and looking why it doesn't work
+    //&& location.pathname.indexOf('/tmp') === 0
 
   // Version constants
   Byond.IS_BYOND = isByond;
@@ -202,6 +203,8 @@
     var len = styleSheets.length;
     for (var i = 0; i < len; i++) {
       var styleSheet = styleSheets[i];
+      if(styleSheet.href === undefined)
+        continue;
       if (styleSheet.href.indexOf(url) !== -1) {
         return styleSheet.rules.length > 0;
       }

diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh
@@ -117,4 +117,11 @@ do
     done < <(jq -r '[.map_file] | flatten | .[]' $json)
 done
 
+# Check for non-515 compatable .proc/ syntax
+if grep -P --exclude='__byond_version_compat.dm' '\.proc/' code/**/*.dm; then
+    echo
+    echo -e "${RED}ERROR: Outdated proc reference use detected in code, please use proc reference helpers.${NC}"
+    st=1
+fi;
+
 exit $st