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.

Sign up for GitHub

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

Jump to bottom

Engine Room Redesign #4318

Merged
merged 4 commits into from
Jan 20, 2014
Merged

Engine Room Redesign #4318

merged 4 commits into from
Jan 20, 2014

Conversation

ElArGee
Copy link
Contributor

@ElArGee ElArGee commented Jan 19, 2014

Based on this thread: http://baystation12.net/forums/viewtopic.php?f=5&t=9528 and this thread: http://baystation12.net/forums/viewtopic.php?f=5&t=9467

Changes:

  • Added engine monitoring room
  • Tweaks to the engine room
  • Engine room taken off main power grid - power now regulated by SMES
  • Added directional sprites to pod doors - you can now make horizontal blast doors
  • Tweaked pod door code to render under glass window draw layer when open, but on top while closed (I may add this to firedoors too)
  • Added Supermatter user manual sprite
  • Made engineering storage area overlay sprite transparent
  • Fixed a few other mapping errors in the engineering wing

@ElArGee
Engine room redesign
f406dc2 
- Added monitoring room
- Changed airlock
- Moved SMES to engineering bay
- Fixed a few other mapping errors in the engineering wing
@ElArGee
Engineering area tweaks
0ede7ed 
- Added a few Engineering areas, and moved one from the Rust files
- Made the "Engineering Storage" area overlay sprite transparent
@ElArGee
Pod door tweaks
0f40687 
- Added directional pod door sprites
- Made pod doors change draw layer when they open and close
   - Pod doors draw behind the glass layer when open
   - Pod doors draw in front of the glass layer when closed
@ElArGee
Updated Supermatter user manual sprite
24c6063
@ElArGee
Copy link
Contributor Author

ElArGee commented Jan 19, 2014

Reapplied my changes to the latest dev map.

I also found out what rebase does - no more "merge" commits in PR's \o/

@Ccomp5950
Copy link
Contributor

Went ahead and pulled this on my test server, everything looks awesome.

Very good job!

comma added a commit that referenced this pull request Jan 20, 2014
@comma
Merge pull request #4318 from Loganbacca/engineroom
5a8eb3c 
Engine Room Redesign
@comma comma merged commit 5a8eb3c into Baystation12:dev Jan 20, 2014
@ElArGee ElArGee deleted the engineroom branch January 21, 2014 08:36
@ElArGee ElArGee mentioned this pull request Jan 21, 2014
Merged
@caelaislinn caelaislinn mentioned this pull request Jan 22, 2014
Closed
@Ccomp5950 Ccomp5950 mentioned this pull request Feb 26, 2014
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ElArGee @Ccomp5950 @comma