Skip to content

Civilian, Service, Logistics (Department changes) - #183

Merged
pirakaplant merged 15 commits into
funky-station:masterfrom
pirakaplant:civilian-service-logistics
Aug 1, 2026
Merged

Civilian, Service, Logistics (Department changes)#183
pirakaplant merged 15 commits into
funky-station:masterfrom
pirakaplant:civilian-service-logistics

Conversation

@pirakaplant

@pirakaplant pirakaplant commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

About the PR

This PR makes a few changes to the departments known as Cargo/Supply and Civilian/Service:

First of all, Supply is renamed in its entirety to Logistics. References to cargo or supply outside the name of the department are unchanged. For example:

  • The cargo request computer literally requests cargo, so that name is not changed.
  • Cargo Technicians work specifically with cargo, so that name is not changed.
  • Cargo access is used to allow freedom of movement within the cargo bay specifically, so that name is not changed.
  • (Also I didn't change the name of the Cargo sign because I feel that would require retexturing the sign to fit and that merits its own PR.)

The Botanist is also moved from Civilian/Service to Logistics, and is given the appropriate headset and access for the department.

As for Civilian/Service, it's split into two different departments, called Civilian and Service:

Assistant (formerly Passenger), Lawyer, and Reporter are Civilian jobs. They no longer have Service access or radio if they did previously. Lawyer now answers directly to whoever hires them, and Reporter answers directly to their audience.

Service includes all Civilian/Service jobs not moved to a different department. There are no changes to individual jobs, besides Bartender, Chef, and Service Worker specifically requiring Service hours to unlock.

Reporter also now gets its own access, called Newsroom. Newsroom airlocks also exist for mapper use, with both a standard and glass variant.

I did not touch the guidebook because that is an entirely different can of worms and I'd have to rewrite like half of every page I'd touch. That's for a different PR.

Why / Balance

Groundwork for funky-station/docs/pull/96. The changes proposed in that document are quite extensive on a development scale so I'm breaking it up.

Technical details

Mostly YAML edits, no new prototypes. I had to change one line of C# code, but that was because the localised string the game uses for the overflow job (Assistant/Passenger) is hardcoded.

New FTL files have been made under Locale/en-US/_Funkystation when feasible to minimise changes made to base localisation files. Changes to existing localisation files have been appropriately commented on the preceding line.

Mapping changes

Reporters now have their own access, called Newsroom. Service-access doors to the Reporter's office need to be replaced with Newsroom-access doors, as Reporters no longer have Service access.

If this PR is merged, it would be ideal to change the layout of the station maps so hydroponics is closer to the cargo bay, if possible. Doing so is not required for the game to be playable, but it would make things more convenient.

Test plan

  1. Open the character customisation menu. Supply should now be called Logistics, and Civilian and Service should be split as described in "About the PR".
  2. Join the round as a Logistics job, a Service job, and a Civilian job. They should all appear under the correct departments on the manifest.
  3. Join the round as a Botanist. Make sure you spawn with a logistics headset, and that the HyDrobe contains logistics headsets instead of service headsets.
  4. Join the round as a Lawyer. Make sure that you spawn with a civilian (grey) headset, and that the LawDrobe has civilian headsets instead of Service headsets. Make sure your brief tells you that you answer to whoever hires you.
  5. Join the round as a Reporter. Make sure that you spawn with a civilian (grey) headset. Make sure that your brief tells you that you answer to your audience. Try using your news manager console with and without your ID card.
  6. Test the accesses of the following jobs: Bartender, Chef, Botanist, Cargo Technician, Janitor, Lawyer, and Quartermaster.
  • Bartender and Chef should no longer get Hydroponics as an extended access.
  • Botanist should have Cargo access, but not Service access. They should not have any extended accesses.
  • Cargo Technician should get Hydroponics as an extended access.
  • Lawyer should no longer have Service access.
  • Quartermaster should have Hydroponics access.
  • Reporter should not have Service access, and should have Newsroom access instead.

Media

Screenshot_20260711_162036 Screenshot_20260711_041804 Screenshot_20260711_042253 Screenshot_20260711_165539 Screenshot_20260703_155148 Screenshot_20260703_160107 Screenshot_20260703_162333 Screenshot_20260703_160358 Screenshot_20260711_161443 Screenshot_20260711_162309

Requirements

  • I have read and am following the Macrocosm Pull Request Conventions.
  • I have tested this pull request and written instructions on how to test it
  • I have added media to this PR or it does not require an in-game showcase.
  • If I am porting something, I have done my best to respect the appropriate licenses associated with the presented changes.

License

MIT

Breaking changes

N/A.

Changelog

🆑

  • add: Newsroom access has been added to the game to replace the Reporter's Service access.
  • tweak: The news manager console is now Newsroom access, instead of Service access.
  • tweak: The Cargo/Supply department is now called the Logistics department. Their budget name has also been updated to reflect this.
  • tweak: Botanists are now part of the Logistics department, instead of Civilian or Service.
  • tweak: Passengers are now called Assistants.
  • tweak: The Civilian/Service department has been split into Civilian (Assistants, Lawyers, and Reporters), and Service (all other Civilian/Service jobs).
  • tweak: Botanists, Lawyers, and Reporters (along with their wardrobes) have had loadout changes to correspond with their change of department.
  • tweak: The descriptions for the Logistics and Civilian departments, as well as the Assistant, Quartermaster, and Service Worker jobs, have been updated to fit department-related changes elsewhere.
  • tweak: Various jobs have had their accesses (both standard and extended) changed to fit department-related updated elsewhere.
  • tweak: Various jobs have had their default highlights updated to fit department-related changes elsewhere.
  • tweak: Various jobs now answer to different authorities, in line with their new position in the game.

@pirakaplant
pirakaplant marked this pull request as ready for review July 3, 2026 07:18

@YaraaraY YaraaraY left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

tested, works perfectly as intended as far as i can tell, good to merge

@pirakaplant
pirakaplant marked this pull request as draft July 10, 2026 19:06
@github-actions

Copy link
Copy Markdown
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@pirakaplant
pirakaplant marked this pull request as ready for review July 11, 2026 07:54
@pirakaplant
pirakaplant requested a review from YaraaraY July 12, 2026 08:33

@YaraaraY YaraaraY left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

tested again and looked over changes, everything looks fine to me 😋

@Chapien
Chapien self-requested a review August 1, 2026 15:16
@Chapien

Chapien commented Aug 1, 2026

Copy link
Copy Markdown
Collaborator

From my testing, this looks to be working to me. I do think "Station-specific Jobs" should not display on the PDA as its own thing, as it causes duplication of roles in the case of the reporter and is rather meta to my opinion (why would that be a job category at a business?), but that's outside the scope of this pull request. What was in-scope and changed works to satisfaction, though obviously I could not test every single map.

@pirakaplant
pirakaplant merged commit c58b265 into funky-station:master Aug 1, 2026
12 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants