Upstream Merge 7/11/2024 #45
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
<!-- 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)
This reverts commit 0a7acbf.
## 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 (#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>
## Mirror of PR #26421: [Nerf ninja research stealing](space-wizards/space-station-14#26421) 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) ###### `3b9c5d43ec97a0693ced0118fcfcb8467aa5595e` PR opened by <img src="https://avatars.githubusercontent.com/u/98561806?v=4" width="16"/><a href="https://github.com/EmoGarbage404"> EmoGarbage404</a> at 2024-03-25 01:44:21 UTC - merged at 2024-03-26 00:52:27 UTC --- PR changed 4 files with 75 additions and 8 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 > <!-- What did you change in this PR? --> > Changes ninja gloves to steal a flat rate of techs instead of wiping all of them. > Additionally adjusts the objective to require 1 to 2 steals to reach the target amount. > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > Ninja's stealing research was previously an extremely trivial and annoying objective. For them, you can pretty easily break into the server room and wait out the 20 second doafter. It's not super hard and you're not exactly shooting off warning signs. At this very low cost, science loses literally an hour+ of progress. > > This nerf changes it to only remove 4-8 random technologies, or only about 20k to 40k points worth. This is still pretty crippling but not awful. On top of that, they need to do it twice to hit the target amounts of 9 to 12 techs stolen. This provides counterplay by actually giving science a chance to see that all their research has vanished before the ninja is already gone. It also makes it significantly harder for ninja to obliterate everything science has done. > > ## 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. > --> > > **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: Ninjas no longer wipe all technologies when using their gloves on a research server. > </details> Co-authored-by: SimpleStation14 <Unknown>
## Mirror of PR #26427: [make chest rig purchasable in uplink](space-wizards/space-station-14#26427) 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) ###### `4b286039906159cd4e77ead99004c9495442c515` PR opened by <img src="https://avatars.githubusercontent.com/u/45323883?v=4" width="16"/><a href="https://github.com/Dutch-VanDerLinde"> Dutch-VanDerLinde</a> at 2024-03-25 13:50:34 UTC - merged at 2024-03-26 04:05:35 UTC --- PR changed 2 files with 13 additions and 0 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 > title > > ## Why / Balance > useful for syndies to hold their gear, or for loneops incase they wanna buy a reinforcement a chest rig > > ## Media >  > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > **Changelog** > 🆑 > - add: The chest rig is now available for purchase in the syndicate uplink. > </details> --------- Signed-off-by: SimpleStation14 <[email protected]> Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: DEATHB4DEFEAT <[email protected]>
## Mirror of PR #26167: [Fix playglobalsound autocompletion](space-wizards/space-station-14#26167) 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) ###### `65960facf522627c939a35a65b025ec49ffa5c52` 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-16 03:02:08 UTC --- PR changed 1 files with 3 additions and 1 deletions. The PR had the following labels: - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > Requires space-wizards/RobustToolbox#4968 </details> Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
## Mirror of PR #26263: [Add stealthmins](space-wizards/space-station-14#26263) 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) ###### `dca0c6694bce56fcf962feab2b59ad4a849f4533` 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-19 16:14:22 UTC --- PR changed 11 files with 197 additions and 10 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. --> > > resolve #26013 > > ## About the PR > <!-- What did you change in this PR? --> > This pr implements stealthmins as laid out in issue #26013. > > There is now the Stealth permission flag. This allows admins to use the stealthmin command and to see other stealthmins. > > When stealthmin is toggled, the admin will not show up in adminwho except for other admins with the Stealth permission. > > The stealthmin command sends fake de-admin/re-admin messages to admins without the Stealth flag. > > stealthmin persists in the same way deadmin does(it persists for the lifetime of the server). > > Admin login/logout messages are suppressed for stealthmins except for other admins with the Stealth flag. > > It is still possible possible to find stealthed admins using toolshed commands or logs. This is in line with the requirements of the issue, and I don't want to start clobbering functionality of logs and toolshed. > > ## Why / Balance > > See #26013 > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > > Stealth flag now exist for AdminFlags. > > An admin's stealth status is saved in their admin registration and in ContentData. > > SendAdminAnnouncement now takes a whitelist flag and blacklist flag (This will work with multiple flags). This is necessary to suppress admin announcements where necessary. Blacklist takes priority over whitelist. > > ## 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]): > --> > > https://github.com/space-wizards/space-station-14/assets/32041239/98ec48c3-170e-406a-b177-07003ff7d59f > > > - [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! > --> > > 🆑 > ADMIN: > - add: The stealthmin command has been added. Admins with the Stealth permission can now hide themselves from adminwho except for other admins with that permission. </details> --------- Signed-off-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: SimpleStation14 <Unknown> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
# Description Adds two negative traits, foreigner and its light version. Both of them make you unable to speak galactic common and give you a translator that lets you speak/understand GC, and also requires you to know one of the non-GC languages your entity normally speaks in order to work. The translator starts with a high-capacity power cell to compensate for the usual scarcity of publicly accessible chargers on most stations. The light version of the trait only makes you unable to speak GC. The heavy version also makes you unable to understand others when they speak it. This PR also makes you able to wear translator in the neck slot for convenience and transparency, and rewamps the examination menu of translators to provide more useful info. One little known issue (as seen in the screenshots below) is that, since the system chooses the first language in the list of languages your entity can speak, it can sometimes pick wrong if your species speaks more than two language, but it won't prevent you from using the translator normally. Also, the name of the light version of the trait is subject to change. I just couldn't think of anything more creative for it. # Why Although supposedly trystan or others have a language menu in mind, it's still not even being worked on yet. At the same time, I've already seen some people roleplay as though their characters do not speak galactic common. <details><summary><h1>Media</h1></summary> <p>      </p> </details> --- # Changelog :cl: - add: Added two new foreigner traits that make your character unable to speak Galactic Common and give you a translator instead. - tweak: Translators can now be equipped in the neck slot and display useful info when examined.
…to upstream-merge-6-28-2024
…o Upstream-Merge-7/11/2024
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…us/deep-station-14 into Upstream-Merge-7/11/2024
dasprino007
pushed a commit
to dasprino007/deep-station-14
that referenced
this pull request
Jul 20, 2024
Description copied from my Wizard's Den PR Resolves Simple-Station/Einstein-Engines#32 # TODO - [x] CVars - [x] Server side loadout point validation - Make tabContainer less bad - [x] Move head clothes to loadouts from lockers - [x] Move job starting equipment to loadouts - [x] Loadout item preview - [x] Fix loadouts duplicating on server restart - [x] Make sure everything is localized -- Components and Tags are an odd thing to display to the player in the whitelist and are very unrealistic to make localizations for, so.. not doing that, what do I do? - [x] Fix all items going into the bag no matter their size - [x] Add min/cur/max points to the bar - [x] Use buttons instead of checkboxes - [x] "Show Unusable" button to hide things your character currently doesn't match the whitelists for - [x] Time whitelist option - [x] Species whitelist option - [x] Trait whitelist option instead of EntityWhitelist for the sake of localization - [ ] More loadouts (filler things while waiting for review) - [ ] - Golden or themed items for Command roles with an undecided amount of playtime on their respective jobs - [x] - Goliath cloak for playing a lot of Salvage - [x] - Senior items for playing a lot of its respective role - [ ] - Varying materials of pocket watches for people with varying overall playtime - [x] Fix loadout selectors not updating to match current preferences <details><summary><h1>Media (Click Me!)</h1></summary> <p> I need to rerecord these https://github.com/space-wizards/space-station-14/assets/77995199/59713874-b043-4813-848e-56b2951b6935 https://github.com/space-wizards/space-station-14/assets/77995199/40180aee-bfe3-4f30-9df8-0f628e7e4514 </p> </details> # Changelog :cl: - add: Added a new character customization tab for selecting items to start your shift with, loadouts! - remove: Removed some default job equipment in favor of loadouts - remove: Removed several clothing items from Command lockers in favor of loadouts --------- Co-authored-by: VMSolidus <[email protected]>
dasprino007
pushed a commit
to dasprino007/deep-station-14
that referenced
this pull request
Jul 20, 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.
Prober Rework, numerous PRs merged from Wizden! Engine Updates too!