8/9/2024 Upstream merge #386
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
* Add pen clicking sound * switch to OnUse and reduce distance a little
Update RespiratorSystem.cs Co-authored-by: plykiya <plykiya@protonmail.com>
* Meteors that leave behind asteroid ore * bigger offset * Bit more generic * Better defaults * hrm? * I HATE CUSTOM SERIALIZERS * More comments * renamed a variable --------- Co-authored-by: plykiya <plykiya@protonmail.com>
* Change Social Anxiety ----> Stutter * Update traits.ftl --------- Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
* Adds hand labelers to the chemdrobe and ptech * LawDrobe too * Update cart.yml --------- Co-authored-by: plykiya <plykiya@protonmail.com>
* Add support for reagents in lathes * missing locale
* no texture machine * done * delete wip * bug fixes * oops * CutterMachineCircuitboard Glass: 500
* Change from obsolete method in ExplosionOverlay * Send AppearanceSystem through constructor
* Update Marathon restocks beacons emitters * Update 2 perma fixes
I expect you to die!
* Update MoverController.cs * Update a bunch of movement code to use Entity<T> * Last errors * wow, there were more errors --------- Co-authored-by: plykiya <plykiya@protonmail.com>
The issue is it plays the "you hug xyz" to everyone in range as well as the target client so they overlap. IDK if anything else is broken by this but this control flow is pretty bad so I wouldn't be surprised.
…ls shuttle (#30519) show the player a server message when they get booted from the arrivals shuttle
* handled check * splits Handled and TryResetDelay checks
* Log enrichment: Explosion damage to players * Update Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> * Revert to total damage variant only, currently serialised as string. * Make this its own log type. --------- Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
* ugh * Revert "ugh" This reverts commit 8b5b0e24bcaa6c5cc9229c17eb138cdb476f0c9e. * Revert "Automatic changelog update" This reverts commit 4f8b634. * Revert "Revert "Automatic changelog update"" This reverts commit 9fc2a3307a06e5f7d19bbb8d29e45b9a1d1470c8. * Revert "Revert "Revert "Automatic changelog update""" This reverts commit 1ae733bf308d7285159dd1fafd7f17101d8f4ced. * Revert "Revert "Automatic changelog update"" This reverts commit 9fc2a3307a06e5f7d19bbb8d29e45b9a1d1470c8. * Revert "" This reverts commit 1cc0953333cf3d4f2cad5fae2f5c562ae99563ae. * Revert "" This reverts commit edca368a8444fd0fd403333695668d1c1db3726a. * Revert "Revert "ugh"" This reverts commit 3ac15dfb07c7ae43b797724f85b76193ecd7a0e1. * Revert "Revert "Revert "ugh""" This reverts commit b952a4556397c8abcc7c319d736fab7ae48073a2. * Revert "Revert "Revert "Revert "ugh"""" This reverts commit ff1a151571dea653d78ac2bda75eb11209da8d96. * Revert "ugh" This reverts commit 8b5b0e24bcaa6c5cc9229c17eb138cdb476f0c9e. * Update SharedCuffableSystem.cs
* Make hotplate and grill anchorable on table part 2 * Update hotplate.yml
* gameticker.gamepreset namespace * setgamepreset now has a finite duration * comments, cleanup
* Make vox roundstart I believe all the issues are fixed. * Click detection bandaid * Make clickable 1% nicer Still bad. Still doesn't handle multi-viewports well.
* new decals * license * re-check
* Add access to gun components Found from an rmc14 PR. * Admin verbs proving why access needs to exist * Someone is probably going to post this pr to le reddit and complain about self-merges.
Revert "setgamepreset command rework (#30756)" This reverts commit de86fdb.
* Avoid destroying and recreating record list on every update message * Add early-out on nullptr input * Remove sussy null suppress --------- Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* cleanup of AddComponentSpecial * add RemoveComponentSpecial * require --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* add * red and generic * add meta
Apparently I need to check if they're holding an item Co-authored-by: plykiya <plykiya@protonmail.com>
…8719) * [Fix] CMO's equipped cloak * [Fix] CMO's equipped cloak * [Sprites] In hands for bluespace beaker * [Sprites] In hands for bluespace beaker * [Sprites] In hands for bluespace beaker * [Sprites] In hands for bluespace beaker
Wanted to package a server for the funny on my macbook and noticed it was not working cause of this... now it will workie :3
* Buckling an entity requires a do-after * Works but feels like bad code? * Cleanup --------- Co-authored-by: plykiya <plykiya@protonmail.com>
* add * comma * sprites * yaml-ify * add s * lathe and engi belt * yes * fix maybe * progress * nearly there * fix * fix yaml linter having a stroke
* Crowbars fix * oops
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.
This pulls in all commits from space-wizards/space-station-14 as of 4:40 PM EST, and applies it to take2.
This has not been tested as of writing but honestly take2 hasn't done a whole lot that'd break from updates yet so it probably isn't a big deal