Skip to content

Guidebook Job ordering change#341

Merged
imatsoup merged 6 commits into
RonRonstation:masterfrom
TaserTheFox:Features
Aug 11, 2025
Merged

Guidebook Job ordering change#341
imatsoup merged 6 commits into
RonRonstation:masterfrom
TaserTheFox:Features

Conversation

@TaserTheFox
Copy link
Copy Markdown

@TaserTheFox TaserTheFox commented Aug 8, 2025

About the PR

I reordered the list of jobs under the jobs in the guidebook to be alphabetical instead.
I also mentioned paramedics are a part of the medical department under the general jobs overview.

Why / Balance

The current ordering is rather arbitrary.
Paramedics are currently not mentioned in the general job overview.
No balance changes.

Technical details

All text changes.

Media

image

Requirements

Breaking changes

None.
Changelog

@github-actions github-actions Bot added S: Untriaged Status: Needs appropriate labels. size/S S: Needs Review Status: This PR requires new reviews before it can be merged. Changes: No C# changes: Might require no knowledge of C#. labels Aug 8, 2025
@arenaconspiracy
Copy link
Copy Markdown

These are well meaning, albeit inconsequential, changes - Importantly, we require denoting changes to upstream files as changes made on our repository fall under a different license; however, since this is merely shifting lines & makes no "actual" "changes" it... falls in a legal grey area, as far as I would know. I need consensus from other maintainers.

@arenaconspiracy arenaconspiracy added S: Undergoing maintainer discussion Status: This PR is undergoing discussion with maintainers on what to do with it. P4: Fluff Priority: Trivial. It usually doesn't add interactions nor fixes any issues. A: Guidebook Area: Ingame guidebook, content, or technical implementation. A: UI Area: UI and player facing interactive graphical interfaces. and removed S: Untriaged Status: Needs appropriate labels. labels Aug 8, 2025
Copy link
Copy Markdown

@Merrokitsune Merrokitsune left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello, and thank you for contributing.
A discussion may be made amongst other maintainers, however, as per policy, I would request that a new Jobs.xml be created under a _Ronstation folder (there is a guide in Ronstation discord on how you can do this). This was made to prevent merge conflicts whenever we update from upstream. shiftandcrew.yml do not require a new _Ronstation folder version, due to the modifications on an upstream file being necessary to effect those changes.
I would also really like that you add headers, as well as annotations, considering that Ronstation codebase is primarily AGPL-v3.0, and that any MIT-licensed file (such as upstream files) containing our modifications is subject to MIT sublicensed with AGPL. There is a guide also on Ronstation discord.
I hope that helps.

  • Barnacle14.

@imatsoup
Copy link
Copy Markdown
Collaborator

imatsoup commented Aug 9, 2025

When creating your new Jobs.xml, you'll also need to update the path for the jobs guide entry in shiftsandcrew.yml. The file you'll be looking for is Resources\Prototypes\Guidebook\shiftandcrew.yml. Just update the path to "_Ronstation/ServerInfo/Guidebook/Jobs.xml"

@TaserTheFox
Copy link
Copy Markdown
Author

Ok, annotated both the new Jobs.xml and shiftandcrew.yml and reverted the changes to the upstream Jobs.xml (or at least, should be reverted).

Comment thread Resources/ServerInfo/_Ronstation/Guidebook/Jobs.xml Outdated
Comment thread Resources/ServerInfo/_Ronstation/Guidebook/Jobs.xml Outdated
@Merrokitsune
Copy link
Copy Markdown

Ok, annotated both the new Jobs.xml and shiftandcrew.yml and reverted the changes to the upstream Jobs.xml (or at least, should be reverted).

IMG_7957

@TaserTheFox TaserTheFox requested a review from imatsoup August 10, 2025 02:09
Comment thread Resources/Prototypes/Guidebook/shiftandcrew.yml Outdated
@TaserTheFox TaserTheFox requested a review from imatsoup August 10, 2025 18:39
Copy link
Copy Markdown
Collaborator

@imatsoup imatsoup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The order of jobs in the guidebook is ultimately arbitrary, but I don't see any harm in this

@imatsoup imatsoup merged commit 9bf3fd8 into RonRonstation:master Aug 11, 2025
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A: Guidebook Area: Ingame guidebook, content, or technical implementation. A: UI Area: UI and player facing interactive graphical interfaces. Changes: No C# changes: Might require no knowledge of C#. P4: Fluff Priority: Trivial. It usually doesn't add interactions nor fixes any issues. S: Needs Review Status: This PR requires new reviews before it can be merged. S: Undergoing maintainer discussion Status: This PR is undergoing discussion with maintainers on what to do with it. size/S

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants