Conversation
Handle it (cherry picked from commit fb76cd952e602164571cf6a4f4aa5ca788c57117)
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com> (cherry picked from commit 634c4a7780b3692074fd48edecf6d8702d40aac4)
(cherry picked from commit a8ebcac5c9e36765671b742a4f587a80cfadf4f3)
* Cleanup `ScrubberControl.xaml.cs` * Minor cleanups * Another pile of minor cleanups * Apply requested changes * Rename "which" into "bound". Add whitespace after "if" (cherry picked from commit 6c86d7b32bc937c831474ccd0eeabfc6ab9d8c7e)
* crewmon filter * string case matching Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> (cherry picked from commit 854bfd27cb062680caaeeec2a4c58b53372b4af6)
(cherry picked from commit b1f83fb70733893c4acca9583ce9b19d27416eac)
…#33854) * Use class instead of out variables * Show battery level in power monitoring console * Better color contrast for battery level + localized string * Add visualization to battery percentage * Reverts random ChatSystem.cs whitespace change * Address review * Show BatteryLevel stats in child view when selecting devices --------- Co-authored-by: Crotalus <crotalus@users.noreply.github.com> (cherry picked from commit 9de569d9730c0a6453caa07955a9cd9c7c030e9a)
(cherry picked from commit cbecc4cc4b3413f507d3c8612ea3394a783d5dd9)
* Remove client state from server AirAlarmComponent Send information for all connected devices, not just the ones for the current tab, as attempting to limit this breaks multiple users viewing the same UI. Fixes #12842 * Send device data as a list, rather than a dictionary --------- Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es> (cherry picked from commit b0375f115c17564ecec1e58bf6851644fee1b723)
(cherry picked from commit edbc861c78d65b8f5e6c627e59522abb43016f1f)
(cherry picked from commit 5af55bbf2bfb8f82e1a199b352e9b12aaded756b)
(cherry picked from commit 75e469738c222ebc4fc1c42507205fbde42f7dba)
* tyvm, tysm * cya -> see you * ya (cherry picked from commit 87fe804)
* Update speech-chatsan.ftl * Update word_replacements.yml * Atm-at the moment * Atm * Update Resources/Locale/en-US/speech/speech-chatsan.ftl * Update Resources/Prototypes/Accents/word_replacements.yml --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> (cherry picked from commit b50faff)
* Update word_replacements.yml * Update speech-chatsan.ftl (cherry picked from commit 61fd8167e0e20cba1488f43b281c03941344843b)
modified: Resources/Locale/en-US/speech/speech-chatsan.ftl modified: Resources/Prototypes/Accents/word_replacements.yml (cherry picked from commit d13bcd1faa2950377f61a4c3c6159999f60f5e3a)
* Ngl added fr this time * Update speech-chatsan.ftl Not gonna lie sounds more realistic than not going to lie (cherry picked from commit 893180038f51762edc9743e4a8177a7f6d5a8cd9)
(cherry picked from commit 8e43bb1b07a7b858893da1402a129c4fb32ae870)
* added a few chatsan entries * added 2 more * added 4 more and fixed errors * fixed error again * added allg * removed fullstops (cherry picked from commit 8eb4e4fa2dd90eceb3fbef29eb1db799472fff78)
* Rename ChatSanitizationManager to ChatEmoteSanitizationManager The prior name was kind of confusing as there's a emote one and then now there's also chat expansion happening in the accent system, so knowing which I actually need to edit is useful. So, I just need to keep myself not confused. * Rename smileyToEmote and remove punctuation duplicates The name SmileyToEmote is just... Bad. Plus, I needed to remove the punctuation duplicates as that would break any kind of regex parsing that I tried. * Switch to regex from checking end of string I also changed from System.Globalization to ILocalizationManager. Writing that regex was definitely an experience. * Document regex and the manager * Rename it back * Simplify regex (cherry picked from commit 876c44cd660f729aa9c7b0ab3b1d4cad586afd20)
…tAccentPrototype (#28049) Move replacement chance to ReplacementAccentPrototype (cherry picked from commit b08f79f)
…`` in different files (#35107) * Split ReplacementAccentPrototype and ReplacementAccentComponent * Fixes * Fixes * inheritdoc (cherry picked from commit 0d33e6182c4fdbad89f1e3a0806040e42f9da40c)
This code was a mess. Now it's less of a mess and user UserDbDataManager now. Fixes the following bugs: * If you connect to a server, restart your client, connect again in the same round, you role bans would not be visible in the client. * If you role ban somebody who is not connected to the server, then they connect within the round, they will only have the recently-applied ban. Likely fixes #24781, #27282 (cherry picked from commit 4a5178a5389a4a5beb952c884515e011046362b5)
Fix (cherry picked from commit a790955b764b1ee0905917f99c79ff96d9a81dd3)
* Implemented the thing * Made requested changes (cherry picked from commit 55bffa864aa6395032b7dfbc2745425776d9b637)
(cherry picked from commit 4252fdffb91050e375ac197067f7dcde09e7b168)
* Fixed trash not being spawned when throwing pies * Completely removed trash component flag check prior to the spawn loop (cherry picked from commit 835d0b4d4a861c4697c473841c0e00ae7115e4d0)
* Network BaseEmitSoundComponent * high intelligence (cherry picked from commit c6e5b2339e8cffa4b8f4ba05e78b76758e86ccba)
* Modified science spawners a bit since I realized including maints loot was undesireable * Linked Medical doors to buttons, redesigned the floor of the dining area a bit, placed more science spawners * Somehow I overlooked that I was importing the maints loot table instead of the sci loot table * Gave sci an EOD closet * named the evac shuttle (cherry picked from commit a033abbfbea89a355c419f94dcd2611bf3a2ad4e)
* Fix migrations not being applied to PostMapInitTest * formatting * Raise the event outside the loop so it only happens once (cherry picked from commit d4c8ddb0ac6fbbea7aa8f92880c26c5376377433)
(cherry picked from commit 3c20f6329273ca43fdcee72a338380546f8c69ce)
<!-- 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]? --> Ports Goobstation's titular Goobmodule to Einstein Engines, as well as relevant systems. This should really, really help when porting stuff over from Goob. --- # 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 --> - [ ] Ideally move stuff out of _Goobstation and to goobmod --- <!-- 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> No. </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: - add: Goobmodule has been ported. We are now 1% closer to becoming a Goobstation fork.
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.