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

[MAP] New Brig Layout/Additions v3 #3375

Merged
merged 1 commit into from Apr 9, 2014

Conversation

Projects
None yet
2 participants
@Steelpoint
Copy link
Contributor

commented Apr 9, 2014

AKA: Holy shit map conflicts!

#3362

Everything should be dandy now. Yes I am merging from my master repo but fuck it.

The below text is just for posterity.


A overhaul, to an extent, of the brig design and contents for Boxstation.

Brig Map Overhead (Yes there is a misalignment, I fixed that in the subsequent version)
https://dl.dropboxusercontent.com/s/kkscw0lpid8ka0g/System%20Spess%20Junk%20Six%202014-04-07%20225523.png

What's new?
-Prisoner Transfer Room (Execution room): AI control on the two doors is cut and no cameras.
-Insane Ward: Used in detaining insane prisoners, actually used to assist in deconversion of cultists.
-New Armoury Contents!

  • Ion Rifle
  • 2 Riot Shotguns
  • 8 Beanbag Shells
  • Box of Tear Gas Grenades
  • Deactivated Securitron Unit (Securitron 1138)
  • Replaced standard Gas Mask with Sec Gas Masks.

-Rearranged the HoS's Office (Also fixed missing disposal pipes).
-Rearranged the break room tables.
-Moved the HoS's spawn to be near the Officers spawn.
-Added a connection hallway connecting the Gulag Shuttle to Perma Hallway.
-Removed the Evidence Holding room and moved it down to the main hallway.
-Added a wall mounted flasher by the brig entrance.
-Adds a new door connecting the Warden's Office to the break room.

NOT SHOWN
-Added a recharger to the Sec Checkpoint at the escape wing.


@theOperand

This comment has been minimized.

Copy link
Contributor

commented Apr 9, 2014

brb merging one of the other map prs.

@Steelpoint

This comment has been minimized.

Copy link
Contributor Author

commented Apr 9, 2014

Raging Intensifys

@Steelpoint

This comment has been minimized.

Copy link
Contributor Author

commented Apr 9, 2014

It works!?!?!?!?!

Have I satisfied what is needed for a merge?

theOperand added a commit that referenced this pull request Apr 9, 2014

Merge pull request #3375 from Steelpoint/master
[MAP] New Brig Layout/Additions v3

@theOperand theOperand merged commit f173eb9 into tgstation:master Apr 9, 2014

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details
@Steelpoint

This comment has been minimized.

Copy link
Contributor Author

commented Apr 9, 2014

Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.