Merge wizden up to 18/02 #857
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
(cherry picked from commit 6c20938c46e4e2a21729aeb395b0fbd430552c48)
do (cherry picked from commit 5380f64cca7ffcf1f54e75e876e38a7cfb70b18d)
Removed emote text (cherry picked from commit af21657cc37ce14675df38cb7fcf44dcc39bcb3c)
(cherry picked from commit 3f0572b4e6a3c0bbc21e12c2a9c9a1ac2f7e32d8)
add (cherry picked from commit 601da0c3a33279beff818f82913ed2583e48c642)
(cherry picked from commit e57cfea9f60a969a8f6de7a0f9a1d796a6d78af1)
* Fix brig timer labels to displaying correctly. The TextScreenSystem was expecting a string, but the value inputted for the label was an array of strings. * Address nitpick This should do the exact same thing but it is semantically clearer I guess. (cherry picked from commit 1a3ce6cf2c50d59e91f682011f58e3345f48e86e)
(cherry picked from commit f77550dc83c52b693ac7f18214514df280e3f2f6)
(cherry picked from commit 8422216f3fccd4c9513c48631e654e26b43f36fb)
* destructible mop buckets * remove wwod * spacing --------- Co-authored-by: doom <[email protected]> (cherry picked from commit 717d4230e2044448810e73ae5e7aed2ab7956ec7)
(cherry picked from commit a6de63cfd0bfe9a099b8e9ccebb7a3a9bc221099)
* Straw hat. A craftable, flammable straw hat. Thats it. * seems to made it go in flames! (cherry picked from commit 007adfc8a6660daf923891b873399d6061642ce7)
(cherry picked from commit a81ce947a15bdeb16226332c3d24643ca4ab4024)
* - Renamed GetSortedRootEntries to GetSortedEntries and added child sorting logic - Removed unessesary Tree.SetAllExpanded(true) call in RepopulateTree * Adding back deleted setallexpanded call to check if test passes --------- Co-authored-by: Your Name <[email protected]> (cherry picked from commit 3b2921a3ccc5adfdd6d7c4020e814e4d56b5b3e3)
(cherry picked from commit 9e79a26830830068b7f1a47f0b5e7b987fc7fead)
This reverts commit 1959db6
* Syndicate encryption key grammar fix An encryption key used by... wait... Who is owner of this chip? > An encryption key used by... wait... Who is the owner of this chip? * Syndicate key grammar fix An encryption key used by... wait... Who is owner of this chip? > An encryption key used by... wait... Who is the owner of this chip? (cherry picked from commit de0d5e4af64b16e64cf71c8c0406970f2a543280)
Fix comparison Hybrids (different plants being crossed) are supposed to have a high chance of becoming seedless to balance overpowered plants. However, a logic error in the comparison gave seedless to plants when they were from the same seed (not hybrids) rather than the other way around. Reported by: @genderGeometries (cherry picked from commit 28755f5405cb4415da1256ac75e1d5496c497231)
* Fixed Error with RobustToolbox Edits. Removed the addition of secbelt tag from assault belt. * Resprite of the monstrosity * Resprite of the tourniquet NO LONGER PHALLUS SHAPED * too bright, now darker and edgier * Tourniquet resprite * metajson yay (cherry picked from commit bd4e2c35ec0a101485906228859366317ff60c37)
(cherry picked from commit d6c6c1d9820b072e4c41010a1b8a0ba8574389c8)
1 (cherry picked from commit 39b01fda09cb4a175cac2d6843cdc7b0f54a114c)
prevent people without permissions from opening the tile, entityspawn, or decal menus (cherry picked from commit 2293f46bcac38c73a212fc34ee77d2839cd8558b)
* laughter * make clownmobs bleed laughter * laughin syrup and laughter recipe * add laughin peas (cherry picked from commit 667cebef52ae656760f806edbd4c550996d3dd6d)
(cherry picked from commit 83be2131a031ae4bd15781e7e65c5be957e2fdae)
* New Drip for the QM QM beret and QM formal uniform * Asd Asd * Adds the new clothing to the uniform printer what it says on the tin * I always forget to update the copyright RAAAAAH yup (cherry picked from commit 400036b9624620900012e891b230ab6029d9bc22)
* add * fix * aaaa (cherry picked from commit b07e8abedbf886aebad52d6fb66048cbac1bf3dc)
* Flipped caps real * oops * whoops * flip not fold * fix formatting * cargosoft formatting (cherry picked from commit f7a3ea6dcfb0f43b136cef74ea7115bec63cbfd3)
(cherry picked from commit 1be78656613dd1dceaf57637ad15daba8fa69b05)
Lowers beanbag damage from 55 stam to 30 stam (cherry picked from commit cc5f45bb166375fe847ea2d0138ea80aa88a407c)
(cherry picked from commit 98015a45230af1e13e21435d6b3c3f22aa88e3e4)
Adds a massban flag to the admin flags used on ss14 to ban large amounts of players rom a .tsv file Co-authored-by: Geekyhobo <[email protected]> (cherry picked from commit dbf2c64cfd5a47088f5b20e850862a202795d5c8)
(cherry picked from commit 3beb01b5b05785e50434cfaf6b2d9c6821a68351)
I could've sworn I corrected this before committing but guess not ??? (cherry picked from commit 71713fdebf9d27da7d02ea2d31ae0c92b2d9eaa0)
* added evidence markers * box tweak * fixed a spelling mistake * new sprites, tweaked yml too (cherry picked from commit 07b796d6d20b190916182e9ab4bcf32b85fe1b92)
* add * yes (cherry picked from commit 22244b3055ab1c6319073fb654017476659ef41f)
add (cherry picked from commit f72a1a0edb5f28bc9c83e5fe484b77cce0b7d8a0)
(cherry picked from commit cb32a8470f7e4c1cc0cdfe487a1fb6b73af006fe)
This is a visualizer somewhat similar to the Generic. It allows configuring appearance info based on specific CVars the user has set. This allows YAML to easily configure alternatives for accessibility CVars like reduced motion. (cherry picked from commit 1ce21553152199e3d97a8d02c11922fb8db5fd52)
spelling error (cherry picked from commit d4c68a9ab9df3dda9ad3b2b355074bacffbc223d)
Important fixes from the UI PR (cherry picked from commit e4930078aba424288c36e258390c8b24892d904c)
* Add Flammable Touch Reaction for liquid tritium * Stop tail wagging action on crit * Revert "Add Flammable Touch Reaction for liquid tritium" This reverts commit 41be57b058a0cdee0cecfc51eb1c4a25631e62f3. (cherry picked from commit e8eddf57f64daca19054f0e3dfbe73dd6af8c342)
(cherry picked from commit fa09f7aaa1f21fe9e8f3a9dfd66dab5f189bdc6c)
add (un)equip sounds to EVA helms (cherry picked from commit aadf7492f44d9cdf654898e64dc4f73c13927815)
(cherry picked from commit a361e6aee55b083fd22b600d408b7123c54ea2b5)
fixes makes the newton cradle not able to decimate ears while also adding it to the bureaucracy crate and lowering its volume and range a little bit (cherry picked from commit 110437cc7f9b912093ec53560df6026c7873de51)
(cherry picked from commit 8ea30cae34a5f3fabf8c27ef49e464be28919a92)
Enabling "reduced motion" now makes the smoke effects not animate. This helps some people with vision issues. (cherry picked from commit 0c8e61757278715cb7a065c6cf8bf5d8ac24142f)
shit (cherry picked from commit 8542c718c0ad6b0c77f35e3df47fa8d47f3340f0)
(cherry picked from commit 0dd381ae37a1ae40e23c98d7310388b425bbe2a6)
github-actions
bot
added
Changes: C#
DeltaV-Bot
pushed a commit
that referenced
this pull request
Feb 18, 2024
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.
🆑