Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 22f43e0
Author: Changelogs <[email protected]>
Date:   Thu Sep 28 01:07:45 2023 +0000

    Automatic changelog compile [ci skip]

commit efd790e
Author: Changelog Generation <[email protected]>
Date:   Wed Sep 27 13:06:29 2023 +0000

    Automatic changelog generation for PR DS-13-Dev-Team#164 [ci skip]

commit c41a94c
Author: Changelog Generation <[email protected]>
Date:   Wed Sep 27 13:06:19 2023 +0000

    Automatic changelog generation for PR DS-13-Dev-Team#171 [ci skip]

commit d9cf734
Author: blackwolf602 <[email protected]>
Date:   Wed Sep 27 06:05:52 2023 -0700

    Atmosphertics (DS-13-Dev-Team#164)

commit 0bb3864
Author: MisterGrimm <[email protected]>
Date:   Wed Sep 27 09:05:34 2023 -0400

    Expands things harvester can harvest (DS-13-Dev-Team#171)

commit bd36e97
Author: Changelogs <[email protected]>
Date:   Tue Sep 26 01:08:00 2023 +0000

    Automatic changelog compile [ci skip]

commit cf9b22d
Author: Changelog Generation <[email protected]>
Date:   Mon Sep 25 09:48:27 2023 +0000

    Automatic changelog generation for PR DS-13-Dev-Team#167 [ci skip]

commit 8163591
Author: DTraitor <[email protected]>
Date:   Mon Sep 25 12:47:50 2023 +0300

    Armour Penetration (DS-13-Dev-Team#167)

commit 1df3ba3
Author: Changelogs <[email protected]>
Date:   Mon Sep 25 01:07:58 2023 +0000

    Automatic changelog compile [ci skip]

commit 8fd2152
Author: Changelog Generation <[email protected]>
Date:   Sun Sep 24 03:51:05 2023 +0000

    Automatic changelog generation for PR DS-13-Dev-Team#158 [ci skip]

commit 94419ea
Merge: 2db1a42 d66ee16
Author: blackwolf602 <[email protected]>
Date:   Sat Sep 23 20:49:31 2023 -0700

    Merge pull request DS-13-Dev-Team#158 from chesse20/miningrebalanceattempt

commit 2db1a42
Merge: 1ca7b9d 9ceb22e
Author: blackwolf602 <[email protected]>
Date:   Sat Sep 23 20:48:49 2023 -0700

    Merge pull request DS-13-Dev-Team#169 from MisterGrimm/necro-humanbiofix

commit 1ca7b9d
Author: Changelog Generation <[email protected]>
Date:   Sun Sep 24 03:48:38 2023 +0000

    Automatic changelog generation for PR DS-13-Dev-Team#170 [ci skip]

commit 7025fdd
Merge: 66f8064 d2d85fb
Author: blackwolf602 <[email protected]>
Date:   Sat Sep 23 20:48:00 2023 -0700

    Merge pull request DS-13-Dev-Team#170 from MisterGrimm/pai-be-gone

commit d2d85fb
Author: Sym <[email protected]>
Date:   Sat Sep 23 21:30:10 2023 -0400

    PAI? What PAI?

    Removes PAI from being acquired by normal means.

commit 9ceb22e
Author: Sym <[email protected]>
Date:   Sat Sep 23 16:49:16 2023 -0400

    human bio patch

    patches human bio gain

commit 66f8064
Merge: 30a8e2d 8884f69
Author: DTraitor <[email protected]>
Date:   Fri Sep 22 17:34:48 2023 +0300

    Merge pull request DS-13-Dev-Team#166 from DTraitor/ups

    Sync with upstream

commit 8884f69
Author: DTraitor <[email protected]>
Date:   Fri Sep 22 17:19:13 2023 +0300

    compile fix

commit cd50383
Author: DTraitor <[email protected]>
Date:   Fri Sep 22 17:17:41 2023 +0300

    fixes

commit 624f2f9
Merge: 30a8e2d b8563a9
Author: DTraitor <[email protected]>
Date:   Fri Sep 22 17:16:37 2023 +0300

    Merge remote-tracking branch 'DaedalusDock/master' into ups

commit 30a8e2d
Author: Changelogs <[email protected]>
Date:   Fri Sep 22 01:07:32 2023 +0000

    Automatic changelog compile [ci skip]

commit 426f4cf
Author: Changelog Generation <[email protected]>
Date:   Thu Sep 21 18:54:21 2023 +0000

    Automatic changelog generation for PR DS-13-Dev-Team#165 [ci skip]

commit ef5ba07
Author: MisterGrimm <[email protected]>
Date:   Thu Sep 21 14:53:43 2023 -0400

    Recycable necros, maw fixes (DS-13-Dev-Team#165)

commit a445f3e
Author: Changelog Generation <[email protected]>
Date:   Thu Sep 21 09:13:06 2023 +0000

    Automatic changelog generation for PR DS-13-Dev-Team#162 [ci skip]

commit 775344b
Author: Changelog Generation <[email protected]>
Date:   Thu Sep 21 09:12:32 2023 +0000

    Automatic changelog generation for PR DS-13-Dev-Team#160 [ci skip]

commit a98fbd9
Author: MisterGrimm <[email protected]>
Date:   Thu Sep 21 05:04:17 2023 -0400

    Gives airlock new sound for necro (DS-13-Dev-Team#162)

    Adds a new forcing-hydraulics-open sound for when necros force open airlocks that are powered.

commit ea1d9ae
Author: Polyzonial <[email protected]>
Date:   Thu Sep 21 10:03:46 2023 +0100

    Brute Changes and Fixes(?) (DS-13-Dev-Team#160)

commit f441f21
Author: Changelog Generation <[email protected]>
Date:   Thu Sep 21 09:03:03 2023 +0000

    Automatic changelog generation for PR DS-13-Dev-Team#154 [ci skip]

commit 4b322f2
Author: bestmudad <[email protected]>
Date:   Thu Sep 21 10:59:18 2023 +0200

    Add more necros to nests and Remove Exploder (DS-13-Dev-Team#154)

commit 2fbfe72
Author: Changelog Generation <[email protected]>
Date:   Thu Sep 21 08:58:15 2023 +0000

    Automatic changelog generation for PR DS-13-Dev-Team#156 [ci skip]

commit 273610b
Author: MisterGrimm <[email protected]>
Date:   Thu Sep 21 04:55:24 2023 -0400

    Removes humanoid covers for necromorphs, and changes other covers (DS-13-Dev-Team#156)

commit c52eae6
Author: Changelog Generation <[email protected]>
Date:   Thu Sep 21 08:54:57 2023 +0000

    Automatic changelog generation for PR DS-13-Dev-Team#161 [ci skip]

commit 47deb7a
Author: MisterGrimm <[email protected]>
Date:   Thu Sep 21 04:53:38 2023 -0400

    Turns back on combat mode for necro, fixes hotkey confliction with necro (DS-13-Dev-Team#161)

commit 57b41ce
Author: Gallyus <[email protected]>
Date:   Thu Sep 21 04:51:46 2023 -0400

    Update world.dm (DS-13-Dev-Team#155)

commit 1c55eb6
Author: Changelogs <[email protected]>
Date:   Wed Sep 20 01:07:21 2023 +0000

    Automatic changelog compile [ci skip]

commit 6f505d1
Author: Changelog Generation <[email protected]>
Date:   Tue Sep 19 16:59:02 2023 +0000

    Automatic changelog generation for PR DS-13-Dev-Team#151 [ci skip]

commit b2282ba
Author: DTraitor <[email protected]>
Date:   Tue Sep 19 19:58:21 2023 +0300

    Necromorphs dont feel pain | Limits number of ubermorphs a marker can spawn (DS-13-Dev-Team#151)

commit d30d798
Author: Changelog Generation <[email protected]>
Date:   Tue Sep 19 16:53:01 2023 +0000

    Automatic changelog generation for PR DS-13-Dev-Team#153 [ci skip]

commit 1324695
Author: bestmudad <[email protected]>
Date:   Tue Sep 19 18:51:08 2023 +0200

    Fixed empty pulse rifle clip icon (DS-13-Dev-Team#153)

    Empty pulse rifle clips will now appear properly

commit f143d10
Author: Changelog Generation <[email protected]>
Date:   Tue Sep 19 16:48:20 2023 +0000

    Automatic changelog generation for PR DS-13-Dev-Team#157 [ci skip]

commit efb03ca
Author: blackwolf602 <[email protected]>
Date:   Tue Sep 19 09:47:19 2023 -0700

    Changes (DS-13-Dev-Team#157)

commit 2d35976
Author: Changelog Generation <[email protected]>
Date:   Tue Sep 19 16:42:47 2023 +0000

    Automatic changelog generation for PR DS-13-Dev-Team#159 [ci skip]

commit d5d653b
Author: MisterGrimm <[email protected]>
Date:   Tue Sep 19 12:42:03 2023 -0400

    Sets up burnmod for necros (DS-13-Dev-Team#159)

    Sets up burnmod for the rest of necros, based on 1.0 burn_mod.

commit b8563a9
Author: Changelogs <[email protected]>
Date:   Mon Sep 18 01:08:34 2023 +0000

    Automatic changelog compile [ci skip]

commit d66ee16
Author: chesse20 <[email protected]>
Date:   Sun Sep 17 16:09:33 2023 -0700

    advanced to 9k

commit 91d5b04
Author: chesse20 <[email protected]>
Date:   Sun Sep 17 16:06:37 2023 -0700

    Advanced rig slightly cheaper with increased credits but less than 10% cheaper

commit 73e377c
Author: chesse20 <[email protected]>
Date:   Sun Sep 17 15:39:39 2023 -0700

    less overtuned maybe

commit 22c478c
Author: chesse20 <[email protected]>
Date:   Sun Sep 17 14:15:53 2023 -0700

    buffs mining

commit 17f509a
Author: Changelog Generation <[email protected]>
Date:   Sun Sep 17 15:08:34 2023 -0400

    Automatic changelog generation for PR #615 [ci skip]

commit a71fb16
Author: Kapu1178 <[email protected]>
Date:   Sun Sep 17 15:08:01 2023 -0400

    add mutagen recipe (#615)

commit d33a511
Author: Gallyus <[email protected]>
Date:   Sun Sep 17 00:47:22 2023 -0400

    fix ping ss statclick (#613)

commit 882a8ca
Author: Changelog Generation <[email protected]>
Date:   Sun Sep 17 00:45:23 2023 -0400

    Automatic changelog generation for PR #612 [ci skip]

commit 5399e44
Author: Kapu1178 <[email protected]>
Date:   Sun Sep 17 00:44:52 2023 -0400

    Medical buffs (#612)

    * No husking from burn damage

    * buff health analyzers

commit fb9e4de
Author: Changelogs <[email protected]>
Date:   Sun Sep 17 01:12:22 2023 +0000

    Automatic changelog compile [ci skip]

commit 6d6ed32
Author: Changelog Generation <[email protected]>
Date:   Sat Sep 16 20:22:48 2023 -0400

    Automatic changelog generation for PR #610 [ci skip]

commit d493721
Author: Gallyus <[email protected]>
Date:   Sat Sep 16 20:22:12 2023 -0400

    Whoops. (#610)

commit da40556
Author: Changelog Generation <[email protected]>
Date:   Sat Sep 16 16:28:02 2023 -0400

    Automatic changelog generation for PR #609 [ci skip]

commit 1222b5b
Author: Kapu1178 <[email protected]>
Date:   Sat Sep 16 16:27:28 2023 -0400

    fix credits bug (#609)

commit 5d41c5d
Author: Changelog Generation <[email protected]>
Date:   Sat Sep 16 16:21:34 2023 -0400

    Automatic changelog generation for PR #608 [ci skip]

commit d811e04
Author: Gallyus <[email protected]>
Date:   Sat Sep 16 16:20:56 2023 -0400

    Fixes uncraftable chems (#608)

commit 6161997
Author: Gallyus <[email protected]>
Date:   Sat Sep 16 04:03:30 2023 -0400

    Removes ATMO-ECOM INIT, STAT now intercepts. (#550)

    * Removes ATMO-ECOM INIT, STAT now intercepts.
    Unhelpful, Unused, Confusing??
    Status was never set while also setting a control field, so this has no
    functional changes.

    * More of them

    * Update code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm

commit 90ca403
Author: Changelog Generation <[email protected]>
Date:   Sat Sep 16 02:02:10 2023 -0400

    Automatic changelog generation for PR #605 [ci skip]

commit d227ca6
Author: Gallyus <[email protected]>
Date:   Sat Sep 16 02:01:29 2023 -0400

    Saline drips have a valid icon again (#605)

    Update Icon Blocker can now specify what to block specifically.

commit 83798d8
Author: Changelog Generation <[email protected]>
Date:   Fri Sep 15 23:27:52 2023 -0400

    Automatic changelog generation for PR #607 [ci skip]

commit 56b37a6
Author: Kapu1178 <[email protected]>
Date:   Fri Sep 15 23:27:15 2023 -0400

    Random things on my todo list, mostly github related (#607)

    * Makes the Haunted Eight Ball work(?) (better?) (#78196)

    From my recollection the haunted eight ball has been "broken" for like 3
    or 4 years. So uh... yea

    Makes the Haunted Eight Ball actually, like, work good.

    - Fixes all votes counting to 0

    - Fixes votes being reported as their vote key and not a flavor message

    - Allows ghosts to change their vote

    - General small code cleanup

    - Calls parent in topic so stat panel clicks work

    - Fixes #41718 , again? If it was actually ever fixed, not sure

    🆑 Melbert
    qol: Haunted 8-ball no longer requires the ghost orbit the petitioner to
    submit votes
    qol: Haunted 8-ball ghosts can now change their vote after submitting it
    fix: Haunted 8-ball no longer always reports "yes"
    fix: Haunted 8-ball no longer always reports default "yes", "no", or
    "maybe" and now gives a proper eight ball response
    fix: Haunted 8-ball can be picked up via the stat panel
    /🆑

    * Replace DreamAnnotate action with a python script (#78225)

    This PR removes the "Annotate Lints" job step and merges it with the
    "Run Linters" step above. To achieve this, I wrote a python script that
    should be identical to the action. I even added the ability to read the
    output from a file to the script if we ever needed that, but I decided
    to have the job step pipe the output into the script instead.

    It always bugged me a bit that we had to check the results for a
    separate step if we wanted to see the linter results for dm code. I also
    noticed a few people getting confused as to why their CI failed on
    linters.

    Turns out that the action is just a few lines that match the
    dreamchecker output and reformat it to a format that GitHub can annotate
    code with. It's so brain dead simple that it shouldn't need to be a
    whole new step, and for the previous two reasons.

    not playerfacing

    * Split Run Linters step into multiple steps (#78265)

    Splits the big "Run Linters" step into multiple steps. Also since all of
    these steps are independent of eachother, I've made them all run
    regardless of if the job is currently failing.

    <details>
    <summary>Proof of testing:</summary>

    Fail in install tools, all linting steps are skipped:
    https://github.com/distributivgesetz/tgstation/actions/runs/6151628214/job/16692089726
    Fail in Run DreamChecker, other steps continue to run:
    https://github.com/distributivgesetz/tgstation/actions/runs/6151664705/job/16692203569?pr=2
    </details>

    <details>
    <summary>Pictured: me breaking CI for a day</summary>

    https://github.com/tgstation/tgstation/assets/47710522/ea12ad30-2b69-4aa3-9642-7d0818eab2d1

    </details>

    Going through the Run Linters step has always been a slog. Finding an
    error is like finding a needle in a haystack. Seeing what command
    exactly went wrong is going to go a long way in helping people find out
    which linters have failed.

    nothing playerfacing

    * Fix some odd vscode highlighting errors in workflow files  (#78274)

    few errors which were odd and annoying

    stealing PRs from san7890, they wanted to do this

    nothing playerfacing

    * fuck

    * fuck 2

    ---------

    Co-authored-by: MrMelbert <[email protected]>
    Co-authored-by: distributivgesetz <[email protected]>

commit 2dd982e
Author: Changelog Generation <[email protected]>
Date:   Fri Sep 15 22:12:07 2023 -0400

    Automatic changelog generation for PR #560 [ci skip]

commit cc31425
Author: Gallyus <[email protected]>
Date:   Fri Sep 15 22:11:32 2023 -0400

    Data Terminals are now buildable (#560)

    * Fixes phone reconnect messages
    Allows construction and destruction of data terminals

    * Apply suggestions from code review

    * dam

    * Newlines

commit 3b4b677
Author: Gallyus <[email protected]>
Date:   Fri Sep 15 21:15:34 2023 -0400

    Update Node 12 actions (#585)

    * Update Node 12 actions

    * Removes purge keys from CI Suite

commit 905b112
Author: Changelogs <[email protected]>
Date:   Sat Sep 16 01:06:53 2023 +0000

    Automatic changelog compile [ci skip]

commit 4ab046a
Author: Changelog Generation <[email protected]>
Date:   Fri Sep 15 20:57:33 2023 -0400

    Automatic changelog generation for PR #595 [ci skip]

commit 2224127
Author: Kapu1178 <[email protected]>
Date:   Fri Sep 15 20:56:55 2023 -0400

    Refactors species organs, deletes golems & adamantine (#595)

    * refactor species organs

    * deletes golems and adamantine

    * no null new call pls

    * clean up more leftover stuff

    * more cleanup

    * fix reviving i hope

commit d49d2d9
Author: Changelog Generation <[email protected]>
Date:   Fri Sep 15 20:40:50 2023 -0400

    Automatic changelog generation for PR #458 [ci skip]

commit 69d71e7
Author: Gallyus <[email protected]>
Date:   Fri Sep 15 20:40:05 2023 -0400

    Automatic Input Redirection (#458)

    * Automatic Input Redirection
    The map element will now yield to the command bar for Classic input.
    The game will inform you of any macros not applied.
    It will also report extra stuff, I'll fix it later.

    * Tighten things up
    Player Panel reports input mode

    * Protected Macros

    * More macro magic

    * hate, let me tell you about hate
    let me tell you how much I've come to hate SSInput and TG's decisions
    since I began to stare into this code. There are roughly five hundred
    lines of code split across 15 files that power the keyloop. If the word
    hate were to replace every mere bit of every character of these hundreds
    of lines, it would not equal one one-billionth of the hate I feel for this system
    at this micro-instant. Hate. Hate.

    * Allows silencing the bad hotkey warning
    The code is inherently imperfect.

    * Proper multimacro

    * Update code/_compile_options.dm

    * Prevent Doublestriking keys

    * Remove unnecessary failsafe

commit 6ac143f
Author: DTraitor <[email protected]>
Date:   Sat Sep 16 03:29:20 2023 +0300

    Fixes get hand offset proc (#597)

commit 8ec6e3d
Author: Changelog Generation <[email protected]>
Date:   Fri Sep 15 20:29:05 2023 -0400

    Automatic changelog generation for PR #604 [ci skip]

commit 5a6d23e
Author: Kapu1178 <[email protected]>
Date:   Fri Sep 15 20:28:31 2023 -0400

    Revert Crossers (#604)

    * down to pressure plates

    * all but tables

    * fin

    * fix

    * fix two minor regressions

commit 01286ee
Author: Changelog Generation <[email protected]>
Date:   Fri Sep 15 20:25:53 2023 -0400

    Automatic changelog generation for PR #596 [ci skip]

commit fc7c003
Author: Cenrus <[email protected]>
Date:   Sat Sep 16 01:25:15 2023 +0100

    Fixes various minor issues (#596)

    * fixes various issues

    * fixes 569

    * trolley final commit (I hope)

    * linters

    * fixes 472

    * fixes shuttles bugging table layers

    * North and south body scanner sprites

    * sprite tweak

    * south sprite

    ---------

    Co-authored-by: Cenrus <[email protected]>

commit 4153737
Author: Changelog Generation <[email protected]>
Date:   Fri Sep 15 20:24:25 2023 -0400

    Automatic changelog generation for PR #603 [ci skip]

commit ffbc666
Author: Gallyus <[email protected]>
Date:   Fri Sep 15 20:23:47 2023 -0400

    Codexbooks (#603)

    * Goonstation Changelog link works properly again

    * Codex Books
    They open the codex when you use them
    Will probably end up outmoding most of the wiki books with time.

commit 01ec50b
Author: Changelog Generation <[email protected]>
Date:   Fri Sep 15 19:32:17 2023 -0400

    Automatic changelog generation for PR #580 [ci skip]

commit b08035b
Author: Kapu1178 <[email protected]>
Date:   Fri Sep 15 19:31:11 2023 -0400

    You can't attack mobs without combat mode (#580)

    * You can't attack mobs without combat mode

    * fix novaflower burn

    * whoops

commit d9f479e
Author: Kapu1178 <[email protected]>
Date:   Fri Sep 15 19:31:01 2023 -0400

    refactor canUseTopic() (#567)

commit 5eda64d
Author: Changelog Generation <[email protected]>
Date:   Fri Sep 15 19:30:23 2023 -0400

    Automatic changelog generation for PR #586 [ci skip]

commit 59b5f1a
Author: Changelog Generation <[email protected]>
Date:   Fri Sep 15 19:30:09 2023 -0400

    Automatic changelog generation for PR #598 [ci skip]

commit 373035f
Author: Kapu1178 <[email protected]>
Date:   Fri Sep 15 19:29:45 2023 -0400

    optimize bloom (#586)

    * optimize bloom

    * optimizations

    * fix gags

commit eb32c0f
Author: bluezorua <[email protected]>
Date:   Sat Sep 16 01:29:34 2023 +0200

    removes unnecessary air alarm (#598)
  • Loading branch information
DaGoonCore committed Oct 3, 2023
1 parent 19ef110 commit 599ed0e
Show file tree
Hide file tree
Showing 545 changed files with 20,756 additions and 13,932 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/autowiki.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
echo "::set-output name=SECRETS_ENABLED::$SECRET_EXISTS"
- name: Checkout
if: steps.secrets_set.outputs.SECRETS_ENABLED
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Restore BYOND cache
if: steps.secrets_set.outputs.SECRETS_ENABLED
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/BYOND
key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
Expand Down
86 changes: 49 additions & 37 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,22 @@ on:
- 'project/**'
jobs:
run_linters:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
if: ( !contains(github.event.head_commit.message, '[ci skip]') )
name: Run Linters
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Restore SpacemanDMM cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/SpacemanDMM
key: ${{ runner.os }}-spacemandmm-${{ secrets.CACHE_PURGE_KEY }}
key: ${{ runner.os }}-spacemandmm
- name: Restore Yarn cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: tgui/.yarn/cache
key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }}
key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }}
restore-keys: |
${{ runner.os }}-build-${{ secrets.CACHE_PURGE_KEY }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Install Tools
Expand All @@ -35,41 +34,55 @@ jobs:
bash tools/ci/install_node.sh
bash tools/ci/install_spaceman_dmm.sh dreamchecker
tools/bootstrap/python -c ''
- name: Run Linters
- name: Give Linters A Go
id: linter-setup
run: ':'
- name: Run Grep Checks
if: steps.linter-setup.conclusion == 'success' && !cancelled()
run: bash tools/ci/check_grep.sh
- name: Run DreamChecker
if: steps.linter-setup.conclusion == 'success' && !cancelled()
shell: bash
run: ~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh
- name: Run Map Checks
if: steps.linter-setup.conclusion == 'success' && !cancelled()
run: |
bash tools/ci/check_filedirs.sh daedalus.dme
bash tools/ci/check_changelogs.sh
bash tools/ci/check_grep.sh
bash tools/ci/check_misc.sh
tools/build/build --ci lint tgui-test
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@v2
if: always()
with:
outputFile: output-annotations.txt
- name: Run DMI Tests
if: steps.linter-setup.conclusion == 'success' && !cancelled()
run: tools/bootstrap/python -m dmi.test
- name: Check File Directories
if: steps.linter-setup.conclusion == 'success' && !cancelled()
run: bash tools/ci/check_filedirs.sh daedalus.dme
- name: Check Changelogs
if: steps.linter-setup.conclusion == 'success' && !cancelled()
run: bash tools/ci/check_changelogs.sh
- name: Check Miscellaneous Files
if: steps.linter-setup.conclusion == 'success' && !cancelled()
run: bash tools/ci/check_misc.sh
- name: Run TGUI Checks
if: steps.linter-setup.conclusion == 'success' && !cancelled()
run: tools/build/build --ci lint tgui-test

compile_all_maps:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
if: ( !contains(github.event.head_commit.message, '[ci skip]') )
name: Compile Maps
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Restore BYOND cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/BYOND
key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
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
find_all_maps:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
if: ( !contains(github.event.head_commit.message, '[ci skip]') )
name: Find Maps to Test
runs-on: ubuntu-20.04
outputs:
Expand All @@ -79,7 +92,7 @@ jobs:
group: find_all_maps-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Find Maps
id: map_finder
run: |
Expand All @@ -94,7 +107,7 @@ jobs:
echo "alternate_tests=$ALTERNATE_TESTS_JSON" >> $GITHUB_OUTPUT
run_all_tests:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
if: ( !contains(github.event.head_commit.message, '[ci skip]') )
name: Integration Tests
needs: [find_all_maps]
strategy:
Expand All @@ -109,7 +122,7 @@ jobs:
map: ${{ matrix.map }}

run_alternate_tests:
if: "!contains(github.event.head_commit.message, '[ci skip]') && needs.find_all_maps.outputs.alternate_tests != '[]'"
if: ( !contains(github.event.head_commit.message, '[ci skip]') && needs.find_all_maps.outputs.alternate_tests != '[]' )
name: Alternate Tests
needs: [find_all_maps]
strategy:
Expand All @@ -126,20 +139,20 @@ jobs:
minor: ${{ matrix.setup.minor }}

check_alternate_tests:
if: "!contains(github.event.head_commit.message, '[ci skip]') && needs.find_all_maps.outputs.alternate_tests != '[]'"
if: ( !contains(github.event.head_commit.message, '[ci skip]') && needs.find_all_maps.outputs.alternate_tests != '[]' )
name: Check Alternate Tests
needs: [run_alternate_tests]
runs-on: ubuntu-20.04
steps:
- run: echo Alternate tests passed.

compare_screenshots:
if: "!contains(github.event.head_commit.message, '[ci skip]') && always()"
if: ( !contains(github.event.head_commit.message, '[ci skip]') && (success() || failure()) )
needs: [run_all_tests, run_alternate_tests]
name: Compare Screenshot Tests
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
# If we ever add more artifacts, this is going to break, but it'll be obvious.
- name: Download screenshot tests
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -169,18 +182,17 @@ jobs:
path: artifacts/screenshot_comparisons

test_windows:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
if: ( !contains(github.event.head_commit.message, '[ci skip]') )
name: Windows Build
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Restore Yarn cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: tgui/.yarn/cache
key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }}
key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }}
restore-keys: |
${{ runner.os }}-build-${{ secrets.CACHE_PURGE_KEY }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Compile
Expand All @@ -192,7 +204,7 @@ jobs:
md deploy
bash tools/deploy.sh ./deploy
- name: Deploy artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: deploy
path: deploy
2 changes: 1 addition & 1 deletion .github/workflows/codeowner_reviews.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so the job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v3

#Parse the Codeowner file
- name: CodeOwnersParser
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ on:

jobs:
publish:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
if: ( !contains(github.event.head_commit.message, '[ci skip]') )
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Build and Publish Docker Image to Registry
uses: elgohr/Publish-Docker-Github-Action@master
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gbp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:
echo "::set-output name=ACTIONS_ENABLED::$SECRET_EXISTS"
- name: Checkout
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup git
if: steps.value_holder.outputs.ACTIONS_ENABLED
run: |
git config --global user.name "gbp-action"
git config --global user.email "<>"
- name: Checkout alternate branch
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: "gbp-balances" # The branch name
path: gbp-balances
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gbp_collect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ jobs:
echo "::set-output name=ACTIONS_ENABLED::$SECRET_EXISTS"
- name: Checkout
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup git
if: steps.value_holder.outputs.ACTIONS_ENABLED
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
- name: Checkout alternate branch
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: "gbp-balances" # The branch name
path: gbp-balances
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/generate_documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ on:
- master
jobs:
generate_documentation:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
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
- uses: actions/checkout@v3
- name: Setup cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/SpacemanDMM
key: ${{ runner.os }}-spacemandmm-${{ secrets.CACHE_PURGE_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/show_screenshot_test_results.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- completed
jobs:
show_screenshot_test_results:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
if: ( !contains(github.event.head_commit.message, '[ci skip]') && github.event.workflow_run.run_attempt == 1 )
name: Show Screenshot Test Results
runs-on: ubuntu-20.04
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_tgs_dmapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Update the TGS DMAPI
steps:
- name: Clone
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Branch
run: |
Expand Down
23 changes: 4 additions & 19 deletions _maps/RandomRuins/AnywhereRuins/golem_ship.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@
"l" = (
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/golem_ship)
"m" = (
/obj/effect/mob_spawn/ghost_role/human/golem/adamantine,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/golem_ship)
"n" = (
/obj/machinery/mineral/equipment_vendor/golem,
/turf/open/floor/mineral/titanium/purple,
Expand Down Expand Up @@ -179,7 +175,6 @@
/obj/item/storage/medkit/brute,
/obj/structure/table/wood,
/obj/item/storage/medkit/brute,
/obj/item/disk/data/golem_shell,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/golem_ship)
"E" = (
Expand Down Expand Up @@ -214,11 +209,6 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/golem_ship)
"M" = (
/obj/effect/mob_spawn/ghost_role/human/golem/adamantine,
/obj/machinery/light/small/directional/north,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/golem_ship)
"N" = (
/obj/machinery/light/directional/north,
/turf/open/floor/mineral/titanium/purple,
Expand All @@ -236,11 +226,6 @@
/obj/machinery/door/airlock/titanium,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/golem_ship)
"U" = (
/obj/effect/mob_spawn/ghost_role/human/golem/adamantine,
/obj/machinery/light/small/directional/south,
/turf/open/floor/mineral/titanium/purple,
/area/ruin/powered/golem_ship)
"V" = (
/obj/machinery/light/small/directional/north,
/turf/open/floor/plating,
Expand Down Expand Up @@ -402,14 +387,14 @@ b
c
I
b
M
L
o
b
l
l
G
o
U
Q
b
V
F
Expand All @@ -420,14 +405,14 @@ b
c
f
b
m
l
o
b
l
l
G
o
m
l
b
f
F
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_surface_greed.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/area/ruin/powered/greed)
"j" = (
/obj/structure/table/wood/poker,
/obj/item/coin/adamantine,
/obj/item/coin/mythril,
/turf/open/floor/carpet,
/area/ruin/powered/greed)
"k" = (
Expand Down
Loading

0 comments on commit 599ed0e

Please sign in to comment.