Upstream stable 30.10.2024 #200
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
It's simple. We kill the heisentest
It's simple. We kill the heisentest
* Fix some rounds failing to end due to mind roles Fixes #32791 This is caused by ShowRoundEndScoreboard running into a bug trying to display antags: some player is showing up as antag with MindIsAntagonist(), but has no antag roles listed in MindGetAllRoleInfo(). This was caused by one of the roles of the player having the Antag boolean set, but having no AntagPrototype set. The responsible mind role appeared to be MindRoleSubvertedSilicon which is missing a set for the SubvertedSilicon antag prototype. I also added resilience to the round-end code to make it so that an exception showing the scoreboard (and sending the Discord message) would not cause the round end logic to completely abort from an exception. I am planning to add an integration test to cover this bug (no prototype in mind roles), but I'll leave that for not-the-immediate-hotfix. * At least one maintainer approved this tiny PR without reading it, not naming names.
Fix tech anomaly nexttimer (#32805) Co-authored-by: metalgearsloth <[email protected]>
* 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]>
* init * im so confused * clean * sprite update * :| * further attempts * be blessed for it works * Very prestigious pAI * cleaning up * Intellicard in RD locker * PAIn't * .Clear()n't * .Clear()n't for real this time * Cleaning up * Whoopsie Daisy
* Initial implementation * currently it crashes on load, don't know why, maybe changing the products will provide some insight * I was overlooking part of the yaml formatting.
Co-authored-by: slarticodefast <[email protected]>
* Fix several jank issues with space ninja cell upgrades. * Rework the code to comply with maintainer request. * Fix some naming convention & formatting errors. * Change from a custom check to an item whitelist to avoid power cages from fitting. * Make the EntityUid of GetCellScore non nullable. * Remove a line from a previous solution to the above problem I forgot to remove. * Fix the magic number issue.
* golden apprasial tool when * thanks evan. very cool
* Atmospheric alerts computer * Moved components, restricted access to them * Minor tweaks * The screen will now turn off when the computer is not powered * Bug fix * Adjusted label * Updated to latest master version * Initial commit * Tidy up * Add firelocks to the nav map * Add nav map regions to atmos alerts computer * Added support for multiple region overlay sets per grid * Fixed issue where console values were not updating correctly * Fixing merge conflict * Fixing merge conflicts * Finished all major features * Removed station map regions (to be re-added in a separate PR) * Improved clarity * Adjusted the color saturation of the regions displayed on the atmos alerts computer
Packed map update, significantly changes arrivals, perma, AI core, and misc other QOL.
* Fix bug? * Fix :) * aaaa * AAAA!!! * comment * Nicer code * What's a pull requestWhat's a pull request?
…n-14 into staging
…n-14 into staging
…tem. (#32942) Fix loneop spawnrate by reverting it to not use the custom shuttle event system.
|
RSI Diff Bot; head commit 69e66b7 merging into e16b0ac Resources/Textures/Objects/Devices/ai_card.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/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi
Resources/Textures/Clothing/Multiple/towel.rsi
Resources/Textures/Objects/Fun/spectrallocator.rsi
Resources/Textures/Objects/Weapons/Guns/Cannons/syringe_gun.rsi
|
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
Почему / Баланс
Технические детали
Медиа
Changelog