CBT again (#408)

* CBT once again

* changelog

* preprocessor

* checksum

* changelog

* perms

* yarn

* Interview, sdql and stat panel

* new player panel

* atmos

* sound repaths and deploy.sh

.github/workflows/ci_suite.yml

@@ -6,44 +6,36 @@ on:
   pull_request:
     branches:
     - master
-
-env: 
-  target: i686-unknown-linux-gnu
-  toolchain: stable-i686-unknown-linux-gnu
-
 jobs:
   run_linters:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Run Linters
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-
       - name: Setup cache
         uses: actions/cache@v2
         with:
-          path: $HOME/SpacemanDMM
-          key: ${{ runner.os }}-spacemandmm
-
+          path: ~/SpacemanDMM
+          key: ${{ runner.os }}-spacemandmm-${{ secrets.CACHE_PURGE_KEY }}
       - name: Install Tools
         run: |
           pip3 install setuptools
           bash tools/ci/install_node.sh
           bash tools/ci/install_spaceman_dmm.sh dreamchecker
           tools/bootstrap/python -c ''
-
       - name: Run Linters
         run: |
           bash tools/ci/check_filedirs.sh fortune13.dme
           bash tools/ci/check_changelogs.sh
           find . -name "*.php" -print0 | xargs -0 -n1 php -l
           find . -name "*.json" -not -path "*/node_modules/*" -print0 | xargs -0 python3 ./tools/json_verifier.py
           tgui/bin/tgui --lint
+          tgui/bin/tgui --test
           bash tools/ci/check_grep.sh
           tools/bootstrap/python -m dmi.test
           tools/bootstrap/python -m mapmerge2.dmm_test
           ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
-
       - name: Annotate Lints
         uses: yogstation13/DreamAnnotate@v1
         if: always()
@@ -56,20 +48,17 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-
       - name: Setup cache
         uses: actions/cache@v2
         with:
-          path: $HOME/BYOND
-          key: ${{ runner.os }}-byond
-
+          path: ~/BYOND
+          key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
       - name: Compile All Maps
         run: |
           bash tools/ci/install_byond.sh
           source $HOME/BYOND/byond/bin/byondsetup
           python3 tools/ci/template_dm_generator.py
-          tgui/bin/tgui --build
-          bash tools/ci/dm.sh -DCIBUILDING -DCITESTING -DALL_MAPS fortune13.dme
+          tools/build/build dm -DCIBUILDING -DCITESTING -DALL_MAPS
 
   auxtools_tg:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
@@ -190,7 +179,6 @@ jobs:
   run_all_tests:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Integration Tests
-    needs: [auxtools_tg, auxmos]
     runs-on: ubuntu-20.04
     services:
       mysql:
@@ -202,51 +190,29 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
       - uses: actions/checkout@v2
-
       - name: Setup cache
         uses: actions/cache@v2
         with:
-          path: $HOME/BYOND
-          key: ${{ runner.os }}-byond
-
+          path: ~/BYOND
+          key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
       - name: Setup database
         run: |
           sudo systemctl start mysql
           mysql -u root -proot -e 'CREATE DATABASE tg_ci;'
           mysql -u root -proot tg_ci < SQL/tgstation_schema.sql
           mysql -u root -proot -e 'CREATE DATABASE tg_ci_prefixed;'
           mysql -u root -proot tg_ci_prefixed < SQL/tgstation_schema_prefixed.sql
-
-      - name: Install ubuntu dependencies
+      - name: Install rust-g
         run: |
           sudo dpkg --add-architecture i386
           sudo apt update || true
-          sudo apt install gcc-multilib
-          sudo apt install g++-7
-          sudo apt install g++-7-multilib
-
-      - name: Install rust-g
-        run: |
-          sudo apt install zlib1g:i386
-          sudo apt install libssl1.1:i386
+          sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
           bash tools/ci/install_rust_g.sh
-
-      - name: Download auxtools_tg library
-        uses: actions/download-artifact@v2
-        with:
-          name: libauxtools_tg
-
-      - name: Download libauxmos library
-        uses: actions/download-artifact@v2
-        with:
-          name: libauxmos
-
       - name: Compile and run tests
         run: |
           bash tools/ci/install_byond.sh
           source $HOME/BYOND/byond/bin/byondsetup
-          tgui/bin/tgui --build
-          bash tools/ci/dm.sh -DCIBUILDING fortune13.dme
+          tools/build/build -DCIBUILDING
           bash tools/ci/run_server.sh
 
   test_windows:
@@ -257,3 +223,14 @@ jobs:
       - uses: actions/checkout@v2
       - name: Compile
         run: pwsh tools/ci/build.ps1
+        env:
+          DM_EXE: "C:\\byond\\bin\\dm.exe"
+      - name: Create artifact
+        run: |
+          md deploy
+          bash tools/deploy.sh ./deploy
+      - name: Deploy artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: deploy
+          path: deploy

.gitignore

@@ -7,6 +7,9 @@
 #Ignore byond config folder.
 /cfg/**/*
 
+# Ignore compiled linux libs in the root folder, e.g. librust_g.so
+/*.so
+
 #Ignore compiled files and other files generated during compilation.
 *.mdme
 *.dmb
@@ -49,36 +52,14 @@ __pycache__/
 *.py[cod]
 *$py.class
 
-# C extensions
-#*.so
-
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
 *.spec
 
 # Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
+pip-*.txt
 
 # Unit test / coverage reports
 htmlcov/
@@ -88,7 +69,6 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
-*,cover
 .hypothesis/
 
 # Translations
@@ -97,20 +77,13 @@ coverage.xml
 
 # Django stuff:
 *.log
-local_settings.py
-
-# Flask instance folder
-instance/
 
 # Scrapy stuff:
 .scrapy
 
 # Sphinx documentation
 docs/_build/
 
-# PyBuilder
-target/
-
 # IPython Notebook
 .ipynb_checkpoints
 
@@ -123,10 +96,6 @@ celerybeat-schedule
 # dotenv
 .env
 
-# virtualenv
-venv/
-ENV/
-
 # IntelliJ IDEA / PyCharm (with plugin)
 .idea
 
@@ -149,12 +118,6 @@ Desktop.ini
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
 
-# Windows Installer files
-#*.cab
-#*.msi
-#*.msm
-#*.msp
-
 # Windows shortcuts
 *.lnk
 
@@ -195,16 +158,38 @@ Temporary Items
 
 #Visual studio stuff
 *.vscode/*
-!/.vscode/extensions.json
-tools/MapAtmosFixer/MapAtmosFixer/obj/*
-tools/MapAtmosFixer/MapAtmosFixer/bin/*
+/tools/MapAtmosFixer/MapAtmosFixer/obj/*
+/tools/MapAtmosFixer/MapAtmosFixer/bin/*
+/tools/CreditsTool/bin/*
+/tools/CreditsTool/obj/*
 
 #GitHub Atom
 .atom-build.json
 
-#Jukebox audio files
-/config/jukebox_music/**/*
+#KDevelop and Kate
+*.kdev4*
+*.kate-swp
 
 #extra map stuff
 /_maps/**/backup/
 /_maps/templates.dm
+
+#dmdoc default folder
+/dmdoc
+
+# Ignore custom music and title screens (amend as appropriate)
+/config/jukebox_music/sounds/*
+!/config/jukebox_music/sounds/exclude
+/config/title_music/sounds/*
+!/config/title_music/sounds/exclude
+/config/title_screens/images/*
+!/config/title_screens/images/exclude
+
+#Linux docker
+/tools/LinuxOneShot/SetupProgram/obj/*
+/tools/LinuxOneShot/SetupProgram/bin/*
+/tools/LinuxOneShot/SetupProgram/.vs
+/tools/LinuxOneShot/Database
+/tools/LinuxOneShot/TGS_Config
+/tools/LinuxOneShot/TGS_Instances
+/tools/LinuxOneShot/TGS_Logs

.tgs4.yml

@@ -0,0 +1,8 @@
+static_files:
+  - name: config
+    populate: true
+  - name: data
+linux_scripts:
+  PreCompile.sh: tools/tgs4_scripts/PreCompile.sh
+windows_scripts:
+  PreCompile.bat: tools/tgs4_scripts/PreCompile.bat

BUILD.bat

@@ -0,0 +1,3 @@
+@echo off
+call "%~dp0\tools\build\build.bat" %*
+pause

Dockerfile

@@ -1,4 +1,4 @@
-FROM tgstation/byond:513.1536	 as base
+FROM fortune13/byond:513.1536	 as base
 
 FROM base as rust_g
 
@@ -27,7 +27,7 @@ RUN /bin/bash -c "source dependencies.sh \
 
 FROM base as dm_base
 
-WORKDIR /tgstation
+WORKDIR /fortune13
 
 FROM dm_base as build
 
@@ -57,6 +57,6 @@ RUN apt-get update \
 COPY --from=rust_g /rust_g/target/release/librust_g.so /root/.byond/bin/rust_g
 COPY --from=build /deploy ./
 
-VOLUME [ "/tgstation/config", "/tgstation/data" ]
+VOLUME [ "/fortune13/config", "/fortune13/data" ]
 
 ENTRYPOINT [ "DreamDaemon", "fortune13.dmb", "-port", "1337", "-trusted", "-close", "-verbose" ]

citadel/tools/merge-upstream-pull-request.sh

@@ -12,7 +12,7 @@ set -f # disable pathname expansion
 set -C # noclobber
 
 readonly BASE_BRANCH_NAME="upstream-merge-"
-readonly BASE_PULL_URL="https://api.github.com/repos/tgstation/tgstation/pulls"
+readonly BASE_PULL_URL="https://api.github.com/repos/nokele/Fortune13/pulls"
 
 # Ensure the current directory is a git directory
 if [ ! -d .git ]; then
@@ -40,8 +40,8 @@ containsElement () {
 }
 
 # Make sure we have our upstream remote
-if ! git remote | grep tgstation > /dev/null; then
-   git remote add tgstation https://github.com/tgstation/tgstation.git
+if ! git remote | grep nokele > /dev/null; then
+   git remote add nokele https://github.com/nokele/Fortune13.git
 fi
 
 curl -v \

code/__DEFINES/preferences.dm

@@ -15,6 +15,8 @@
 #define DISABLE_DEATHRATTLE		(1<<12)
 #define DISABLE_ARRIVALRATTLE	(1<<13)
 #define COMBOHUD_LIGHTING		(1<<14)
+// Gap in prefs between tg and fortune13 prefs.
+#define SPLIT_ADMIN_TABS (1<<23)
 
 #define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS)