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

Added an NFSD prisoner fill with headsets #2850

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

Jakumba
Copy link
Contributor

@Jakumba Jakumba commented Feb 3, 2025

About the PR

  • Added a Fill for NFSD Prisoner wall lockers & wardrobes
  • Updated NFSDO with NFSD Prisoner wardrobes
  • Updated all NFSD ships with brigs/holding cells to use NFSD Prisoner wardrobes/wall lockers
  • Added NFSD Prisoner Wall lockers to NFSD shuttles with brigs/holding cells, that did not already have a Prisoner wardrobe (Hypnos only)

Why / Balance

Space Law requires that prisoners be given access to the Common radio channel. This is actually quite difficult to do unless the NFSD ship commander has pre-purchased headsets. This removes that onus and ensures that prisoners will always have a headset available.

Because this touches the Hypno's I'd appreciate @MagnusCrowe's eye over it, to make sure that the map changes are acceptable.

How to test

  • Spawn an NFSD prisoner wardrobe (filled & empty)
  • Spawn an NFSD prisoner wall closet (filled & empty

Media

N/A

Requirements

Breaking changes

  • The wall locker appears to be (un)anchorable? This seems to match other wall lockers, but it's not desireable that the option should even be there.

Changelog

@dvir001
Copy link
Contributor

dvir001 commented Feb 3, 2025

Do not use StorageFill, use the new system. do not give them ClothingHeadsetGrey port the DeltaV prisoner headsets.

@dvir001 dvir001 added S: Awaiting Changes This PR has changes that need to be made before merging S: DO NOT MERGE labels Feb 3, 2025
@Jakumba
Copy link
Contributor Author

Jakumba commented Feb 3, 2025

Do not use StorageFill, use the new system. do not give them ClothingHeadsetGrey port the DeltaV prisoner headsets.

Could you point me where to look at the replacement for StorageFill?
I'll open a new PR for the DeltaV prisoner headsets, then update this one after! :)

@github-actions github-actions bot added size/M Map-Shuttle Map - Shuttle Map-POI Map - POI and removed size/M labels Feb 3, 2025
@dvir001
Copy link
Contributor

dvir001 commented Feb 3, 2025

Do not use StorageFill, use the new system. do not give them ClothingHeadsetGrey port the DeltaV prisoner headsets.

Could you point me where to look at the replacement for StorageFill? I'll open a new PR for the DeltaV prisoner headsets, then update this one after! :)

Look at upstream locker fills

@dustylens
Copy link
Contributor

dustylens commented Feb 6, 2025

Took a look at the lockers. They look good and the fill seems nice.

This seems like a pretty great addition to address the need to dress prisoners up in appropriate attire without stepping into the realm of bloat or questions regarding channels and other pieces of baggage that might come with the delta headsets.

There may be some parts of dvir's feedback that I'm missing. I'm not sure what some of the issues raised are. This seems like a pretty good stopgap between what we have now and a much larger PR of what might be ideal. Adding new prisoner channels/etc is way outside of the scope of this PR?

While it's not my business I would have enjoyed seeing the locker and the mapping in different PRs but, you know. I'm just some guy.

@whatston3
Copy link
Contributor

Hello!

I thought I'd lend a hand here; I've got a set of suggestions that I think would make sense. All of the changes are up here, look it over if you can - feel free to take from it, get me to merge it, or comment as you like: https://github.com/Jakumba/frontier-station-14/compare/nfsd-prisoner-fills...whatston3:frontier-station-14:2025-02-10-prisoner-fill-suggestions?expand=1

In summary:

  • Copied over the Delta-V prisoner headset, made a few tweaks to the entity definition, should be alright, common channel only for now.
  • Swapped out the headsets in the NFSD PTech with orange ones - if a cadet loses their headset and gets a bright orange replacement, this is absolutely a feature.
  • I consolidated from NFSD and non-NFSD prison lockers into a smaller set. Use the NF-prefixed set for mapping, everything else is hidden.
    • I don't think we need a strong distinction between a guard and NFSD prisoner's equipment locker - if we do, if the fills or branding should be different, then I'm all ears, but the fill seems inoffensive as-is and we only have the grey and orange version.
  • Swapped over from StorageFill to EntityTables and EntityTableContainerFills - these are a bit overkill to be honest, and the typing is a mess, but this one's small enough.
  • Edited mapped instances of the existing prisoner wardrobes/wall closets to the new definitions - I believe I got them all, I may be wrong.

Seems reasonable to me, happy to discuss if you disagree.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Map-POI Map - POI Map-Shuttle Map - Shuttle No C# S: Awaiting Changes This PR has changes that need to be made before merging S: DO NOT MERGE S: Untriaged YML
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants