Merge upstream#27
Merged
Merged
Conversation
Handle it (cherry picked from commit fb76cd9)
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com> (cherry picked from commit 634c4a7)
(cherry picked from commit a8ebcac)
* 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 6c86d7b)
* 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 854bfd2)
(cherry picked from commit b1f83fb)
…#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 9de569d)
(cherry picked from commit cbecc4c)
* 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 b0375f1)
(cherry picked from commit edbc861)
(cherry picked from commit 5af55bb)
(cherry picked from commit 75e4697)
* 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 61fd816)
modified: Resources/Locale/en-US/speech/speech-chatsan.ftl modified: Resources/Prototypes/Accents/word_replacements.yml (cherry picked from commit d13bcd1)
* Ngl added fr this time * Update speech-chatsan.ftl Not gonna lie sounds more realistic than not going to lie (cherry picked from commit 8931800)
(cherry picked from commit 8e43bb1)
* 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 8eb4e4f)
* 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 876c44c)
…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 0d33e61)
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 4a5178a)
Fix (cherry picked from commit a790955)
* Implemented the thing * Made requested changes (cherry picked from commit 55bffa8)
(cherry picked from commit 4252fdf)
* Fixed trash not being spawned when throwing pies * Completely removed trash component flag check prior to the spawn loop (cherry picked from commit 835d0b4)
* Network BaseEmitSoundComponent * high intelligence (cherry picked from commit c6e5b23)
* add SpawnTableOnUse * make BaseEmitSound more flexible and remove sound from spawntable * add log *--------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 2635888)
* took a two month nap. accidentally pushed too many buttons. let's try this again. added thieves to antagonists.xml * even after that nap, i don't feel well-rested at all. * please don't kill me for using webedit * capitalization, typo * Apply suggestions from code review (more period moving) Thanks Evan, very cool Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * guess you could say im not pro-proper noun * typo * Update Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml * ok Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> (cherry picked from commit 3382743)
* fixed all yml and cs * Subjective Rearranging * fixed my accidentally removed xml endline * Accidentally included for a different PR * Added .ThenBy and cleaned up newplayer.yml (cherry picked from commit 91678f7)
* > Swapped the butter in boiled spaghetti with olive oil * Update meal_recipes.yml --------- Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> (cherry picked from commit 16aad5a)
* Grilled Cheese Prototype * Typos * Removed butter reagent to test flavour changes. * Flavour corrections. * CC-BY-SA-3.0 attribution * Fixing meta.json * I lost an hour of my life to a missing comma in meta.json * Merge Conflict Rebase and Test Fixing * Cook time to 10 seconds. * Sandwich nutritional balance * Grilled cheese sprite fixed, found the actual original source for copyright. (cherry picked from commit 3c8fb2e)
(cherry picked from commit b7414d8)
* initial commit * Delta review (cherry picked from commit ddaa0e8)
Don't show unused codeword sets (cherry picked from commit da19abd)
(cherry picked from commit 8433868)
(cherry picked from commit 74888c8)
* Remove kessler, zombeteors gameodes * Probably should keep the protos in case an admin wants to torture players secretly * address slart review (cherry picked from commit b6599d3)
* Adds Survivor Antag * Adds Survivor Role * Adds Survivor Rule ECS, adds a survivor role event, adds make antagonist to random global spawn spell * Moves Survivor Ensurecomp to event handler. Makes Add Survivor Role a broadcast. Adds Survivor Component. Removes redundant briefing. * Adds Survivor Antagonist role type for admins to keep track of this easier, adds it to Survivor. * Adds access to survivor game rule system * Adds Survivor Rule * Adds end of round survivor text * Adds end of round reporting logic. Adds logic to start the survivor rule. * Changes desc from centcomm to shuttle * survivor (S) * Checks if they're alive on the shuttle instead of centcomm. * ftl text selection based on number of survivors. * Removed Survivor Antagonist, replaced it with Free Agent. * Adds InvalidForGlobalSpawnSpell tag, checks for it on spawnspell, and adds it to a zombified person. * Changes logic so we launch the game rule if it hasnt launched yet. Moves rule logic starting to server. Moved survivor rule logic out of event and into Start method. * Fixes invalid entity issue * Descs for Survivor Rule and Survivor comps * Moves Survivor Rule to its own yml * Checks for dead survivors, changes survivor checks for mind. Adds survivor comp to mind to fix any mindswap issues. Same for invalid survivor tag * Changes shuttle xform call to just mapid * Protoid fix * THE WIZARD * Wizard spawner * adds the correct state * Wizard preset and weight * Fixes wizard rule * Weight back to 100% * Adds Random Metadata * Wizard locs * Puts requirements in the right place * Adds wiz ghost spawner and mob * wizard spawnpoint fix + shuttle mapping * wizard loadout + fix wizard spawning + wizard random name * comment * Adds Wizard testing * FIXES SHUTTLE ISSUE BASED REI * THE WIZARD LOBBY SONG. Special thanks to song creator Chris Remo for allowing us to use this. * Free Objective ECS + Base Free Objective * Space Wizard Federation for Wiz Obj issuer. * Wizard Objectives * Moves wizard shuttle to base wizard rule. Gives Wizard their objectives. Removes WizardRule * Renames midround to subgamemodes. Adds wizard sub game mode. * Adds SubWizard to SubGameModesRule. Adds a SubGameMode with no wizard. Adds No SubGamemodeRule for Wizard preset * Wizard midround event * Fixes wizard midround * Wizard Guidebook * Removes todo * Fixes text * Removes wizard rule ECS, not needed * Wizard jetpack --------- Co-authored-by: ScarKy0 <scarky0@onet.eu> Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> (cherry picked from commit 68de58e)
* Remove plushie_lizard_mirrored.png * Remove from meta.json * Replace mirrored state from yml --------- Co-authored-by: LevitatingTree <None> (cherry picked from commit 25980d8)
* fix rainbow plushie inhands * address requested changes * attribute sprites (cherry picked from commit 0639a49)
(cherry picked from commit eeccdbf)
* Finally, people can learn what the Broadcast button does! * Also add for Alert level * Add alert level and shuttle button tooltips * Fix dumdum, tweak Broadcast tooltip (cherry picked from commit 2742adb)
…ate computer board sprite. (#34104) * Defined sprites for non-generic computer boards. Added new syndicate computer board sprite. * Added new sprite to meta.json and updated attribution. * Reformatted module.rsi meta.json to match other meta file styles. * Syndicate board sprite made less yellow/gold, changed outer chips to black. Using grey/silver for CPU centre, akin to syndie agent PDA theme, and to keep distinctive from security board. * Corrected indentation spacing for currently edited entities. * Update Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml * add pr link to attribution --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> (cherry picked from commit 1a5be80)
FIREBALL MOTHERF- (cherry picked from commit f6c0e6d)
<!-- 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]? --> Just another wizmerge. # PLEASE DON'T SQUASH THIS!!! --- # 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] Fix test --- <!-- 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: - add: A small amount of content has been transferred from Wizden: Part 2
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.
time to break shit again
Most of the changes found in #2548