Upstream merge 6/18/2024 #25
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
# Description Nixpkgs updated `8.0.x` to `8.0.3xx` but we need `8.0.1xx`
There's probably an upcoming mirror for this, but whatever.
## Mirror of PR #26441: [Fix atmos NaN error](space-wizards/space-station-14#26441) 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) ###### `fdb4a61487db9fc67714c913832427063abdea42` PR opened by <img src="https://avatars.githubusercontent.com/u/60421075?v=4" width="16"/><a href="https://github.com/ElectroJr"> ElectroJr</a> at 2024-03-26 04:27:08 UTC - merged at 2024-03-26 04:44:56 UTC --- PR changed 16 files with 43 additions and 25 deletions. The PR had the following labels: - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > - Fixes a bug I introduced in #22521 that caused the temperature to be set to `NaN`. I don't know for sure, but I assume this is causing the current atmos issues > - Fixes `FixVacuum` not working after #22521 > - Removes some redundant yaml that was setting FixVacuum to its default value > > 🆑 > - fix: Fixed an atmos bug, which was (probably) causing atmospherics on the station to behave incorrectly. </details> Co-authored-by: SimpleStation14 <Unknown>
what was I thinking??
## Mirror of PR #26447: [Curtains fix](space-wizards/space-station-14#26447) 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) ###### `55b146a16c74d9b1ef4991f3ad3e22b15267f56f` PR opened by <img src="https://avatars.githubusercontent.com/u/141568243?v=4" width="16"/><a href="https://github.com/Futuristic-OK"> Futuristic-OK</a> at 2024-03-26 13:45:20 UTC - merged at 2024-03-26 16:03:54 UTC --- PR changed 2 files with 13 additions and 31 deletions. The PR had the following labels: - No C# --- <details open="true"><summary><h1>Original Body</h1></summary> > <!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline --> > <!-- The text between the arrows are comments - they will not be visible on your PR. --> > > ## About the PR > <!-- What did you change in this PR? --> > Now curtains can be built and opened inside walls and windows, etc. > (There is a mistake that if the curtain is opened outside the 180 degree range, the sound of the curtains opening will not be played by the player himself. All the surrounding players and ghosts will still hear the sound. > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > Why not? > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > A few lines of code > ## Media > <!-- > PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes. > Small fixes/refactors are exempt. > Any media may be used in SS14 progress reports, with clear credit given. > > If you're unsure whether your PR will require media, ask a maintainer. > > Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]): > --> > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > <!-- > List any breaking changes, including namespace, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be pasted in #codebase-changes. > --> > Erm... Nothing? > > **Changelog** > <!-- > Make players aware of new features and changes that could affect how they play the game by adding a Changelog entry. Please read the Changelog guidelines located at: https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog > --> > - tweak: Сurtains can be built and opened inside full tiles > > <!-- > Make sure to take this Changelog template out of the comment block in order for it to show up. > 🆑 > - tweak: Сurtains can be built and opened inside full tiles > --> > </details> Co-authored-by: SimpleStation14 <Unknown>
…ies with empty containers (#447) ## Mirror of PR #26430: [Reduces size of smaller cartons and fix size discrepancies with empty containers](space-wizards/space-station-14#26430) 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) ###### `47fe7d3cc664d59bacc2036e5678adad47622e3d` PR opened by <img src="https://avatars.githubusercontent.com/u/107660393?v=4" width="16"/><a href="https://github.com/IamVelcroboy"> IamVelcroboy</a> at 2024-03-25 16:06:33 UTC - merged at 2024-03-26 04:04:42 UTC --- PR changed 2 files with 49 additions and 33 deletions. The PR had the following labels: - No C# --- <details open="true"><summary><h1>Original Body</h1></summary> > ## About the PR > - Reduces the item size of drink cartons with `maxVol: 50` to `small` > - Fixes discrepancies between full alcohol bottles and empty > - Makes empty cartons consistent with full as well > > ## Why / Balance > Keeps it consistent with other drink containers. > > ## Technical details > n/a > > ## Media > Before: >  > > - [X] I have added screenshots/videos to this PR showcasing its changes in-game, **or** this PR does not require an in-game showcase > > ## Breaking changes > n/a > > **Changelog** > n/a </details> Co-authored-by: SimpleStation14 <Unknown>
Signed-off-by: VMSolidus <[email protected]>
…ets (#191) ## Mirror of PR #25955: [Trading Outpost now has half buy-only and half sell-only pallets](space-wizards/space-station-14#25955) 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) ###### `c0bbbc33c19eafcc8defaa7f1ec2df42e485b435` PR opened by <img src="https://avatars.githubusercontent.com/u/1471082?v=4" width="16"/><a href="https://github.com/wafehling"> wafehling</a> at 2024-03-10 02:47:02 UTC --- PR changed 8 files with 226 additions and 123 deletions. The PR had the following labels: - Changes: Sprites - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > ## About the PR > I added two new entity types, a buy and sell only cargo pallet, and added them to the trading outpost in place of the old pallets. > > ## Why / Balance > Since the day this was added, every single shift, at some point I'll hear someone in cargo yelling about how **"You sold stuff I just bought!"** > > This seemed like the easiest way to fix the problem. > > ## Technical details > Added a variable to the cargo pallet component for labeling which type it is, added two new varieties of the cargo pallet to the yml, and adjusted all the calls for GetCargoPallets() to have boolean variables for buyOnly and sellOnly to tell the function what kind of call you're looking for. > > If you don't give it any specifics it'll still treat any pallet as a two-way one, but this function is only called 2 or 3 times and I've adjusted them all and commented the function itself for anyone looking to change/add it in the future. > > The old pallet is still in the game and is set to "both" by default, so it should work just fine for backwards compatibility. > > ## Media >  >  >  >  >  > > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > > Shouldn't break anything, I've left the old pallets fully in, and updated them to work with the new GetCargoPallets() function just like they used to. Not sure if/where you'd still need them, but better safe than sorry. > > **Changelog** > 🆑 > - tweak: The trading outpost now has dedicated buy-only and sell-only pallets. No more accidentally selling orders you just bought. Cargonians rejoice! > </details> Co-authored-by: SimpleStation14 <Unknown>
# Description This ports Simple-Station/Parkstation-Friendly-Chainsaw#46. This PR is something I consider a key feature adjacent to Space Wind Rework and its accompanying updates, and is an essential part of the space station experience. In practice, this weirdly enough makes being launched into space a bit easier to survive, since instead of needing to throw potentially hundreds of items, you can simply throw enough items to get started flying in the direction of the station and will eventually float back to the station. --- <details><summary><h1>Media</h1></summary> <p> https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/assets/77995199/5570ef35-16e2-493a-ac35-738f27751346 https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/assets/77995199/51fba943-8dce-4265-a9cc-7181155eb8de https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/assets/77995199/cd6c0511-2639-4e14-8160-426ba7f2ba73 --- </p> </details> # Changelog :cl: DEATHB4DEFEAT - tweak: Space has suddenly become less dense (objects don't slow down in space) - remove: Moths are unable to move in space - tweak: Moths have way better control in zero gravity environments --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
## Mirror of PR #22962: [Landmine stepoff](space-wizards/space-station-14#22962) 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) ###### `54dd273f660d6d8d523d0771bb8d8437373b082e` PR opened by <img src="https://avatars.githubusercontent.com/u/59531932?v=4" width="16"/><a href="https://github.com/YuriyKiss"> YuriyKiss</a> at 2023-12-25 12:38:55 UTC --- PR changed 13 files with 95 additions and 47 deletions. The PR had the following labels: - Status: Awaiting Changes --- <details open="true"><summary><h1>Original Body</h1></summary> > ## About the PR > Landmine will explode when player steps off it. Landmine will make a sound effect when player steps on it > Close #21658 (Issue has some other suggestions, turn them into separate issues if relevant) > > Requires space-wizards/RobustToolbox#4883 > > ## Why / Balance > IRL some landmines will only trigger after you release the pressure put on them. > > ## Technical details > There are two landmine modes now, one will make landmine trigger immediately after player steps on them another one will only trigger after player steps off the landmine (this is the default now). > > ## Media > Landmine stepoff in action: > > https://github.com/space-wizards/space-station-14/assets/59531932/6e884619-7217-4301-bd78-6e843e0d78f1 > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > > > **Changelog** > - tweak: landmines will trigger after you step off them > - add: landmine trigger sound > </details> Signed-off-by: VMSolidus <[email protected]> Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: VMSolidus <[email protected]>
# Description Hooray, more JavaScript! I tested this on a personal repo with a new PAT, but it *should* work here first try. --------- Signed-off-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: DEATHB4DEFEAT <[email protected]>
# Description Simple-Station/Parkstation-Friendly-Chainsaw#10 This adds a feature whereby a random goal for the shift is faxed to the station's Captain at the start of every shift. It is up to the Captain to decide if and how this goal is to be completed. Goals are randomly generated every shift, and are meant to help encourage station activity and RP. Admins are also able to send station goals via `sendstationgoal`. --- <details><summary><h1>Media</h1></summary> <p>  --- </p> </details> # Changelog :cl: VMSolidus - add: Added station goals that get sent to the Command fax machine at the start of every shift --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: Danger Revolution! <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: VMSolidus <[email protected]>
…o upstream-merge-6-18-2024
…o upstream-merge-6-18-2024
…uns' into upstream-merge-6-18-2024
…o upstream-merge-6-18-2024
…ream-merge-6-18-2024
…nto upstream-merge-6-18-2024
|
The only test fail is one that is safe to ignore, I'm merging this now. |
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.
Today we're picking up several new features related to audio systems, loadouts, the psychic refactor, and finally, the big ticket item. HEIGHT SLIDERS.