From b6126514d293ac5cabad88888a72f3f32b0c9204 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Thu, 20 Jun 2024 00:04:01 +0200 Subject: [PATCH] move asset cache dir (#8530) --- .gitignore | 1 + Dockerfile | 6 +++--- code/modules/asset_cache/asset_list.dm | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 362526241d..05e458bcc8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ vchat.db* #Ignore everything in datafolder and subdirectories /data/**/* /tmp/**/* +/cache/**/* #Ignore byond config folder. /cfg/**/* diff --git a/Dockerfile b/Dockerfile index e143dd1d9c..b1afb1d70f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM i386/ubuntu:xenial as base -ARG BYOND_MAJOR=514 -ARG BYOND_MINOR=1589 +ARG BYOND_MAJOR=515 +ARG BYOND_MINOR=1640 RUN apt-get update \ && apt-get install -y \ @@ -35,7 +35,7 @@ RUN apt-get install -y --no-install-recommends \ gcc-multilib \ && curl https://sh.rustup.rs -sSf | sh -s -- -y --default-host i686-unknown-linux-gnu \ && git init \ - && git remote add origin https://github.com/VOREStation/rust-g + && git remote add origin https://github.com/tgstation/rust-g COPY _build_dependencies.sh . diff --git a/code/modules/asset_cache/asset_list.dm b/code/modules/asset_cache/asset_list.dm index 91dc3cd864..4e070e705c 100644 --- a/code/modules/asset_cache/asset_list.dm +++ b/code/modules/asset_cache/asset_list.dm @@ -1,4 +1,4 @@ -#define ASSET_CROSS_ROUND_CACHE_DIRECTORY "tmp/assets" +#define ASSET_CROSS_ROUND_CACHE_DIRECTORY "cache/assets" //CHOMPEdit, moved there as we clear the tmp folder like TG does //These datums are used to populate the asset cache, the proc "register()" does this. //Place any asset datums you create in asset_list_items.dm