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

Refines the Farragus Security/Command Asteroid #27352

Merged
merged 46 commits into from
Dec 1, 2024

Conversation

Fordoxia
Copy link
Contributor

@Fordoxia Fordoxia commented Nov 13, 2024

What Does This PR Do

This PR remaps the Security/Command asteroid on Farragus to achieve several outcomes:

Improved Maintenance Tunnels

  • The connectivity of the maintenance tunnels has been improved to avoid one-way tunnels. Interconnectivity is strongest in the command and command/security section.

  • The tunnels have been decorated, new rooms have been added, and overall distinctiveness has improved. 2 new airlocks allow traversal to and from space without having to travel to the space bridges.

  • Atmospheric checkpoints have been added with air alarms to control the ventilation in the tunnels.

  • A redundant SMES room that just gave power to the locker room area has been removed.

  • The escape pod area has been given a big improvement. In addition to looking great, it also doesn't get spaced when the shuttle leaves.

New and Improved Permabrig

Farragus had a truly depressing permabrig. Whilst the dismal state of it may have been fully intentional, the gimmick of it being a hole wears off pretty fast. The permabrig has been equipped with amenities that it lacks compared to other stations that will make it better for both the prisoners and security, including:

  • Decent Lighting
  • An IPC toilet that isn't in full view of everyone.
  • The pet lizard "Greentext" now appears in this permabrig.
  • A kitchen (on par with the one found on Cyberiad).
  • A well-lit, properly equipped garden with greenery.
  • A bigger selection of recreational outlets.
  • An actual dedicated entry airlock, not serving double-duty as isolation.
  • An emergency nanomed vendor.
  • A full laundry room.
  • A place you can go to escape from perma via space.
  • A bucket and mop.

New and Improved Rest-of-the-Brig

The rest of the brig has also gotten some love:

  • There is now a front desk that can be manned to allow officers to interact with the public better and exchange items using the desk shutter. Includes a desk bell for getting attention.
  • Processing/evidence is now adjacent to the cell block to make turnaround times for non-perma inmates faster.
  • The warden office/armoury is now adjacent to where the gamma armoury will land. The armoury is now stocked with an EOD suit and 2 security biosuits. It is harder to breach from maintenance, but it can be breached from space now.
  • The break room is now in the middle, where all the big rocks used to be, and is equipped with vendors for an enhanced break room experience.
  • The equipment room now features an additional drip vendor and two items of medical supplies.
  • The firing range has been expanded to accommodate the full set of nuclear training gear.
  • The courtroom has been redecorated and given a proper holding cell for the accused (which will be used exactly once in the next 3 years).
  • The Head of Security now has a bedroom and his pet spider (along with a spider bed to keep the spider in).
  • A number of cigarettes and ashtrays have been added.
  • Execution has been improved with the addition of several execution methods. The random bat room was removed.
  • The locations that the gamma armoury and labour shuttle will dock have now been marked with beacons.
  • There is now a bathroom for security to use.

Hallways/Command Plaza

  • The bridge/HOP line has been shifted up and a plaza has been added. In addition to providing a space to meet, greet, and roleplay, a large statue of the captain watches over the crew from his spot of greenery.

  • A camera blindspot was removed from the Command/Cargo/AI bridge.

  • A pet store has been added to the plaza area west section.

  • The Vault has now been given a space gap on its sides, consistently with other stations.

  • Due to the Command atmos checkpoint being moved into command maintenance, the left command-engineering space bridge airlock access is now accessible to all the crew.

Other Changes

  • The NT Rep office has been slightly expanded in lieu of a pay rise.

  • A bunch of random items have been moved to the former APC room of the bridge, this is now the bridge storeroom.

  • The disposals loop got slightly simplified.

  • The IAA got their desk moved a bit. Paperwork now has a bed.

  • All eligible role workplaces now have action figures and novelty mugs.

  • The Dorm Toilets and Dorms are now separate areas from the Locker Room.

  • I think I managed to get rid of all the wallbump conflicts on the asteroid.

Why It's Good For The Game

Massive improvements to maintenance make it more usable for travel, more interesting to explore.

Permabrig doesn't suck so much, people won't want to riot as much because they have other things they can do. Escaping from space no longer sucks.

Brig layout feels nicer. You can now wash the blood off your hands in the new bathroom.

Images of changes

Full map
image
Permabrig focus
image
Left brig
image
Right brig
image
HOS office and bedroom
image
IAA office
image
Left brig maintenance
image
Upper right brig maintenance
image
Brig/Bridge maint transition
image
Upper Bridge Maint
image
Lower Bridge maint
image
Vault
image
Bridge plaza and pet shop
image
NT Rep office
image
Bridge and Store Room
image

Testing

  • Ensured camera coverage is correct.
  • Checked lighting.
  • Ensured door access is correct.
  • Verified that the new perimeter of the asteroid is cold ancient rock.

Declaration

image
image

  • I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

Changelog

🆑
tweak: The Farragus command/security asteroid has been remapped. The brig has seen the heaviest amount of remapping, along with the maintenance tunnels.
add: 2 security biosuits, 1 EOD suit have been added to the armoury.
add: Pet shop added to new command plaza.
add: Extra camera coverage in command/cargo/AI bridge to fill in a blind spot.
/:cl:

@SynthTwo
Copy link
Contributor

!wiki_label

@github-actions github-actions bot added Requires Wiki Update Useful for Wiki Contributers to search for things that need updating Merge Conflict This PR is merge conflicted labels Nov 14, 2024
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally Map Edit This PR will modify a map labels Nov 14, 2024
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Nov 25, 2024
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Nov 26, 2024
Copy link
Contributor

@warriorstar-orion warriorstar-orion left a comment

Choose a reason for hiding this comment

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

Maints camera:

2024_11_30__10_04_43__paradise dme  cerestation dmm  - StrongDMM

Could you push these pickaxes so they're more centered on the rack?

2024_11_30__10_07_36__paradise dme  cerestation dmm  - StrongDMM

This QM access shouldn't be necessary

2024_11_30__10_10_58__paradise dme  cerestation dmm  - StrongDMM

Missing floor tile?

2024_11_30__10_12_33__paradise dme  cerestation dmm  - StrongDMM

One of the processing cameras has the word "Prisoner" in its tag, the other doesn't

2024_11_30__10_19_37__paradise dme  cerestation dmm  - StrongDMM
2024_11_30__10_19_48__paradise dme  cerestation dmm  - StrongDMM

"West" is in all caps on this camera tag

2024_11_30__10_20_42__paradise dme  cerestation dmm  - StrongDMM

There's only one labor camp camera but it's tagged "North"

2024_11_30__10_22_08__paradise dme  cerestation dmm  - StrongDMM

Courtroom camera has a trailing space in its tag name

2024_11_30__10_22_24__paradise dme  cerestation dmm  - StrongDMM

@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Nov 30, 2024
@Fordoxia
Copy link
Contributor Author

Maints camera
Could you push these pickaxes so they're more centered on the rack?
This QM access shouldn't be necessary
Missing floor tile?
One of the processing cameras has the word "Prisoner" in its tag, the other doesn't
"West" is in all caps on this camera tag
There's only one labor camp camera but it's tagged "North"
Courtroom camera has a trailing space in its tag name

All issues addressed.

@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Dec 1, 2024
Copy link
Contributor

@warriorstar-orion warriorstar-orion left a comment

Choose a reason for hiding this comment

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

LGTM

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Dec 1, 2024
@Burzah Burzah added this pull request to the merge queue Dec 1, 2024
Merged via the queue into ParadiseSS13:master with commit 7bda12a Dec 1, 2024
12 checks passed
@Fordoxia Fordoxia deleted the Farragus-Command-Asteroid branch December 1, 2024 13:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting merge This PR is ready for merge Map Edit This PR will modify a map Requires Wiki Update Useful for Wiki Contributers to search for things that need updating
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants