Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
5a697ed
Gans BS, HOP, all; banners and doors
Evgenimation Jun 17, 2026
9001e70
InteQ uppdate
Evgenimation Jun 17, 2026
6e04d32
Gans BS, HOP, all; banners and doors
Evgenimation Jun 23, 2026
2442b4c
github workflows update
Spectrum2k Jun 23, 2026
fdbd636
Merge branch 'dead-space-server:master' into master
Evgenimation Jun 23, 2026
be74764
И снова мы тут (#394)
Spectrum2k Jun 23, 2026
246905b
Automatic Changelog (#394)
Jun 23, 2026
e55c1e6
BigFingers (#381)
vanomorodellefake Jun 23, 2026
18f2a20
Automatic Changelog (#381)
Jun 23, 2026
8291420
Reflect System Changes (#384)
vanomorodellefake Jun 23, 2026
ba7cd56
Automatic Changelog (#384)
Jun 23, 2026
887138b
Round Rules Changes (#386)
vanomorodellefake Jun 23, 2026
8e451e3
Багфикс и Блющилд (#392)
Tiwulovoe Jun 23, 2026
b6cd618
Automatic Changelog (#392)
Jun 23, 2026
93fb05b
What is love? (#391)
Tiwulovoe Jun 23, 2026
5c426da
Automatic Changelog (#391)
Jun 23, 2026
83dbb46
Double Energy Sword Craft (#385)
vanomorodellefake Jun 24, 2026
6aa68f4
Automatic Changelog (#385)
Jun 24, 2026
44c0f9a
Технические шоколадки 24.06 (#397)
Spectrum2k Jun 24, 2026
f2a578e
Fix gan bs (#396)
Evgenimation Jun 24, 2026
5a57cf6
Automatic Changelog (#396)
Jun 24, 2026
83640a7
Merge branch 'master' into dominator-and-a-few-things
Evgenimation Jun 25, 2026
97a420f
Base of changesprite
vanomorodellefake Jul 1, 2026
a917e0b
some fixes
vanomorodellefake Jul 1, 2026
534b3dd
Copyright
vanomorodellefake Jul 1, 2026
654dc62
Dead State Fix
vanomorodellefake Jul 6, 2026
57f9d5e
Oops
vanomorodellefake Jul 6, 2026
efa50bd
fix
vanomorodellefake Jul 6, 2026
5e284f4
ooops
vanomorodellefake Jul 7, 2026
170bdf8
Thrust-dominator-td
Evgenimation Jul 7, 2026
cf9e748
MakeStimulantsGreatAgain (#403)
DefinitelyNotMori Jul 8, 2026
b4b2e11
Automatic Changelog (#403)
Jul 8, 2026
adbd0fc
Rebalance (#402)
DefinitelyNotMori Jul 8, 2026
a5bbdbe
Я потратил на это 15 ТК (#399)
Tiwulovoe Jul 8, 2026
e544407
Automatic Changelog (#402)
Jul 8, 2026
f20f363
Shotgun reload doesn't break anymore (#405)
DefinitelyNotMori Jul 8, 2026
3493a10
Automatic Changelog (#405)
Jul 8, 2026
7e21bdc
ShitCode fix
vanomorodellefake Jul 15, 2026
24e8137
Fix
Evgenimation Jul 16, 2026
e03cd2a
Bugfix: Moproach/spider solution regeneration (#41)
whatston3 Jun 16, 2026
3596b6b
Anomaly bug fix
Lytheriia Jul 19, 2026
3bc3578
Remote doors bug fix
Lytheriia Jul 20, 2026
3f8a2a2
Role times
Lytheriia Jul 20, 2026
fc02636
Fix foolbox storage insertion heisentest (#44134)
ArtisticRoomba Jun 21, 2026
98e726b
fixes + nullable sprites
vanomorodellefake Jul 20, 2026
e47dfa4
Base of changesprite (#400)
Lytheriia Jul 20, 2026
9c2a33a
Automatic Changelog (#400)
Jul 20, 2026
84548f1
t1
Lytheriia Jul 20, 2026
c939672
[Fix] Minor fixes (#410)
Lytheriia Jul 20, 2026
5d9366d
Automatic Changelog (#410)
Jul 20, 2026
0387b2a
uppdat-thruster
Evgenimation Jul 20, 2026
b4ac03e
Height bug fix
Lytheriia Jul 20, 2026
00cb2ad
1
Lytheriia Jul 20, 2026
b287445
[Fix] Height bug fix (#412)
Lytheriia Jul 20, 2026
10df9cb
Automatic Changelog (#412)
Jul 20, 2026
089415c
[Port] Time transfer ui
Lytheriia Jul 21, 2026
0bb40d1
Blob (#390)
CyberBobeks Jul 21, 2026
9d35608
Automatic Changelog (#390)
Jul 21, 2026
0adce5e
Вычёркиваем
Lytheriia Jul 21, 2026
aa59906
uppdate
Evgenimation Jul 21, 2026
f2ec83d
Bug fix
Lytheriia Jul 21, 2026
4e31f87
Nocturine rebalance
Lytheriia Jul 21, 2026
f01a658
Hypopen rebalance
Lytheriia Jul 21, 2026
4b9aa2b
Deleted NanoTrasenNavy
Lytheriia Jul 21, 2026
1875851
Hypopen and nocturine changes (#414)
Lytheriia Jul 21, 2026
c8b5d56
Automatic Changelog (#414)
Jul 21, 2026
c3df7a7
Awaiting changes workflow
Lytheriia Jul 21, 2026
f63bcec
Uppdate
Evgenimation Jul 22, 2026
75ee0e5
fix1
Lytheriia Jul 22, 2026
b9625e3
Merge branch 'master' into uppdate-thruster
Lytheriia Jul 22, 2026
95a0db9
fix2
Lytheriia Jul 22, 2026
e119d09
fix3
Lytheriia Jul 22, 2026
b0886fd
чё ещё тут найдётся
Lytheriia Jul 22, 2026
e09d3f5
fix 4
Lytheriia Jul 22, 2026
6379092
test
Lytheriia Jul 22, 2026
44f33ec
16 комитов спустя
Lytheriia Jul 22, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto
* text=auto eol=lf

###############################################################################
# Set default behavior for command prompt diff.
Expand All @@ -10,7 +10,7 @@
# default for csharp files.
# Note: This is only used by command line
###############################################################################
*.cs diff=csharp
*.cs diff=csharp

###############################################################################
# Set the merge driver for project and solution files
Expand Down
107 changes: 107 additions & 0 deletions .github/workflows/_labeler-review-state-apply.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
# SPDX-FileCopyrightText: 2026 Yaroslav Yudaev <ydaevy10@gmail.com>
# SPDX-License-Identifier: MIT

name: "Reusable: Apply Review State Label"

on:
workflow_call:
inputs:
workflow-run-id:
required: true
type: string

jobs:
apply_review_state:
permissions:
actions: read
checks: read
contents: read
issues: write
pull-requests: write
statuses: read
runs-on: ubuntu-latest
steps:
- name: Download review event
uses: actions/download-artifact@v8.0.1
with:
name: review-event
path: review-event
github-token: ${{ github.token }}
run-id: ${{ inputs.workflow-run-id }}

- name: Read pull request number
id: review_event_pr
uses: cloudposse/github-action-jq@v0.4.1
with:
input: review-event/event.json
script: .pull_request.number
raw-output: true

- name: Read reviewed head SHA
id: review_event_head
uses: cloudposse/github-action-jq@v0.4.1
with:
input: review-event/event.json
script: .pull_request.head.sha
raw-output: true

- name: Read current pull request
id: current_pr
if: steps.review_event_pr.outputs.output != ''
uses: octokit/request-action@v3.0.0
with:
route: GET /repos/${{ github.repository }}/pulls/${{ steps.review_event_pr.outputs.output }}
env:
GITHUB_TOKEN: ${{ github.token }}

- name: Apply approved review label
id: pr-status
if: >-
steps.current_pr.outcome == 'success' &&
fromJson(steps.current_pr.outputs.data).head.sha == steps.review_event_head.outputs.output
uses: GrantBirki/pr-status@v3.0.0
with:
pr_number: ${{ steps.review_event_pr.outputs.output }}
evaluations: approved
pass_labels: "S: Approved"
pass_labels_cleanup: "S: Needs Review,S: Awaiting Changes"

- name: Add awaiting changes label
if: >-
steps.pr-status.outcome == 'success' &&
steps.pr-status.outputs.review_decision == 'CHANGES_REQUESTED'
uses: step-security/action-add-labels@v1.1.1
with:
number: ${{ steps.review_event_pr.outputs.output }}
labels: "S: Awaiting Changes"

- name: Add needs review label
if: >-
steps.pr-status.outcome == 'success' &&
steps.pr-status.outputs.review_decision == 'REVIEW_REQUIRED'
uses: step-security/action-add-labels@v1.1.1
with:
number: ${{ steps.review_event_pr.outputs.output }}
labels: "S: Needs Review"

- name: Remove stale review labels after requested changes
if: >-
steps.pr-status.outcome == 'success' &&
steps.pr-status.outputs.review_decision == 'CHANGES_REQUESTED'
uses: step-security/action-remove-labels@v1.3.1
with:
number: ${{ steps.review_event_pr.outputs.output }}
labels: |
S: Needs Review
S: Approved

- name: Remove stale review labels while review is required
if: >-
steps.pr-status.outcome == 'success' &&
steps.pr-status.outputs.review_decision == 'REVIEW_REQUIRED'
uses: step-security/action-remove-labels@v1.3.1
with:
number: ${{ steps.review_event_pr.outputs.output }}
labels: |
S: Awaiting Changes
S: Approved
41 changes: 0 additions & 41 deletions .github/workflows/build-docfx.yml

This file was deleted.

10 changes: 5 additions & 5 deletions .github/workflows/build-map-renderer.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build & Test Map Renderer
name: Build & Test Map Renderer

on:
push:
Expand All @@ -10,7 +10,7 @@ on:

jobs:
build:
if: github.actor != 'Erida-change-bot' && github.event.pull_request.draft == false
if: github.actor != 'Erida-change-bot' && (github.event_name != 'pull_request' || github.event.pull_request.draft == false)
strategy:
matrix:
os: [ubuntu-latest]
Expand All @@ -19,7 +19,7 @@ jobs:

steps:
- name: Checkout Master
uses: actions/checkout@v4.2.2
uses: actions/checkout@v7.0.0

- name: Setup Submodule
run: |
Expand All @@ -34,7 +34,7 @@ jobs:
git submodule update --init --recursive

- name: Setup .NET Core
uses: actions/setup-dotnet@v4.1.0
uses: actions/setup-dotnet@v5.3.0
with:
dotnet-version: 10.0.x

Expand All @@ -48,7 +48,7 @@ jobs:
run: dotnet run --project Content.MapRenderer Dev

ci-success:
name: Build & Test Debug
name: Build & Test Map Renderer
needs:
- build
runs-on: ubuntu-latest
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-test-debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout Master
uses: actions/checkout@v4.2.2
uses: actions/checkout@v7.0.0

- name: Setup Submodule
run: |
Expand All @@ -35,7 +35,7 @@ jobs:
git submodule update --init --recursive

- name: Setup .NET Core
uses: actions/setup-dotnet@v4.1.0
uses: actions/setup-dotnet@v5.3.0
with:
dotnet-version: 10.0.x

Expand All @@ -51,7 +51,7 @@ jobs:

- name: Archive NUnit3 Content.Tests results.
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7.0.1
with:
name: nunit3-results-content-tests-${{ matrix.os }}
path: test_results/content-tests/*
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:

steps:
- name: Checkout Master
uses: actions/checkout@v4.2.2
uses: actions/checkout@v7.0.0

- name: Setup Submodule
run: |
Expand All @@ -97,7 +97,7 @@ jobs:
git submodule update --init --recursive

- name: Setup .NET Core
uses: actions/setup-dotnet@v4.1.0
uses: actions/setup-dotnet@v5.3.0
with:
dotnet-version: 10.0.x

Expand All @@ -122,7 +122,7 @@ jobs:

- name: Archive NUnit3 integration results.
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7.0.1
with:
name: nunit3-results-integration-${{ matrix.shard }}-${{ matrix.os }}
path: test_results/integration-${{ matrix.shard }}/*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- name: Setup Node
# Erida edit: keep the workflow on a supported action runtime.
uses: actions/setup-node@v6
uses: actions/setup-node@v6.4.0
with:
node-version: 18.x

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check-crlf.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CRLF Check
name: CRLF Check

on:
pull_request:
Expand All @@ -7,9 +7,9 @@ on:
jobs:
build:
name: CRLF Check
if: github.event.pull_request.draft == false
if: github.actor != 'Erida-change-bot' && github.event.pull_request.draft == false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v7.0.0
- name: Check for CRLF
run: Tools/Wizards/check_crlf.py
27 changes: 14 additions & 13 deletions .github/workflows/close-master-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,27 @@ name: Close PRs on master

on:
pull_request_target:
types: [ opened, ready_for_review ]
types: [ opened, reopened, ready_for_review ]

permissions:
contents: read
issues: write
pull-requests: write

jobs:
run:
runs-on: ubuntu-latest
if: ${{(github.head_ref == 'master' || github.head_ref == 'main' || github.head_ref == 'develop' || github.head_ref == 'stable' || github.head_ref == 'staging')
&& github.event.pull_request.head.repo.fork}}
&& github.event.pull_request.head.repo.fork
&& github.event.pull_request.draft == false}}

steps:
- uses: superbrothers/close-pull-request@v3
- name: Close pull request
uses: peter-evans/close-pull@v3.0.1
with:
comment: "Thank you for your contribution! It appears you created a pull request from the master branch or another main development branch. This is [something you should avoid doing](https://jmeridth.com/posts/do-not-issue-pull-requests-from-your-master-branch/), and thus this pull request has been automatically closed. \n \n We suggest you follow [our git usage documentation](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html). \n \n You can move your current work to another branch by following [these commands](https://ohshitgit.com/#accidental-commit-master). Then, you may recreate your pull request using the new branch."
comment: |
Thank you for your contribution! It appears you created a pull request from the master branch or another main development branch. This is [something you should avoid doing](https://jmeridth.com/posts/do-not-issue-pull-requests-from-your-master-branch/), and thus this pull request has been automatically closed.

# If you prefer to just comment on the pr and not close it, uncomment the below and comment the above
We suggest you follow [our git usage documentation](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html).

# - uses: actions/github-script@v7
# with:
# script: |
# github.rest.issues.createComment({
# issue_number: ${{ github.event.number }},
# owner: context.repo.owner,
# repo: context.repo.repo,
# body: "Thank you for your contribution! It appears you created a pull request from the master branch or another main development branch. This is [something you should avoid doing](https://jmeridth.com/posts/do-not-issue-pull-requests-from-your-master-branch/)\n\nYou can move your current work to another branch by following [these commands](https://ohshitgit.com/#accidental-commit-master). Then, you may recreate your pull request using the new branch. \n\n This pull request won't be automatically closed. However, a maintainer may close it for this reason."})
You can move your current work to another branch by following [these commands](https://ohshitgit.com/#accidental-commit-master). Then, you may recreate your pull request using the new branch.
30 changes: 30 additions & 0 deletions .github/workflows/labeler-awaiting-changes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: "Labels: Awaiting Changes"

on:
pull_request_review:
types:
- submitted

permissions:
contents: read
issues: write
pull-requests: write

jobs:
awaiting_changes:
if: github.event.review.state == 'changes_requested' && github.actor != 'Erida-change-bot' && github.event.pull_request.draft == false
runs-on: ubuntu-latest
steps:
- name: Mark PR as awaiting changes
uses: step-security/action-add-labels@v1.1.1
with:
number: ${{ github.event.pull_request.number }}
labels: "S: Awaiting Changes"

- name: Remove stale review state labels
uses: step-security/action-remove-labels@v1.3.1
with:
number: ${{ github.event.pull_request.number }}
labels: |
S: Needs Review
S: Approved
7 changes: 6 additions & 1 deletion .github/workflows/labeler-conflict.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,18 @@ on:
- reopened
- ready_for_review

permissions:
contents: read
issues: write
pull-requests: write

jobs:
Label:
if: ( github.event.pull_request.draft == false ) && ( github.actor != 'Erida-change-bot' )
runs-on: ubuntu-latest
steps:
- name: Check for Merge Conflicts
uses: eps1lon/actions-label-merge-conflict@v3.0.0
uses: eps1lon/actions-label-merge-conflict@v3.1.0
with:
dirtyLabel: "S: Merge Conflict"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
Expand Down
Loading
Loading