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 6c20938)
do (cherry picked from commit 5380f64)
Removed emote text (cherry picked from commit af21657)
(cherry picked from commit 3f0572b)
add (cherry picked from commit 601da0c)
(cherry picked from commit e57cfea)
* 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 1a3ce6c)
(cherry picked from commit f77550d)
(cherry picked from commit 8422216)
* destructible mop buckets * remove wwod * spacing --------- Co-authored-by: doom <[email protected]> (cherry picked from commit 717d423)
(cherry picked from commit a6de63c)
* Straw hat. A craftable, flammable straw hat. Thats it. * seems to made it go in flames! (cherry picked from commit 007adfc)
(cherry picked from commit a81ce94)
* - 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 3b2921a)
(cherry picked from commit 9e79a26)
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 de0d5e4)
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 28755f5)
* 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 bd4e2c3)
(cherry picked from commit d6c6c1d)
1 (cherry picked from commit 39b01fd)
prevent people without permissions from opening the tile, entityspawn, or decal menus (cherry picked from commit 2293f46)
* laughter * make clownmobs bleed laughter * laughin syrup and laughter recipe * add laughin peas (cherry picked from commit 667cebe)
(cherry picked from commit 83be213)
* 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 400036b)
* add * fix * aaaa (cherry picked from commit b07e8ab)
* Flipped caps real * oops * whoops * flip not fold * fix formatting * cargosoft formatting (cherry picked from commit f7a3ea6)
(cherry picked from commit 1be7865)
Lowers beanbag damage from 55 stam to 30 stam (cherry picked from commit cc5f45b)
(cherry picked from commit 98015a4)
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 dbf2c64)
(cherry picked from commit 3beb01b)
I could've sworn I corrected this before committing but guess not ??? (cherry picked from commit 71713fd)
* added evidence markers * box tweak * fixed a spelling mistake * new sprites, tweaked yml too (cherry picked from commit 07b796d)
* add * yes (cherry picked from commit 22244b3)
add (cherry picked from commit f72a1a0)
(cherry picked from commit cb32a84)
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 1ce2155)
spelling error (cherry picked from commit d4c68a9)
Important fixes from the UI PR (cherry picked from commit e493007)
* 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 e8eddf5)
(cherry picked from commit fa09f7a)
add (un)equip sounds to EVA helms (cherry picked from commit aadf749)
(cherry picked from commit a361e6a)
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 110437c)
(cherry picked from commit 8ea30ca)
Enabling "reduced motion" now makes the smoke effects not animate. This helps some people with vision issues. (cherry picked from commit 0c8e617)
shit (cherry picked from commit 8542c71)
(cherry picked from commit 0dd381a)
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.
🆑