Upsteam Merge 07/15/2024 #27
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 Cherry-picks DeltaV-Station/Delta-v#1079 Credit to IamVelcroboy # Changelog :cl: Velcroboy - tweak: Changed asteroids to have more ore...and some danger Co-authored-by: Velcroboy <[email protected]> Co-authored-by: Velcroboy <[email protected]>
This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <[email protected]>
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Require #459 Add 3 optional settings for LanguagePrototypes to play with richtext tags to they could be reconized as Makings color - Set a specefic color to the text. fontId - Set a font to the text by using the Id. fontSize - Set the size of the text All 3 are optional if not set message will be handeled like normal. This should be mostly used to know what language your currently speaking and assist with markings. Take note those changes happent only in the TextBox chat, bubblechat is left unchanged. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Add Markings - [x] Add Fonts --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>   </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: FoxxoTrystan - add: Languages are now marked in the chat! --------- Signed-off-by: Mnemotechnican <[email protected]> Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: fox <[email protected]> Co-authored-by: Mnemotechnican <[email protected]>
# Description Fixes #522 --- # Changelog :cl: - fix: Food and handcuffs can now be given
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> **FIGHT THE POWER WITH THE POWER!** Here is a major resprite for most power related things, mostly for SMES, APC, Airlarm, ect... Wizden made PRs horible to look at, lets not make that mistake here! --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] SMES - [x] APC - [x] Airalarm - [x] Cameras - [x] LightTube - [x] Intercom - [x] FireAlarm - [x] Substation --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>   </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: FoxxoTrrystan - tweak: Power Resprites! (New SMES, APC, Airlarm, Camera, Substation, LightTube, Intercom, FireAlarm and Substation)
## Mirror of PR #26351: [NPC steering tweaks](space-wizards/space-station-14#26351) 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) ###### `64b648ff3c5183393b28285909e6b62c2b66663e` PR opened by <img src="https://avatars.githubusercontent.com/u/31366439?v=4" width="16"/><a href="https://github.com/metalgearsloth"> metalgearsloth</a> at 2024-03-23 01:33:33 UTC --- PR changed 2 files with 20 additions and 18 deletions. The PR had the following labels: --- <details open="true"><summary><h1>Original Body</h1></summary> > - Fix the free node check considering the whole tile and not the poly, this fixes 26330. > - Clear maps on direction resets. > - More robust arrival checks for pathfinding nodes. > > Resolves space-wizards/space-station-14#26330 > > 🆑 > - fix: Fix NPCs getting stuck on railings. > </details> Signed-off-by: VMSolidus <[email protected]> Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: VMSolidus <[email protected]>
## Mirror of PR #26162: [Door Remote now shows Mode in UI](space-wizards/space-station-14#26162) 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) ###### `e627a0d24bc8ae89665feb0b0d519b5fbb77ce32` PR opened by <img src="https://avatars.githubusercontent.com/u/58439124?v=4" width="16"/><a href="https://github.com/Plykiya"> Plykiya</a> at 2024-03-15 23:14:52 UTC --- PR changed 7 files with 151 additions and 67 deletions. The PR had the following labels: - Status: Awaiting Changes --- <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? --> > Changed the door remote to show what mode it's in on the UI so you don't have to toggle it to figure out if you're bolting a door or setting it to emergency access... > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > There is no indicator and it's awkward to set a door to emergency access instead of bolting it against nukies. > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > - Split DoorRemoteSystem into Shared/Server/Client from just Server > - Added door remote status control that updates itself on first pickup and then whenever the mode is toggled > - Got rid of the custom "ShowPopupToUser" function that the DoorRemote used to have in favor of PopupClient/PopupEntity > - Created new Door Remote locale messages. > > The only problem I have with my code change is that I created a shitty fourth placeholder enum so that I could check for a difference on initial pickup with PrevOperatingMode. Without it, the mode string only appears on pickup for 2/3 options instead of 3/3 options because the default PrevOperatingMode would end up matching the current Mode the door remote is set to, thus not updating the UI. Would love a better implementation suggestion for that... > > ## 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 > > https://github.com/space-wizards/space-station-14/assets/58439124/733eb78a-d1a6-4678-a325-9fda8dc1a4c8 > > > > ## 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. > --> > DoorRemoteComponent moved from Content.Server.Remotes to Content.Shared.Remotes.Components, DoorRemoteSystem OnInHandActivation changed from Public to Private, DoorRemoteSystem moved from Content.Server to Content.Shared, DoorRemoteSystem is now SharedDoorRemoteSystem > > **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 > --> > > <!-- > Make sure to take this Changelog template out of the comment block in order for it to show up. > 🆑 > - add: Added fun! > - remove: Removed fun! > - tweak: Changed fun! > - fix: Fixed fun! > --> > 🆑 > - add: Door remote UI now shows the mode it is in. > </details> Signed-off-by: VMSolidus <[email protected]> Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: VMSolidus <[email protected]>
## Mirror of PR #24936: [Pulling rework v2](space-wizards/space-station-14#24936) 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) ###### `c584f6444a85cc53edb060230f7e7b2b76cc87bf` PR opened by <img src="https://avatars.githubusercontent.com/u/31366439?v=4" width="16"/><a href="https://github.com/metalgearsloth"> metalgearsloth</a> at 2024-02-04 01:43:17 UTC --- PR changed 53 files with 796 additions and 1356 deletions. The PR had the following labels: - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > Health v2 moment > > Fixes space-wizards/space-station-14#24900 > > - Fixes container changes. > - Fixes keybind. > - Fixes multi-pull. > - Fixes alerts cleanup for non-predicted pull stops. > > I'm awake now for any issues. </details> --------- Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: Danger Revolution! <[email protected]> Co-authored-by: VMSolidus <[email protected]>
## Mirror of PR #25569: [Configuration argument for content packaging](space-wizards/space-station-14#25569) 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) ###### `9e7b196ffbaa8c0a772d5d7544e51deaa2fe5a26` PR opened by <img src="https://avatars.githubusercontent.com/u/34938708?v=4" width="16"/><a href="https://github.com/VasilisThePikachu"> VasilisThePikachu</a> at 2024-02-25 21:40:05 UTC --- PR changed 4 files with 34 additions and 15 deletions. The PR had the following labels: --- <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. --> > > Requires space-wizards/RobustToolbox#4992 > > ## About the PR > <!-- What did you change in this PR? --> > > Needed this for something so here we are. I think someone mentioned they wanted this? Welp its here now > > New argument is ``--configuration`` by default release but you can pass in anything else. Probably debug or tools </details> Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: VMSolidus <[email protected]>
…ting You (Fansana#292) ## Mirror of PR #26309: [Fix scram! implant keeping you pulled to someone when teleporting you](space-wizards/space-station-14#26309) 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) ###### `eb80d9752e0309f8485478a43bcba6fb15fc3711` PR opened by <img src="https://avatars.githubusercontent.com/u/32041239?v=4" width="16"/><a href="https://github.com/nikthechampiongr"> nikthechampiongr</a> at 2024-03-21 14:19:01 UTC --- PR changed 1 files with 8 additions and 0 deletions. The PR had the following labels: --- <details open="true"><summary><h1>Original Body</h1></summary> > fixes #26301 > <!-- 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? --> > The scram implant will no longer leave you pulled when teleporting you. > > > I know the entire teleporting system for it needs to be redone and I might do that but please do not make me do it in this pr. > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > It allows your captor to pull you through time and space itself back to where you were like nothing happened. > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > Scram! tries to unpull you before teleporting you. > > ## 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 > > **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 > --> > > <!-- > Make sure to take this Changelog template out of the comment block in order for it to show up. > 🆑 > - add: Added fun! > - remove: Removed fun! > - tweak: Changed fun! > - fix: Fixed fun! > --> > > 🆑 > - fix: Scram! implant no longer allows for someone to keep pulling you when it teleports you. </details> Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: Danger Revolution! <[email protected]>
## Mirror of PR #26205: [fix decoy bomb uplink category](space-wizards/space-station-14#26205) 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) ###### `21c527d6d09847a742202613d8aefce62c79b334` PR opened by <img src="https://avatars.githubusercontent.com/u/57039557?v=4" width="16"/><a href="https://github.com/Ilya246"> Ilya246</a> at 2024-03-17 10:11:15 UTC --- PR changed 1 files with 10 additions and 10 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 > moves the decoy syndicate bomb from explosives category to deception category > > ## Why / Balance > PR was made before the uplink categories update so the bomb ended up miscategorised > > ## Technical details > this is a webedit but it should be sufficiently simple to be fine > > ## 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]): > --> > not tested > > - [ ] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase </details> --------- Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: VMSolidus <[email protected]>
## Mirror of PR #25928: [Fix cream pie bomb when eaten or sliced](space-wizards/space-station-14#25928) 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) ###### `0d0edbba4a1c2af7ecef3318b5f9fe287a63fab5` PR opened by <img src="https://avatars.githubusercontent.com/u/40753025?v=4" width="16"/><a href="https://github.com/Slava0135"> Slava0135</a> at 2024-03-08 13:16:38 UTC PR merged by <img src="https://avatars.githubusercontent.com/u/19864447?v=4" width="16"/><a href="https://github.com/web-flow"> web-flow</a> at 2024-03-13 08:36:08 UTC --- PR changed 4 files with 22 additions and 4 deletions. The PR had the following labels: --- <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? --> > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > > ## 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]): > --> > >  > > ## 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. > --> > > **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 > --> > > 🆑 > - fix: Fixed pie bomb not detonating when eaten or sliced (remember to keep hungry mice away from it)! > - tweak: Pie bomb now cannot be ejected or swapped (just hope there is no bomb inside) > </details> --------- Co-authored-by: Vyacheslav Kovalevsky <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: Danger Revolution! <[email protected]>
… Stops. (#532) ## Mirror of PR #26312: [Fix puller being improperly unset when pulling stops.](space-wizards/space-station-14#26312) 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) ###### `a6c018d755ee4f35fb8e3ab597fa90c7592fe920` PR opened by <img src="https://avatars.githubusercontent.com/u/32041239?v=4" width="16"/><a href="https://github.com/nikthechampiongr"> nikthechampiongr</a> at 2024-03-21 15:07:50 UTC --- PR changed 1 files with 8 additions and 6 deletions. The PR had the following labels: --- <details open="true"><summary><h1>Original Body</h1></summary> > fixes #26310 > > <!-- 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? --> > This pr fixes the bug with people being unable to move while in cuffs if they were previously pulled even if they were no longer being pulled. > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > A security cadet should not be able to merge my legs with the ground by simply touching me while I'm in cuffs. > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > > When unpulled, the pullableComp has its puller field set to null after the message signifying the pulling has stopped has been sent. Since the component has a field to determine whether its owner is being pulled which is determined by the puller field, systems listening on the event would think that the owner of the component was still being pulled. > > As a result, when the message was fired and the SharedCuffableSystem checked whether it should allow the cuffed person to move it thought they were still being pulled and as such didn't allow them to move. > > I spent some time trying to determine whether setting the puller to null earlier would have other negative effects, however to my understanding of the code and the systems that listen to the message I believe this is now the correct behavior. Still just in case @metalgearsloth please check this out thanks. > ## 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 > > > **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 > --> > > <!-- > Make sure to take this Changelog template out of the comment block in order for it to show up. > 🆑 > - add: Added fun! > - remove: Removed fun! > - tweak: Changed fun! > - fix: Fixed fun! > --> > 🆑 > - fix: You can now move again if you stop being pulled while in cuffs. </details> Co-authored-by: nikthechampiongr <[email protected]>
## Mirror of PR #26160: [Added 18 new bounties to cargo](space-wizards/space-station-14#26160) 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) ###### `4357b9ef08fee0e08c4fdf4eeef714fa8eb38112` 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-15 20:21:21 UTC --- PR changed 19 files with 373 additions and 22 deletions. The PR had the following labels: --- <details open="true"><summary><h1>Original Body</h1></summary> > ## About the PR > I added 18 new bounties to cargo's bounty system, and tweaked a couple values in the existing system. (6 bounties at once instead of 5, reduced # of headsets needed for bounty to a sane number, fixed a couple inconsistencies) > > ## Why / Balance > > Spice things up, add variety, add a bit of balance. For fun! > > ## Technical details > Pretty much just Yaml/Ftl changes, added new bounty info + tags, Tweaked the active bounty count. > > ## 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 > None! Nothing got removed, and it's all just surface level yaml work. > > **Changelog** > 🆑 > - add: Added 18 new bounties to cargo bounty system. > > </details> --------- Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: VMSolidus <[email protected]>
## Mirror of PR #26467: [Update submodule to 216.0.0](space-wizards/space-station-14#26467) 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) ###### `f90b97a02442601141fe6578bc5f2760fd09f2af` PR opened by <img src="https://avatars.githubusercontent.com/u/31366439?v=4" width="16"/><a href="https://github.com/metalgearsloth"> metalgearsloth</a> at 2024-03-27 03:21:03 UTC - merged at 2024-03-27 03:41:42 UTC --- PR changed files with additions and deletions. The PR had the following labels: - No C# --- <details open="true"><summary><h1>Original Body</h1></summary> > d </details>
# Description Added everyone's favorite Arachne as an adorable soft toy --- # TODO - [x] Place plushie in spawn location(s) --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog :cl: - add: Plushie
…38 (#539) # Description Cherry-picks space-wizards/space-station-14#27138 # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: osjarw - add: Wallmount substation electronics can now be created at an autolathe. Co-authored-by: osjarw <[email protected]>
# Description Adds traitors and hellshift to the list of gamemodes offered by the gamemode vote. Traitors just make sense. Hellshift is a new version of survival. It starts out roughly as slow as survival, but it slowly devolves into a torrent of station events as frequent as one every 10-30 seconds. Good for when there's no other ~~self-antaggers~~ players to spice up the shift, or when there's one too many security officers to deal with all the threats this brings. # Technical details Had to refactor a lot of RampingStationEventScheduler. Firstly, it was total shitcode, secondly, it had everything hardcoded, thirdly, it had a bug that made it possible for events to appear with little to no delay whatsoever. Now its component features four data fields that can be used to configure the scheduler and its system contains cleaner and more readable code. <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>   </p> </details> # Changelog :cl: - tweak: Players can now vote on two more gamemodes: Traitors and Hellshift. --------- Signed-off-by: Mnemotechnican <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
Ready to Merge Now (I had to go to 217.2.1 because the prior versions of 217.0.0 weren't viable) Includes the following Cherry-Picks: space-wizards/space-station-14#26387 space-wizards/space-station-14#25963 --------- Co-authored-by: metalgearsloth <[email protected]>
Requires: Simple-Station/Einstein-Engines#534 No Cherry-Picks needed for this engine version. --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
Uses the following Cherry-Picks: space-wizards/space-station-14#26994 space-wizards/space-station-14#26518 space-wizards/space-station-14#26279 space-wizards/space-station-14#24946 space-wizards/space-station-14#27188 Requires: Simple-Station/Einstein-Engines#535 Simple-Station/Einstein-Engines#534 --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: Leon Friedrich <[email protected]> Co-authored-by: Jake Huxell <[email protected]> Co-authored-by: Tayrtahn <[email protected]> Co-authored-by: 0x6273 <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
## Mirror of PR #26045: [Fix recycled containers deleting items inside them](space-wizards/space-station-14#26045) 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) ###### `d7484ae9f57477a5ec5c575e3077aa94c0564db6` PR opened by <img src="https://avatars.githubusercontent.com/u/83650252?v=4" width="16"/><a href="https://github.com/SlamBamActionman"> SlamBamActionman</a> at 2024-03-12 16:16:42 UTC --- PR changed 2 files with 19 additions and 1 deletions. The PR had the following labels: - Status: Awaiting Changes --- <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? --> > > Right now you can delete any item that fits in a survival box by placing it inside of one and then recycling the box in a Recycler/Material Reclaimer. This PR fixes this by dumping out any item inside containers. > > - For Reclaimers, any recyclable items inside the container get placed on top of the Reclaimer. > - For Recyclers, any recyclable items inside the container get recursively recycled as well. > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > > I doubt it's intended behavior to be able to effectively delete any item that fits in a box. Also ensures a recycled box provides the correct amount of material as its contents also get recycled. > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > > When trying to recycle, once all checks are passed it iterates through the object's containers if it has any and dumps out any items onto the machine doing the recycling. > > ## 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]): > --> >  > The result of recycling a survival box in a Recycler/Reclaimer. > > - [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. > --> > > **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 > --> > > 🆑 > - fix: Recyclers no longer delete items stored inside of recycled entities. > </details> --------- Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: VMSolidus <[email protected]>
## Mirror of PR #25908: [SS14-17313 Chatfactor: Chat Censorship Systems](space-wizards/space-station-14#25908) 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) ###### `bf98a6a8bb2a57fb149459d6b053eaaf6abc8cd7` PR opened by <img src="https://avatars.githubusercontent.com/u/732532?v=4" width="16"/><a href="https://github.com/FairlySadPanda"> FairlySadPanda</a> at 2024-03-07 12:13:16 UTC - merged at 2024-03-25 23:50:20 UTC --- PR changed 4 files with 576 additions and 0 deletions. The PR had the following labels: - Status: Needs Review --- <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 > Adds some systems to manage chat censorship: > > 1. No-op: does nothing > 2. SimpleCensor: a regex-free censor with a variety of rules to use > 3. RegexCensor: a censor that uses regex. > > This exposes a singleton backed by a builder pattern (ChatCensor) that is set up, probably during the code init phase, and then globally available for your censorship needs. > > ## Why / Balance > Partial fulfilment of #17313 > > ## Technical details > CE wants regex, CE gets regex > > Otherwise SimpleCensor is designed to be usable by people who don't want to faff with regex. > > This would be setup during server or client init, so would be driven by Cvars. > > ## 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 > nope > **Changelog** > nope </details> Co-authored-by: SimpleStation14 <Unknown>
# Description By request from @DEATHB4DEFEAT , this ports Simple-Station/Parkstation#55 🆑 VMSolidus - add: Many new sound effects have been implemented for items. --------- Signed-off-by: VMSolidus <[email protected]>
# Description Minor spelling mistake ops, also new icon by me. --- <details><summary><h1>Media</h1></summary> <p> Offering an item  Cancelling the offer  Accepting the offer  Closeup of the new icon  </p> </details> --- # Changelog :cl: - add: Added a new icon to the offer item interaction. - fix: Fixed typos in the offer item prompts.
# Description Adds more zoom levels and CVars to configure them. The defaults make it so that the new minimum zoom is roughly equal to what ss14 had before (29.6%). # Why Playing as a tiny character made me love having the screen zoomed in, but having only 3 zoom levels didn't quite allow to set the zoom level to what I wanted. This PR fixes that. <details><summary><h1>Media</h1></summary><p> https://github.com/user-attachments/assets/61e56913-1c9d-4590-95ac-686018b5caa9 </p></details> # Changelog :cl: - add: You can now configure your zoom more precisely.
# Description Adds a new food item that utilizes the legs of harpies. Yes, I know the wings aren't where the legs are. Just don't question it too much. --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog :cl: - add: Added Harpy Wings as a delicious dish. --------- Signed-off-by: dootythefrooty <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
# Description First PR. Adds an alert on the user UI whenever they toggle between walking or running. No more second guessing whether you will slip or not when walking over that puddle of water, or if your usage of Shift on chat toggled your movement speed. The alert is displayed for entities with the component 'CanWalkComponent', which is added to the following prototypes: - All genetic ancestors (MobBaseAncestor) - Human controlled mechs (BaseMech, wont display on VIMs or HAMTRs because rats or hamsters can't walk, and the edge case is not worth the trouble) - All human/player species (BaseMobSpeciesOrganic) - All slimes/geras (BaseMobAdultSlimes) - Reagent Slimes (ReagentSlime) - Rat Kings (MobRatKing - yes they can fucking walk lmao) - Borgs (BaseBorgChassis) --- <details><summary><h1>Media</h1></summary> <p> https://github.com/Simple-Station/Einstein-Engines/assets/159397573/1a60711b-d048-444d-bd08-6a9eadeccc8a </p> </details> --- # Future Stuff I also wanted to make it toggle the user's speed on click like it would in ss13, but sadly the majority of the input management/prediction seems to be done exclusively client-side, making it a hassle to work around the alert. **Will revisit if there's improvements or refactors to the movement code.** --- # Changelog :cl: - add: Added an alert on the UI for when the user is walking or running. --------- Signed-off-by: gluesniffler <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
# Description This file has been chilling unused (excluding that one workflow) for so long, and it's so useful. Forks might want to edit the URL to theirs, but it's unlikely they'll ever want to change it.
# Description Cherry-Picks Wizden PR 26540, fixing an issue where our downstreams cannot save maps under certain conditions. space-wizards/space-station-14#26540 Co-authored-by: Leon Friedrich <[email protected]>
# Description Adds a way to lay down/crawl using a keybind (R by default) similarly to ss13. It has the same effects as falling down after slipping or buckling to a bed, except you don't drop items while doing so and can (very slowly) move around. This opens new gameplay and roleplay possibilities. You can only toggle standing/laying once in 2.5 seconds (this cooldown is to prevent pro gamers from spamming it). It shows a small popup to everyone. If the attempt fails for whatever reason - being buckled, sleeping, stunned, or anything else - another popup is shown that's only visible to you. It's been tested and made sure that the system works correctly with buckling, sleeping, being stunned, and shocked. <details><summary><h1>Media</h1></summary> <p> 18 mb recording won't fit on github: https://cdn.discordapp.com/attachments/1255902264309321851/1260354667578261504/weeee-2024-07-10_00.57.23.mp4?ex=668f0441&is=668db2c1&hm=d338a3499bf47780a66b7ba96d5e8830d8cb4167064423b8983b2d0144b7aa88& </p> </details> --- # Changelog :cl: - add: You can now lie down and stand up at will! The default keybind for it is "R", but it can be changed in settings. --------- Signed-off-by: Mnemotechnican <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
# Description This is kind of a small PR here, all I'm really doing is adding species(read: Harpy) restrictions to all items that are invalid for a Harpy to wear, and then reparenting items that have a skirt but aren't tagged as such, so that Harpies can wear them. This now makes widespread actual usage of species restrictions in Loadouts. And also this stops people complaining that Harpies can buy items that they cannot wear.  Harpies coincidentally now have a blank Shoes tab.  # Changelog :cl: - fix: Harpies can no longer buy Loadout items that are impossible for them to wear due to having digitigrade legs.
# Description Previous fix made it so that foreigner translators use no power (due to being parented off of the wrong proto). So I took some time to rearrange translators.yml because the file was shitfucked and that's what caused the mistake in the first place. This time it was made sure that: - All (powered) translators can hold a power cell and do use power - Foreigner's translator starts with a high-cap power cell and unspawnable Translator spawns with a medium - All children of the base powered translator spawn without a power cell and cannot work as such until a power cell is inserted. --- # Changelog :cl: - fix: Foreigner translator should now consume power, as intended. Signed-off-by: Mnemotechnican <[email protected]>
# Description I've made it so that when a room is explosively depressurized(or when a body of high pressure air flows into one of lower pressure air), that entities inside are launched by the air pressure with effects according to their mass. An entity's mass is now used as an innate resistance to forced movement by airflow, and more massive entities are both less likely to be launched, and will launch less far than others. While lighter entities are launched far more easily, and will shoot off into space quite quickly! Spacing departments has never been so exciting! This can be made extraordinarily fun if more objects are given the ability to injure people when colliding with them at high speeds. As a note, Humans are very unlikely to be sucked into space at a typical force generated from a 101kpa room venting into 0kpa, unless they happened to be standing right next to the opening to space when it was created. The same cannot be said for "Lighter-Than-Human" species such as Felinids and Harpies. I guess that's just the price to pay for being cute. :) On a plus side, because the math behind this is simplified even further than it was before, this actually runs more efficiently than the previous system. # TODO Nothing, this is basically done. I've spent a good 6 hours straight finely tuning the system until I was satisfied that it reflects something close to reality. # MEDIA **Before the Space Wind Rework:** https://github.com/Simple-Station/Einstein-Engines/assets/16548818/0bf56c50-58e6-4aef-97f8-027fbe62331e **With this Rework:** https://github.com/Simple-Station/Einstein-Engines/assets/16548818/6be507a9-e9de-4bb8-9d46-8b7c83ed5f1d # Changelog :cl: VMSolidus - add: Atmospheric "Throws" are now calculated using object mass, and behave accordingly. Tiny objects will shoot out of rooms quite fast! --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
Fansana
approved these changes
Jul 19, 2024
Floof-Station-Bot
added a commit
that referenced
this pull request
Jul 19, 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.
Description
WARNING THIS UPSTEAM MERGE REQUIRE Submodule 219.2.0
git submodule update --init --recursiveUpstream Merge from: https://github.com/Simple-Station/Einstein-Engines/
EE Merged PRs:
Simple-Station/Einstein-Engines#526
Simple-Station/Einstein-Engines#510
Simple-Station/Einstein-Engines#524
Simple-Station/Einstein-Engines#520
Simple-Station/Einstein-Engines#307
Simple-Station/Einstein-Engines#293
Simple-Station/Einstein-Engines#269
Simple-Station/Einstein-Engines#316
Simple-Station/Einstein-Engines#292
Simple-Station/Einstein-Engines#254
Simple-Station/Einstein-Engines#172
Simple-Station/Einstein-Engines#532
Simple-Station/Einstein-Engines#239
Simple-Station/Einstein-Engines#533
Simple-Station/Einstein-Engines#531
Simple-Station/Einstein-Engines#539
Simple-Station/Einstein-Engines#527
Simple-Station/Einstein-Engines#534
Simple-Station/Einstein-Engines#535
Simple-Station/Einstein-Engines#536
Simple-Station/Einstein-Engines#267
Simple-Station/Einstein-Engines#444
Simple-Station/Einstein-Engines#446
Simple-Station/Einstein-Engines#448
Simple-Station/Einstein-Engines#319
Simple-Station/Einstein-Engines#360
Simple-Station/Einstein-Engines#525
Simple-Station/Einstein-Engines#542
Simple-Station/Einstein-Engines#541
Simple-Station/Einstein-Engines#512
Simple-Station/Einstein-Engines#415
Simple-Station/Einstein-Engines#480
Simple-Station/Einstein-Engines#537
Simple-Station/Einstein-Engines#546
Simple-Station/Einstein-Engines#528
Simple-Station/Einstein-Engines#489
Simple-Station/Einstein-Engines#558
Simple-Station/Einstein-Engines#551
Simple-Station/Einstein-Engines#547
Simple-Station/Einstein-Engines#545
Changelog
🆑 Foxxotrystan