Revert "[TGUI] Asset Cache Update (discordia-space#7093)" (discordia-…

…space#7421)

This reverts commit d58cfdc.

.gitconfig

@@ -0,0 +1,8 @@
+[merge "merge-dmm"]
+    name = mapmerge driver
+    driver = ./tools/mapmerger/mapmerge.sh %O %A %B
+    recursive = text
+
+[merge "merge-dmi"]
+	name = iconfile merge driver
+	driver = ./tools/dmitool/dmimerge.sh %O %A %B

.github/workflows/ci_suite.yml

@@ -13,20 +13,11 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - name: Restore SpacemanDMM cache
-        uses: actions/cache@v3
+      - name: Setup cache
+        uses: actions/cache@v2
         with:
-          path: ~/SpacemanDMM
-          key: ${{ runner.os }}-spacemandmm-${{ secrets.CACHE_PURGE_KEY }}
-      # - name: Restore Yarn cache
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: tgui/.yarn/cache
-      #     key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-build-${{ secrets.CACHE_PURGE_KEY }}-
-      #       ${{ runner.os }}-build-
-      #       ${{ runner.os }}-
+          path: $HOME/SpacemanDMM
+          key: ${{ runner.os }}-spacemandmm
       - name: Install Tools
         run: |
           pip3 install setuptools
@@ -37,7 +28,6 @@ jobs:
         run: |
           bash tools/ci/check_filedirs.sh cev_eris.dme
           bash tools/ci/check_grep.sh
-          bash tools/ci/check_misc.sh
           tools/bootstrap/python -m dmi.test
           tools/bootstrap/python -m mapmerge2.dmm_test
           ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
@@ -53,17 +43,17 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - name: Restore BYOND cache
-        uses: actions/cache@v3
+      - name: Setup cache
+        uses: actions/cache@v2
         with:
-          path: ~/BYOND
-          key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
+          path: $HOME/BYOND
+          key: ${{ runner.os }}-byond
       - name: Compile All Maps
         run: |
           bash tools/ci/install_byond.sh
           source $HOME/BYOND/byond/bin/byondsetup
-          tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS
-
+          python3 tools/ci/template_dm_generator.py
+          tools/build/build dm -DCIBUILDING -DCITESTING -DALL_MAPS
   run_all_tests:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Integration Tests
@@ -78,11 +68,11 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
       - uses: actions/checkout@v2
-      - name: Restore BYOND cache
-        uses: actions/cache@v3
+      - name: Setup cache
+        uses: actions/cache@v2
         with:
-          path: ~/BYOND
-          key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
+          path: $HOME/BYOND
+          key: ${{ runner.os }}-byond
       - name: Setup database
         run: |
           sudo systemctl start mysql
@@ -94,31 +84,18 @@ jobs:
           sudo apt update || true
           sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
           bash tools/ci/install_rust_g.sh
-      - name: Compile Tests
+      - name: Compile and run tests
         run: |
           bash tools/ci/install_byond.sh
           source $HOME/BYOND/byond/bin/byondsetup
-          tools/build/build --ci dm -DCIBUILDING -DANSICOLORS
-      - name: Run Tests
-        run: |
-          source $HOME/BYOND/byond/bin/byondsetup
-          bash tools/ci/run_server.sh ${{ matrix.map }}
-
+          tools/build/build -DCIBUILDING
+          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:
       - uses: actions/checkout@v2
-      - name: Restore Yarn cache
-        uses: actions/cache@v3
-        with:
-          path: tgui/.yarn/cache
-          key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ secrets.CACHE_PURGE_KEY }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
       - name: Compile
         run: pwsh tools/ci/build.ps1
         env:

.github/workflows/conflicts.yml

@@ -11,4 +11,3 @@ jobs:
         with:
           CONFLICT_LABEL_NAME: 'Merge Conflict'
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          WAIT_MS: 10000

.github/workflows/generate_documentation.yml

@@ -3,30 +3,24 @@ on:
   push:
     branches:
     - master
-permissions:
-  contents: read
-
 jobs:
   generate_documentation:
-    permissions:
-      contents: write  # for JamesIves/github-pages-deploy-action to push changes in repo
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     runs-on: ubuntu-20.04
-    concurrency: gen-docs
     steps:
       - uses: actions/checkout@v2
       - name: Setup cache
         uses: actions/cache@v2
         with:
-          path: ~/SpacemanDMM
-          key: ${{ runner.os }}-spacemandmm-${{ secrets.CACHE_PURGE_KEY }}
+          path: $HOME/SpacemanDMM
+          key: ${{ runner.os }}-spacemandmm
       - name: Install SpacemanDMM
         run: bash tools/ci/install_spaceman_dmm.sh dmdoc
       - name: Generate documentation
         run: |
           ~/dmdoc
           touch dmdoc/.nojekyll
-          echo codedocs.cev-eris.net > dmdoc/CNAME
+          echo codedocs.tgstation13.org > dmdoc/CNAME
       - name: Deploy
         uses: JamesIves/[email protected]
         with:

.gitignore

@@ -16,11 +16,8 @@
 
 #Ignore compiled files and other files generated during compilation.
 *.mdme
-*.mdme.*
 *.dmb
 *.rsc
-*.m.dme
-*.test.dme
 *.lk
 *.int
 *.backup

BUILD.bat

@@ -0,0 +1,2 @@
+@call "%~dp0\tools\build\build"
+@pause

SpacemanDMM.toml

@@ -1,14 +1,5 @@
-environment = "cev_eris.dme"
-
-[langserver]
-dreamchecker = true
-
-[code_standards]
-# disallow_relative_type_definitions = true
-# disallow_relative_proc_definitions = true
-
-[dmdoc]
-use_typepath_names = true
-
-[debugger]
-engine = "auxtools"
+[langserver]
+dreamchecker = true
+
+[debugger]
+engine = "auxtools"

cev_eris.dme

@@ -62,7 +62,6 @@
 #include "code\__DEFINES\reagents.dm"
 #include "code\__DEFINES\research.dm"
 #include "code\__DEFINES\rust_g.dm"
-#include "code\__DEFINES\rust_g_overrides.dm"
 #include "code\__DEFINES\sanity.dm"
 #include "code\__DEFINES\shields.dm"
 #include "code\__DEFINES\spaceman_dmm.dm"
@@ -72,7 +71,6 @@
 #include "code\__DEFINES\subsystems-priority.dm"
 #include "code\__DEFINES\subsystems.dm"
 #include "code\__DEFINES\targeting.dm"
-#include "code\__DEFINES\tgui.dm"
 #include "code\__DEFINES\tick.dm"
 #include "code\__DEFINES\time.dm"
 #include "code\__DEFINES\tools_and_qualities.dm"
@@ -87,7 +85,6 @@
 #include "code\__DEFINES\spawner\frozen_star.dm"
 #include "code\__HELPERS\_global_objects.dm"
 #include "code\__HELPERS\_lists.dm"
-#include "code\__HELPERS\_logging.dm"
 #include "code\__HELPERS\antag.dm"
 #include "code\__HELPERS\areas.dm"
 #include "code\__HELPERS\artwork_names.dm"
@@ -101,6 +98,7 @@
 #include "code\__HELPERS\game.dm"
 #include "code\__HELPERS\global_lists.dm"
 #include "code\__HELPERS\icons.dm"
+#include "code\__HELPERS\logging.dm"
 #include "code\__HELPERS\manifest.dm"
 #include "code\__HELPERS\matrices.dm"
 #include "code\__HELPERS\mobs.dm"
@@ -214,7 +212,6 @@
 #include "code\controllers\evacuation\~evac.dm"
 #include "code\controllers\subsystems\air.dm"
 #include "code\controllers\subsystems\alarm.dm"
-#include "code\controllers\subsystems\assets.dm"
 #include "code\controllers\subsystems\atoms.dm"
 #include "code\controllers\subsystems\chat.dm"
 #include "code\controllers\subsystems\chemistry.dm"
@@ -1411,11 +1408,6 @@
 #include "code\modules\assembly\signaler.dm"
 #include "code\modules\assembly\timer.dm"
 #include "code\modules\assembly\voice.dm"
-#include "code\modules\asset_cache\asset_cache_client.dm"
-#include "code\modules\asset_cache\asset_cache_item.dm"
-#include "code\modules\asset_cache\asset_list.dm"
-#include "code\modules\asset_cache\asset_list_items.dm"
-#include "code\modules\asset_cache\transports\asset_transport.dm"
 #include "code\modules\biomatter_manipulation\biogenerator.dm"
 #include "code\modules\biomatter_manipulation\solidifier.dm"
 #include "code\modules\biomatter_manipulation\toxic_biomass.dm"
@@ -1433,18 +1425,7 @@
 #include "code\modules\cargo\order.dm"
 #include "code\modules\cargo\packs.dm"
 #include "code\modules\cargo\supplyshuttle.dm"
-#include "code\modules\cargo\exports\gear.dm"
-#include "code\modules\cargo\exports\large_objects.dm"
-#include "code\modules\cargo\exports\manifest.dm"
-#include "code\modules\cargo\exports\medical_shit.dm"
-#include "code\modules\cargo\exports\misc.dm"
-#include "code\modules\cargo\exports\money.dm"
-#include "code\modules\cargo\exports\parts.dm"
-#include "code\modules\cargo\exports\research.dm"
-#include "code\modules\cargo\exports\rnd_shit.dm"
-#include "code\modules\cargo\exports\sheets.dm"
-#include "code\modules\cargo\exports\tools.dm"
-#include "code\modules\cargo\exports\weapons.dm"
+#include "code\modules\client\asset_cache.dm"
 #include "code\modules\client\client procs.dm"
 #include "code\modules\client\client_defines.dm"
 #include "code\modules\client\darkmode.dm"
@@ -1678,6 +1659,7 @@
 #include "code\modules\genetics\stationary_scanner.dm"
 #include "code\modules\genetics\stationary_scanner_console.dm"
 #include "code\modules\ghosttrap\trap.dm"
+#include "code\modules\goonchat\assets.dm"
 #include "code\modules\goonchat\browserOutput.dm"
 #include "code\modules\goonchat\helpers.dm"
 #include "code\modules\hivemind\core.dm"

code/__DEFINES/admin.dm

@@ -46,24 +46,3 @@
 #define ADMIN_VV(atom) "(<a href='?_src_=vars;Vars=[REF(atom)]'>VV</a>)"
 #define ADMIN_SM(user) "(<a href='?_src_=holder;subtlemessage=[REF(user)]'>SM</a>)"
 #define ADMIN_TP(user) "(<a href='?_src_=holder;traitor=[REF(user)]'>TP</a>)"
-
-#define ADMIN_JMP(src) "(<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)"
-#define COORD(src) "[src ? src.Admin_Coordinates_Readable() : "nonexistent location"]"
-
-/atom/proc/Admin_Coordinates_Readable(area_name, admin_jump_ref)
-	var/turf/T = Safe_COORD_Location()
-	return T ? "[area_name ? "[get_area_name_litteral(T, TRUE)] " : " "]([T.x],[T.y],[T.z])[admin_jump_ref ? " [ADMIN_JMP(T)]" : ""]" : "nonexistent location"
-
-/atom/proc/Safe_COORD_Location()
-	var/atom/A = drop_location()
-	if(!A)
-		return //not a valid atom.
-	var/turf/T = get_step(A, 0) //resolve where the thing is.
-	if(!T) //incase it's inside a valid drop container, inside another container. ie if a mech picked up a closet and has it inside it's internal storage.
-		var/atom/last_try = A.loc?.drop_location() //one last try, otherwise fuck it.
-		if(last_try)
-			T = get_step(last_try, 0)
-	return T
-
-/turf/Safe_COORD_Location()
-	return src

code/__DEFINES/is_helpers.dm

@@ -1,15 +1,6 @@
-// simple is_type and similar inline helpers
-
-#define in_range(source, user) (get_dist(source, user) <= 1 && (get_step(source, 0)?:z) == (get_step(user, 0)?:z))
-
-/// Within given range, but not counting z-levels
-#define IN_GIVEN_RANGE(source, other, given_range) (get_dist(source, other) <= given_range && (get_step(source, 0)?:z) == (get_step(other, 0)?:z))
-
-#define isatom(A) (isloc(A))
 
 #define isweakref(D) (istype(D, /datum/weakref))
 
-
 #define islist(A) istype(A, /list)
 
 #define ismob(A) istype(A, /mob)

code/__DEFINES/misc.dm

@@ -348,8 +348,6 @@
 
 //Prevent the master controller from starting automatically
 #define NO_INIT_PARAMETER "no-init"
-//Force the log directory to be something specific in the data/logs folder
-#define OVERRIDE_LOG_DIRECTORY_PARAMETER "log-directory"
 
 /// Required minimum values to see reagents in a beaker
 #define HUMAN_REQ_COG_FOR_REG 35