Merge master up to 31/10#365
Merged
DebugOk merged 116 commits intoDeltaV-Station:masterfrom Nov 1, 2023
Merged
Conversation
* examine locale * examine trigger desc
* do the thing * lets find out * Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> --------- Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
…f their skulls) (#21231) * mvp done - skellies can heal by spillink regular milk on themselves and clean themselves off creaming with water * added other types of healing milk, also made a separate reaction to oat milk - it has almost no calcium in it * fixed indent error, made a dumb mistake
…e. (#21178) * reset beep timer when out of range * prevent deficit from impacting beep timing
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* try-stick * convert spider charge to attempt-stick-events
* add chromite chasm * add desert chasm * snow chasm * finish
This reverts commit ad1780b.
* Add Pea Plants * Pea soup * Update flavor-profiles.ftl * Update seeds.yml * Add seeds to vendors * Make things more expensive to fix free money exploit * Update textures * Revert "Update textures" This reverts commit b1b7046504afc7468742b0722f601d98684a1c89. Vines dont grow straight into the air. * Shift up 4 pixels * Fuck autofix conflitcs * Shift up 3 more pizels * I finally got byond working so I made sure they were EXACTLY the same * Address Reviews? I think? --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Added candy bucket and component to update appearance of held containers akin to it * cleanup newline * newline was load-bearing * moved component to Shared, cleanup * newline is spooky * You build and run without errors, stop pretending otherwise * Updated for new storage system in master branch
This reverts commit 74f1098. That moment when you have to sneak changes in via other commits. I'd literally rather just skip this entire entity instead of trying to change the added stuff.
Contributor
Author
|
Gotta love this completely professional comment that was part of a skipped comment. I would've expected better tbh
|
DebugOk
added a commit
that referenced
this pull request
Nov 1, 2023
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 3, 2025
## Mirror of PR #26356: [Store keybind priority](space-wizards/space-station-14#26356) from <img src="https://avatars.githubusercontent.com/u/10567778?v=4" alt="space-wizards" width="22"/> [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `f7a1ffd0aab25d70ac185753d596469fc1e87480` PR opened by <img src="https://avatars.githubusercontent.com/u/81056464?v=4" width="16"/><a href="https://github.com/wrexbe"> wrexbe</a> at 2024-03-23 02:49:07 UTC --- PR changed 2 files with 2 additions and 1 deletions. The PR had the following labels: - Changes: UI --- <details open="true"><summary><h1>Original Body</h1></summary> > Changed it so the priority isn't lost when you set a binding in the UI. > Also added a priority to MoveStoredItem so it doesn't conflict with Use. > Fixes space-wizards/space-station-14#26142 > Does not fix old keybinds files, so they will need to reset it, and rebind it. > > A better solution might be to change it so the keybinds are always in the order they appear in the default keybinds folder, to prevent the ordering from changing unpredictably based on what the user overrides. </details> Co-authored-by: SimpleStation14 <Unknown>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
19 participants
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.
Merges Wizden up to (skipped) commit space-wizards/space-station-14@74f1098
All code relating to the new inventory system was also skipped for reasons I wont list out here.