This repository was archived by the owner on May 22, 2025. It is now read-only.
Alternative to genpop PR, adds genpop interface to our current brig timer#12422
Merged
patpol4 merged 31 commits intoyogstation13:masterfrom Oct 28, 2021
maxion12345:newbrigtest
Merged
Alternative to genpop PR, adds genpop interface to our current brig timer#12422patpol4 merged 31 commits intoyogstation13:masterfrom maxion12345:newbrigtest
patpol4 merged 31 commits intoyogstation13:masterfrom
maxion12345:newbrigtest
Conversation
Yogbot-13
added
Feature
Contributor
|
I liked the auto adding to ID's :'( Maybe let us put their ID in there and itll auto add the crime? |
Contributor
Author
I'll see if I can port the auto-record setting from genpop |
maxion12345
changed the title
Contributor
Author
|
ready for testmerge |
patpol4
approved these changes
Oct 14, 2021
Contributor
patpol4
left a comment
patpol4
left a comment
There was a problem hiding this comment.
This looks really bad on box with the half door but ok
This reverts commit eb9e863.
JamieD1
approved these changes
Oct 24, 2021
adamsong
previously requested changes
Oct 24, 2021
Contributor
adamsong
left a comment
adamsong
left a comment
There was a problem hiding this comment.
Why is this touching rust_g?
This reverts commit 5c105d0.
Bibby0110
suggested changes
Oct 24, 2021
Contributor
Bibby0110
left a comment
Bibby0110
left a comment
There was a problem hiding this comment.
tgui lookover 2 seconds
Bibby0110
approved these changes
Oct 24, 2021
Contributor
Bibby0110
left a comment
Bibby0110
left a comment
There was a problem hiding this comment.
can't be bothered to look at tgui nevermind, do this though
Contributor
|
So is this good to go? |
Contributor
Author
aye |
Yogbot-13
added a commit
that referenced
this pull request
Oct 28, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Document the changes in your pull request
TODO:
kinda realized that our current brig timer does 80% of the things the genpop one does
So, why merge this over the port?
No funky IDs to fuck around with
No turnstiles on brig doors to get yourself trapped in
[NEW] you can do automatic record-setting
[NEW] swipe prisoner ID to set their name automatically if you can't be fucked to type it
literally two button operation
Why merge genpop over this?
Easy to expand brig system
And you can stuff more then one prisoner into a cell
oh I had to remove the random brig cell variants because that broke the brig lockers automatically closing
and here's a photo of the UI
Wiki Documentation
add a note near brig procedures about swiping the prisoner's ID to automatically set the name for automatic record setting
Changelog
Edit the changelog below to reflect the changes made by this PR, even if the changes are minor - required for every PR.
If you add a name after the ':cl', that name will be used in the changelog. Leave it empty to use your GitHub name.
🆑
rscadd: Added preset crime buttons to brig timers
rscdel: Removed brig cell variations due to breaking automatic locker locking
rscadd: Turnstiles to brig
/:cl: