Upstream sync #556
Merged
Upstream sync #556
Conversation
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
* Lathes: Show missing materials amount in tooltip * Use AppendLine and remove the last newline at the end
Various fixes
Co-authored-by: poeMota <[email protected]>
Co-authored-by: poeMota <[email protected]>
Co-authored-by: poeMota <[email protected]>
Fix lathe material list bug
* Fix body bag id * migration
* Make clothing cheaper * bueah * proper price *
Fix tray scanner not updating it's range on change. Add range value to the tray scanner state.to synchronize it between client and server.
* predict humanoid identity examine * actually server doesnt need proto anymore --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* meat and potatoes hahaha * DAMAGE yes * come on * Check again * Guhhhhh guh
* Ion Storm Laws Review Have reviewed the Ion Storm law dictionary and tidied it up. Specifically I've tried to keep the same number of entries in each section, or slightly increased them, where I've removed or altered a string. Of note, specific colours and "rainbow" have been removed from adjectives and replaced with words like "Cheese-Eating", as colours are kinda boring themselves and they've been a cause of a few accidentally-racist laws. * Resolve some feedback. * Remove the pull request joke, noooooo * Re-add big bite burgers as they are actually a thing * Append some more suggestions
Praise Ratvar
* First pass cleaning up server-only YAML errors. * Second pass
* Insectoid Gauze, Added racial marks to variants * removed excess r from gauze_moth_lowerleg_r * Update gauze.ftl * moved all markings to Overlay Category * fixed localization error * a
Co-authored-by: deltanedas <@deltanedas:kde.org>
This command allows you to grant a player temporary privilege to join regardless of player cap, whitelist, etc. It does not bypass bans. The API for this is IConnectionManager.AddTemporaryConnectBypass(). I shuffled around the logic inside ConnectionManager. Bans are now checked before panic bunker.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.