Merge pull request #6834 from Hubblenaut/dev

Browse Source

Merges Security Lobby Desk and Brig Observation into a single room

...

This commit is contained in:

Chinsky

2014-10-24 04:31:43 +04:00

parent 7dcdfeb3a7 dae1fd8c50

commit 9f84697c4e

1 changed files with 1104 additions and 1106 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

maps/tgstation2.dmm

+1104 -1106

File diff suppressed because it is too large Load Diff