-
-
Notifications
You must be signed in to change notification settings - Fork 684
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
New Syndicate Operative Base & ship #11078
Open
spockye
wants to merge
69
commits into
BeeStation:master
Choose a base branch
from
spockye:syndicate-asteroid
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.
+22,986
−24,694
Open
Changes from 68 commits
Commits
Show all changes
69 commits
Select commit
Hold shift + click to select a range
580aff4
it begins
spockye 0f4d14b
Drop Pod frontend
Tsar-Salat 816a913
trying out different hangars
spockye 05cc6f5
Update CentCom.dmm
spockye d951573
Update CentCom.dmm
spockye 13064bd
finishes hangar
spockye 870c2ad
finishes up both parts
spockye 8bb6d4e
hangar without ship
spockye a0413ac
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye 74194b4
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye 13c5c4a
Update CentCom.dmm
spockye 8a7cd29
adds a missing light
spockye b0d39f1
replaces all water with the AIR having version of water
spockye 08299e9
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye 9c7fcfd
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye 3902bb1
responds to reviews
spockye 97f0d94
updates more poster names
spockye 4b37ccd
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye 4febabe
misc fixes
spockye 3bf9493
moves the base to the right location
spockye 57025a7
test open/close
Tsar-Salat a7e98f3
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye 0e5a9b4
is this a good idea? i dont know. am i going to do it anyways? yes
spockye 99df843
Revert "is this a good idea? i dont know. am i going to do it anyw…
spockye 9f6cdbd
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye 894d5b8
death to elevators!!!
spockye 7ef70f6
Update CentCom.dmm
spockye b6eb4b8
firelocks. decalchanges
spockye 8a34e41
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye 3783b36
small decal changes / four spawners instead of six
spockye 69674d5
adds escape shuttle dock
spockye 0b250ce
adds the new catwalk tiles to the advanced infiltrator
spockye 27a23c9
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye 33545b6
stray decal
spockye f19a7aa
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye 02780f5
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye fa5c7ab
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye 3ffdf94
fixes some lattices in walls
spockye a17bc14
removes unused elevator junk
spockye a0d1aec
Merge remote-tracking branch 'BeeStation/master' into syndicate-asteroid
Tsar-Salat b026ce7
techfloor replacement
Tsar-Salat 775af5e
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye e5ff0de
seeing red
spockye 05dcd20
misc fixes
spockye ca2d8c1
more small fixes
spockye 960b072
Merge remote-tracking branch 'BeeStation/master' into syndicate-asteroid
Tsar-Salat 494e95b
manual edits to remove bad var
Tsar-Salat ba10d4b
oops
Tsar-Salat e48d19a
droppod map & snowflake removal
Tsar-Salat aac234a
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye e882c32
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye 85db415
gives in to peer preassure
spockye 8bed001
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye 50ef486
misc updates / pixel errors
spockye 12adffd
wth. snow??
spockye 3e33ebc
snows it up part two
spockye 66f7e93
Merge remote-tracking branch 'BeeStation/master' into syndicate-asteroid
Tsar-Salat 1ffd70c
fix
Tsar-Salat dcdea58
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye 0e3d3a7
updates
spockye 6578e6f
Update CentCom.dmm
spockye f76948a
Update CentCom.dmm
spockye af1a618
Update CentCom.dmm
spockye 99d00eb
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye f8fe5f4
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye 700c691
fixes conflict
spockye e0af74c
Update CentCom.dmm
spockye fd83fd9
Merge remote-tracking branch 'upstream/master' into syndicate-asteroid
spockye 138d57a
lets see if this fixes it... edition 1
spockye 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
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains 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 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 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
Binary file not shown.
Binary file not shown.
This file contains 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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remember to replace this string with the name of the syndicate dropped door, after you add it to the supply pod.dmj