Upstream sync #2718
Merged
Upstream sync #2718
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
* Adds emotes to the Reptilian species: Tailthump, Hiss Todo: Huff * Adds emotes to the Reptilian species: Tailthump, Hiss Todo: Huff * Added ReptilianBodyEmotes to speech_emote_sounds.yml, yada yada yada * added sound and changed volume * fix thingies * fixed bug with reptilians not being able to do default emotes * lowered the volume of the hiss and huff * reformat the yml * Add sigh keywords to the huff * Undo changes to BuildChecker.csproj * Add icons to the emotes * Remove sigh triggers from the huff emote since it breaks normal sighing. * Remove the Huff and Hiss since i cant find good audio for it * i forgor * Changed attribution * Credit Sarahon for the tailslap --------- Co-authored-by: nicho <[email protected]>
* le fixo smotes * CURSE OF BLINDNESS * Guh
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Add robo control comp, also de-reinforce a lot of walls. * Revert "Add robo control comp, also de-reinforce a lot of walls." This reverts commit b6be6b616aa9732b81e02bed76e3c9ae103cf7cb. * FTLdiskburner command to make FTL disks. * Elegant failure on mistyped ID. * even more more eleganter failures. * foo * bar * I have reached completion * prevent id confusion * I'm givin' her all she's got captain! * a bit more hug boxing for safe destinations. * comments for foo * extra thoughts. * cleanup * continuen't * Improve feedback strings * reviewer QOL * Reviewer QOL 2 * handle easy reviews * Add comments to clarify reviews * howdoicode to the rescue. * ftldisk in hand * ftl.ftl * funny disk case * loc * unusing
* Several small sfx tweaks * fix small yml oopsie * Redo the basin code to use events * now uses an event for when the transfer is successful, not when there's just an attempt * forgot to remove this * Update Content.Server/Botany/Components/PlantHolderComponent.cs Co-authored-by: Nemanja <[email protected]> * Update Content.Server/Botany/Systems/PlantHolderSystem.cs Co-authored-by: Nemanja <[email protected]> * adds sound variations to shoes as well * variations on honkbots and the H.O.N.K mech * Update Content.Server/Botany/Systems/PlantHolderSystem.cs * Update Content.Server/Botany/Systems/PlantHolderSystem.cs * fix compile issue * oops forgot to delete this * cleanup --------- Co-authored-by: Nemanja <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: slarticodefast <[email protected]>
* changed bananium desc * removed bananium name and desc ftl string
* Initial commit * Attribution
* enable ejecting in biogenerator UI * allow inserting too --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* Subversion Board Insertion Audio Notification Add Subversion flag and SubversionSound to SiliconLawProviderComponent Add new Method (OnSubversionInserted) to SiliconLawSystem to handle a Subversive SiliconLawProviderComponent and play it's SubversionSound Add Check for Subversive law provider to OnUpdaterInsert that calls OnSubversionInserted if the SiliconLawProviderComponent is Subversive * Fix subversion Sound - Change out Weh sound used to test that subversion sounds can be changed by prototype for a a not yet present Antimov subversion sound * Make it not just subversive - Remove OnSubversionInserted and move the MindPlaySound in the OnUpdaterInsert so long as LawUploadSound exists - Modify SubversionSound into LawUploadSound - Remove the Subversion flag - Just use emagged_borg.ogg until the better one is made * Remove errant spaces and a errant namespace * CR Fixes - Add generic Lawboard insert cue - Combine the If statements per /pull/32625#discussion_r1786926400 inside OnUpdaterInsert - Remove the ViewVariables(VVAccess.ReadWrite) per pull/32625#discussion_r1786924433 - Add Cryo_warning.ogg from TGStation, the sound utilized for Law Upload cue, Attribution. * CR Add a placeholder Antimov notification sound - Add a new sound kitbashed from the cryo_sound used for uploading and the emagged noise * Add self referential source attribution - also fix an errant space * Add more bespoke Sound by ps3moira + attributions
this was just copypasted without any context wasn't it
…erience (#32851) set FancyWindow MinHeight to 210
* Change the window titlebar to show the joined server Requires space-wizards/RobustToolbox#5475 * Totally not a webedit * Can you tell what cvar I copied? * And this kids is why we don't webedit * Reviews --------- Co-authored-by: metalgearsloth <[email protected]>
* 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
small ai core lv change
Co-authored-by: deltanedas <@deltanedas:kde.org>
I don't really understand why RecordedSplitContainer exists but removing it looks identical and fixes the panel bumping occasionally.
Set hidden to true
…ap, Brig Timer (#32786) * various resprites (encryption keys + signal screens + station map) * brig timer update * fixes n shit
…ate the crusher and glaive icons. (#32212) * inhands * better inhands * indent
* replace tear gas and flashbang with holobarrier and sec radio * holobarrier-belt-fix
three bottle boxes in nanomed plus
…(#32720) * a-few-injectors * comment * defib-ops-when
# Conflicts: # Content.Server/Chat/Managers/ChatSanitizationManager.cs # Content.Shared/Localizations/ContentLocalizationManager.cs # Resources/Audio/Weapons/Guns/Gunshots/attributions.yml # Resources/Prototypes/Datasets/Names/last.yml # Resources/Prototypes/Loadouts/loadout_groups.yml # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit 6e6fd0f merging into 4fad639 Resources/Textures/Objects/Devices/ai_card.rsi
Resources/Textures/Objects/Devices/encryption_keys.rsi
Resources/Textures/Objects/Devices/tablets.rsi
Resources/Textures/Objects/Specific/Chemistry/syringe.rsi
Resources/Textures/Objects/Tools/appraisal-tool.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi
Resources/Textures/Clothing/Multiple/towel.rsi
Resources/Textures/Objects/Fun/spectrallocator.rsi
Resources/Textures/Objects/Specific/Medical/defibsmall.rsi
Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi
Resources/Textures/Objects/Specific/Medical/medipen.rsi
|
lzk228
added a commit
to lzk228/space-station-14
that referenced
this pull request
Oct 30, 2024
lzk228
added a commit
that referenced
this pull request
Oct 30, 2024
Co-authored-by: NotSoDamn <[email protected]> Co-authored-by: mhamster <[email protected]> Co-authored-by: lapatison <[email protected]>
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.
Описание PR
Почему / Баланс
Технические детали
Медиа
Требования
Критические изменения
Список изменений