diff --git a/README.md b/README.md index 32a9cb153a..5fb122c496 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,32 @@ -# space-station-14-content +# Space Station 14: Content Repo [![Build Status](https://travis-ci.org/space-wizards/space-station-14-content.svg?branch=master)](https://travis-ci.org/space-wizards/space-station-14-content) + +Space Station 14 is a revived attempt at an SS13 remake. This is the primary content repo for Space Station 14. To prevent people forking the engine, a "content" pack is loaded by the client and server. This content contains everything needed to play the game on one specific server. + +If you want to develop SS14, this is the repo you need. Both for engine and content development. + +## Getting in Touch + +* Website: [spacestation14.io](https://spacestation14.io/) +* Discord: [Invite Link](https://discord.gg/t2jac3p) +* IRC: `irc.rizon.net#spacebus` +* Project Management Board: [Waffle](https://waffle.io/space-wizards/space-station-14) +* Automatic Content Builds: [builds.spacestation14.io](https://builds.spacestation14.io) + +The IRC is setup to relay back and forth to the Discord server so [IRC nerds](https://xkcd.com/1782/) will not be left out. + +## Documentation + +We have various documentation articles about various systems on the GitHub wikis of this repo and the engine. + +* [Engine Wiki](https://github.com/space-wizards/space-station-14/wiki) +* [Content Wiki](https://github.com/space-wizards/space-station-14-content/wiki) + +## Contributing + +We are happy to accept contributions from anybody. Get in Discord or IRC if you want to help. We've got a [list of issues](https://github.com/space-wizards/space-station-14-content/issues) that need to be done and anybody can pick them up. Don't be afraid to ask for help either! + +## Building + +[See the relevant wiki page](https://github.com/space-wizards/space-station-14-content/wiki/Getting-Started) diff --git a/engine b/engine index 0563a5beb3..170e1ad5af 160000 --- a/engine +++ b/engine @@ -1 +1 @@ -Subproject commit 0563a5beb3a850a09ffd6bb6f85f0721d9f3646f +Subproject commit 170e1ad5afe018339b3936550260dc91fb296505