-
Notifications
You must be signed in to change notification settings - Fork 926
MP Main's Brig Expansion #12159
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
Open
antlersss
wants to merge
84
commits into
cmss13-devs:master
Choose a base branch
from
antlersss:brig
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
MP Main's Brig Expansion #12159
Changes from all commits
Commits
Show all changes
84 commits
Select commit
Hold shift + click to select a range
9efc1d3
New areas
antlersss 5efff11
Room layouts
antlersss 672fd4f
First Draft
antlersss 78fc1f4
fix malformed field
antlersss b334639
Merge branch 'master' into brig
antlersss 268de74
Remove banned neighbors
antlersss 2df9384
Merge branch 'brig' of https://github.com/antlersss/ant-cmss13 into brig
antlersss 1504f7d
Fixup maps in TGM format
antlersss 1239201
add missing apc's
antlersss 16b72a5
Fixup maps in TGM format
antlersss 79c383e
Adds some missing utility items
antlersss 47eb000
Fixup maps in TGM format
antlersss 9ba4727
minor fixes (thanks LC4492)
antlersss 1407453
Ledge smoothing pixel shift and layering tweaks
antlersss e24c891
Fixup maps in TGM format
antlersss 27a2772
Hacking vendors and pixel shifts
antlersss cc19557
Fixup maps in TGM format
antlersss 7c45338
This button
antlersss 30369a1
These lattices
antlersss f280dfb
Ledge layering fix
antlersss 0b5d53c
More nudges
antlersss 6a95a68
Brig Cryopod + Bodybags
antlersss a0550cd
Fixup maps in TGM format
antlersss 4afcb39
Adds cell flashers (oops)
antlersss 9e21d58
Fixup maps in TGM format
antlersss 3aa8941
Merge branch 'master' into brig
antlersss 9a964ff
Final map review changes
antlersss ebec3fd
Fixup maps in TGM format
antlersss c338142
QA Testing Changes
antlersss 5e81917
Fixup maps in TGM format
antlersss 2e1423b
Kill all MP's
antlersss dd024eb
I hate layering
antlersss 872cfab
Motion sensors, shutters, and doors
antlersss b469158
Fixup maps in TGM format
antlersss b74a26a
Remove useless attachment + add useful one
antlersss 0156644
Pouches in utility vendor
antlersss a7883e2
IV drip + Cell interior doors
antlersss df850d3
Paper template chest drawer icon fix
antlersss 141431d
Games, wardens office, chairs, hoops, oh my!
antlersss 3bf287f
Fixup maps in TGM format
antlersss 939acde
Merge branch 'master' into brig
antlersss f2a210c
Whitespace
antlersss a249080
Refactor new filing cabinets
antlersss 230bb44
Visitation access
antlersss dacb1b6
Pipes & airlock cycles
antlersss d95fde7
Fixup maps in TGM format
antlersss a6cf3c3
Merge remote-tracking branch 'upstream/master' into brig
antlersss c66a9e7
Merge branch 'master' into brig
antlersss 166ff30
67
antlersss 0754799
Vendor & Armory
antlersss 8f5e884
Fixup maps in TGM format
antlersss be87bb9
Merge branch 'cmss13-devs:master' into brig
antlersss f0793f5
Malformed field
antlersss 2cca96f
Merge remote-tracking branch 'upstream/master' into brig
antlersss af4aec2
Hijack area checks
antlersss dd88a2d
Plastic cutting
antlersss 1a08bc2
Area fixes
antlersss 439139a
Merge branch 'cmss13-devs:master' into brig
antlersss cf114fe
Merge branch 'brig' of https://github.com/antlersss/ant-cmss13 into brig
antlersss 5117b87
Rolling TV
antlersss 1d36927
Add rolling TV
antlersss 4455a5a
Fixup maps in TGM format
antlersss 0fcc78a
Dull knives
antlersss 6585a1e
Update code/game/objects/items/reagent_containers/food/fish_snacks.dm
antlersss 78356cc
Update code/game/machinery/computer/camera_console.dm
antlersss 87d720f
RC's
antlersss c3dccfd
Lint
antlersss 3c3553f
Fix filing cabinet merge conflicts
antlersss 9308e69
Hardened APCs
antlersss 42e945f
Merge remote-tracking branch 'upstream/master' into brig
antlersss 3961040
VHS Sprites
antlersss 3df20ba
More
antlersss e8c98ca
Update meat.dm
antlersss 54a92a2
Merge remote-tracking branch 'upstream/master' into brig
antlersss 31b303a
67 is dead.
antlersss 846167b
Repath plastic knives
antlersss 292b5fc
Fixup maps in TGM format
antlersss ec3848c
Update plastic utensil paths
antlersss 4f9af8f
Add path script
antlersss 902266d
Apply suggestions from code review
antlersss ba9283d
Ok
antlersss 6ee8062
Merge branch 'brig' of https://github.com/antlersss/ant-cmss13 into brig
antlersss e6b1f4b
Metadata fix?
antlersss 10f66c4
Try again
antlersss File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
|
antlersss marked this conversation as resolved.
|
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
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
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
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
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
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
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
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.