UPDATE #1
Merged
UPDATE #1
Conversation
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 reverts commit 848d181.
This reverts commit a049268.
Nerfs slime mutations heavily, adds slime spawns to lavaland, adds xenobio pet carriers that can transport them
adds slime hunting equipment to the map, slightly modifies description of carriers to show intended use.
…es"" This reverts commit 5c6f160.
really travis?
now all maps (except the WIP minski) have slime hunting equipment.
Cleans up the code a bit for Alex
fixes a comment
now using a labeler on it wont break the code
cant think of other music for it
Server Instance: yogstation
Concatenates the holiday checks
christmas music
Replaces the diamond pickaxe in necropolis chest with mythrill
independence day mysuc
Port lavaland elites from TG
…eal-this-time Randomizes xenobio bridge
Adds a map of the station to players' boxes
Mr-Space
pushed a commit
that referenced
this pull request
Dec 14, 2019
Adds two new songs to titlescreen.
Mr-Space
pushed a commit
that referenced
this pull request
Jan 13, 2020
* Tgui-next pandemic (#48074) * pandemic * rebuild * flatten object * use the correct var derp * lint fixes + rebuild * Rebuild tgui * Tgui-next pandemic (#48074) * pandemic * rebuild * flatten object * use the correct var derp * lint fixes + rebuild * Rebuild tgui * tgui-next portable atmos (#48081) * portable atmos stuff * better titlecase handling * Rebuild tgui * Update tgui dependencies, improve window dragging (#48213) * Update tgui dependencies * Rework window drag and vectors * Refactors language holder (#48106) * Language holder refactor * Ironed out bugs, testing * adds sourced language, blocking list. more useful helpers. * Replaced old usage * Adresses requests * Autodoc attempt #1 * Fixed monkeyize (again) * Travis happy * Language menu updated * Final pass * durrrr (#48329) * Refactors language holder (#48106) * Language holder refactor * Ironed out bugs, testing * adds sourced language, blocking list. more useful helpers. * Replaced old usage * Adresses requests * Autodoc attempt #1 * Fixed monkeyize (again) * Travis happy * Language menu updated * Final pass * lol * lol2 * lol Co-authored-by: Rob Bailey <actioninja@gmail.com> Co-authored-by: Aleksej Komarov <stylemistake@gmail.com> Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com> Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
Mr-Space
pushed a commit
that referenced
this pull request
Jan 17, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
17 participants
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.
Intent of your Pull Request
Explain what the purpose of your PR is.
Mention if you tested your changes. If you changed a map, make sure you used the mapmerge tool.
Mention if your PR is related to an issue.
You can type "Fixes issue #6" and issue 6 will be automatically closed when your pull request is merged. This is much easier for everyone.
Edit the changelog at the bottom for changes that are noticeable by the players. Remove it if this isn't the case.
If you add a name after the ':cl', that name will be used in the changelog. Leave it empty to use your GitHub name.
Include [admin] in the title if it's something admin related.
Include [s] in the title if you don't want it to be announced on discord and the server.
Changelog
🆑
rscadd: Added new things
rscdel: Removed old things
bugfix: fixed a few things
wip: This is work in progress
tweak: tweaked a few things
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
experimental: This is experimental
/:cl: