Merge upstream 16.11.24 #737
Merged
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
## About The Pull Request Watchers dealt no melee damage which led them to only nuzzle their targets. This PR brings back their 15 damage back. ## Why It's Good For The Game Little bug fix. ## Changelog :cl: Hardly fix: Fixes watchers not attacking their targets in melee range /:cl:
## About The Pull Request Fix a few runtimes with furious steel due to object / effect fuckery ## Why It's Good For The Game bugfix ## Changelog :cl: fix: fix furious steel and blade ascension being jank /:cl:
…gstation#87906) ## About The Pull Request Was investigating some stuff downstream related to undeleted SQL queries, and these two queries were related. thought it'd be best to make them not block `/client/proc/set_client_age_from_db`, as the results are never checked anyways, not even for errors. I've added a new proc to SSdbcore, `FireAndForget` - takes the same parameters as NewQuery, but instead of returning the query, it just asynchronously executes and then deletes it. ## Why It's Good For The Game less undeleted sql queries, less blocking. yay? ## Changelog does this count as user-facing? unsure how i'd changelog this tbh
…87918) ## About The Pull Request job skillchip, combat skilchip, bad skilchip ## Why It's Good For The Game combat is bad job is bad no quirk no good no no no, no quirk get combat no quirk get job contant, ver ybad not good ## Changelog :cl: fix: [no gbp] renmoves bartender skillchip from chipped quirk /:cl:
## About The Pull Request This fixes the radio jammer screentips since it was using the wrong path. ## Why It's Good For The Game Consistency. ## Changelog :cl: fix: Fix radio jammer screentips /:cl:
((First Pull Request, please bare with me)) There was a reported error from a user across all maps that updating the Research Node message with the AAS system would never update. It turns out to just be a syntax error. the ' around %NODE ' translates them into ASCI code. Leaving out the ', it will properly update the message as intended by the user. I have tested this multiple times and taken screenshots for proof. I also adjusted the other variable of new_text to newText so that it matches the other variables for other announcement messages. ## Why It's Good For The Game This fixes just a plain old broken bug that seems to have gone unnoticed for the most part. ## Changelog :cl: fix: Fixed Automatic Announcement System bug with the Research Node Announcement message not updating properly. It will now properly save and announce whatever input the user desires! :cl:
…te gravgens) (tgstation#87911) ## About The Pull Request Closes tgstation#87203 Forgot that move_force was a thing ## Changelog :cl: fix: Fixed tethers being able to move immovable objects (and delete gravgens) /:cl:
github-actions
bot
added
the
🙏 Слияние с восходящим потоком
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.
About The Pull Request
Мерге апстрим