Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] dev from Baystation12:dev #136

Merged
merged 12 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cancel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: 'Cancel Redundant Builds'
permissions:
actions: write # required to cancel other actions
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 3
steps:
- uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog_generation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
CompileCL:
permissions:
contents: write # required to push the updated changelog commit
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: github.repository == 'Baystation12/Baystation12' # to prevent this running on forks
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/close_stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
stale:
permissions:
issues: write # required to close stale issues
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/stale@v9
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 10
permissions:
actions: read
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/generate_documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:

jobs:
PreFlight:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
Expand All @@ -28,7 +28,7 @@ jobs:
generate_documentation:
permissions:
contents: write # required to push the doc commit
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: PreFlight
if: |
(needs.PreFlight.outputs.dm == 'true') &&
Expand All @@ -39,7 +39,7 @@ jobs:
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- name: Setup Cache
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
with:
path: ~/spaceman_dmm/${{ env.SPACEMAN_DMM_VERSION }}
key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
permissions:
contents: read # may be required due to overwrite/add ambiguity
pull-requests: write # required to apply labels to PRs
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/labeler@v5
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/make_changelogs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
MakeCL:
permissions:
contents: write # required to push the changelog chunk yml commit
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: github.repository == 'Baystation12/Baystation12' # to prevent this running on forks
steps:
- name: Checkout
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:

jobs:
PreFlight:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
Expand All @@ -28,13 +28,13 @@ jobs:
outputs:
dm: ${{ steps.filter.outputs.dm }}
DreamChecker:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: PreFlight
if: needs.PreFlight.outputs.dm == 'true'
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- name: Setup Cache
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
with:
path: ~/spaceman_dmm/${{ env.SPACEMAN_DMM_VERSION }}
key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
Expand All @@ -54,15 +54,15 @@ jobs:
chmod +x send.sh
./send.sh failure $WEBHOOK_URL
Code:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs:
- PreFlight
- DreamChecker
if: needs.PreFlight.outputs.dm == 'true'
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- name: Setup Cache
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
with:
path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
Expand All @@ -84,15 +84,15 @@ jobs:
chmod +x send.sh
./send.sh failure $WEBHOOK_URL
ExampleMap:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs:
- PreFlight
- DreamChecker
if: needs.PreFlight.outputs.dm == 'true'
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- name: Setup Cache
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
with:
path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
Expand All @@ -113,15 +113,15 @@ jobs:
chmod +x send.sh
./send.sh failure $WEBHOOK_URL
TorchMap:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs:
- PreFlight
- DreamChecker
if: needs.PreFlight.outputs.dm == 'true'
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- name: Setup Cache
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
with:
path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
Expand All @@ -142,15 +142,15 @@ jobs:
chmod +x send.sh
./send.sh failure $WEBHOOK_URL
AwaySites:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs:
- PreFlight
- DreamChecker
if: needs.PreFlight.outputs.dm == 'true'
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- name: Setup Cache
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8
with:
path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testmerge-blocker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
testmerge-blocker:
name: Enforce Test Merge Label
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Enforce Test Merge Label
if: contains(github.event.pull_request.labels.*.name, 'Test Merge') && !contains(github.event.pull_request.labels.*.name, 'Test Merge Passed')
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/view_variables/helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@


/atom/VV_static()
return ..() + list("bound_x", "bound_y", "bound_height", "bound_width", "bounds", "step_x", "step_y", "step_size")
return ..() + list("bound_x", "bound_y", "bound_height", "bound_width", "bounds", "step_x", "step_y", "step_size", "underlays", "overlays")

/client/VV_static()
return ..() + list("holder", "prefs")
Expand Down
19 changes: 11 additions & 8 deletions html/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,17 @@
-->
<div class="commit sansserif">

<h2 class="date">16 October 2024</h2>
<h3 class="author">Spookerton updated:</h3>
<ul class="changes bgimages16">
<li class="admin">Atom overlays and underlays no longer incorrectly appear modifiable via VV.</li>
</ul>
<h3 class="author">The_Spanish_1nquisition updated:</h3>
<ul class="changes bgimages16">
<li class="rscdel">Removed outdated event related memos</li>
<li class="rscadd">Added new event related (and other) memos</li>
</ul>

<h2 class="date">07 October 2024</h2>
<h3 class="author">Mucker updated:</h3>
<ul class="changes bgimages16">
Expand Down Expand Up @@ -160,14 +171,6 @@ <h3 class="author">rootoo807 updated:</h3>
<li class="bugfix">Fixes broken sprites / adds missing sprites for armbands, insulated gloves, soft caps, blood masks on GAS. GAS can no longer wear overalls or wizard voidsuit [snakes don't have legs for pants :( ].</li>
<li class="bugfix">Adds missing sprite for flipped veteran's cap.</li>
</ul>

<h2 class="date">13 August 2024</h2>
<h3 class="author">SierraKomodo updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Shuttle control consoles can no longer be synced to shuttles if not actually on the shuttle.</li>
<li class="bugfix">Regular non-overmap shuttle control consoles will no longer function on overmap shuttles, and vice-versa.</li>
<li class="tweak">Shuttle control consoles now automatically sync to the shuttle they're built on when created, instead of needing to be set by multitooling the board before creation.</li>
</ul>
</div>

<b>GoonStation 13 Development Team</b>
Expand Down
7 changes: 7 additions & 0 deletions html/changelogs/.all_changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22916,3 +22916,10 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- rscadd: Added Party Cards for the SCG's major political parties
- rscadd: Added Cultural Options for Wikified Planets
- rscadd: Added Passports for said Planets
2024-10-16:
Spookerton:
- admin: Atom overlays and underlays no longer incorrectly appear modifiable via
VV.
The_Spanish_1nquisition:
- rscdel: Removed outdated event related memos
- rscadd: Added new event related (and other) memos
Loading