Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Conversation

@maxion12345
Copy link
Contributor

@maxion12345 maxion12345 commented Oct 8, 2021

Document the changes in your pull request

TODO:

  • Fix security hud not updating when you brig someone (Sets their record to incarcerated but HUD won't update until something forces it (removing mask, etc)

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:

@maxion12345 maxion12345 requested a review from a team as a code owner October 8, 2021 21:40
@Yogbot-13 Yogbot-13 added Feature This adds new content to the game Javascript This PR contains javascript code. Mapping Will result in a change to a map. Revert / Deletion Altoids is probably mad about this labels Oct 8, 2021
@github-actions github-actions bot added the tgui This PR affects TGUI label Oct 8, 2021
@ToasterBiome
Copy link
Contributor

I liked the auto adding to ID's :'( Maybe let us put their ID in there and itll auto add the crime?

@maxion12345
Copy link
Contributor Author

I liked the auto adding to ID's :'( Maybe let us put their ID in there and itll auto add the crime?

I'll see if I can port the auto-record setting from genpop

@maxion12345 maxion12345 changed the title Alternative to genpop PR, adds preset crimes to our current brig timers Alternative to genpop PR, adds genpop interface to our current brig timer Oct 9, 2021
@maxion12345
Copy link
Contributor Author

ready for testmerge

Copy link
Contributor

@patpol4 patpol4 left a comment

Choose a reason for hiding this comment

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

This looks really bad on box with the half door but ok

Copy link
Contributor

@adamsong adamsong left a comment

Choose a reason for hiding this comment

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

Why is this touching rust_g?

@adamsong adamsong dismissed their stale review October 24, 2021 19:30

rust_g no longer modified

Copy link
Contributor

@Bibby0110 Bibby0110 left a comment

Choose a reason for hiding this comment

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

tgui lookover 2 seconds

Copy link
Contributor

@Bibby0110 Bibby0110 left a comment

Choose a reason for hiding this comment

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

can't be bothered to look at tgui nevermind, do this though

@patpol4
Copy link
Contributor

patpol4 commented Oct 26, 2021

So is this good to go?

@maxion12345
Copy link
Contributor Author

So is this good to go?

aye

@patpol4 patpol4 merged commit b5942a7 into yogstation13:master Oct 28, 2021
Yogbot-13 added a commit that referenced this pull request Oct 28, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Feature This adds new content to the game Javascript This PR contains javascript code. Mapping Will result in a change to a map. Revert / Deletion Altoids is probably mad about this tgui This PR affects TGUI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants