test #1
Open
test #1
Conversation
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
LuciferEOS
pushed a commit
that referenced
this pull request
Sep 9, 2025
* Adds full english and american breakfasts and respective recipes * sprite tweak and added random spawner * reagent rebalance * reagent re-rebalance * spawner ID fix * ACTUALLY actually fixed the spawner, also description changes * reagent re-re-rebalance * spawner fix so the linter stops screaming at me * different check failed kekw * trailing whitespace fix attempt #1 * identation fix? i think? * indetation fix part 2, also vox cant eat this anymore * more yaml fixes --------- Co-authored-by: DispenserDev <mariousjoaquin@gmail.com>
LuciferEOS
pushed a commit
that referenced
this pull request
Sep 9, 2025
* Layering for atmospheric pipes (#36124) Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Co-authored-by: Kevin Zheng <kevinz5000@gmail.com> # Conflicts: # Content.Client/Construction/ConstructionPlacementHijack.cs # Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs # Content.Server/Atmos/Piping/EntitySystems/AtmosPipeAppearanceSystem.cs # Content.Server/NodeContainer/Nodes/PipeNode.cs # Content.Shared/Atmos/Components/PipeAppearanceComponent.cs # Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleDeviceComponent.cs # Content.Shared/Prototypes/NavMapBlipPrototype.cs # Content.Shared/Verbs/VerbCategory.cs # Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml # Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_pipes.yml * Air Grenade Cargo Order (#38010) # Conflicts: # Resources/Prototypes/Catalog/Cargo/cargo_materials.yml # Resources/Prototypes/Catalog/Fills/Crates/engineering.yml * Automatic changelog update * Automatic changelog update * Lube Evaporates Slowly (#37998) * Automatic changelog update * Use distinct action labels for toggling internals on and off. (#36073) * Use distinct action labels for toggling internals on and off. * Implement specific actions for enabling/disabling internals Avoids potential confusing race conditions where two people might perform the "Toggle Internals On" action an the same person, which would have jsut toggled twice. * If no gas tank, will give popup --------- Co-authored-by: beck-thompson <beck314159@hotmail.com> # Conflicts: # Resources/Locale/en-US/actions/actions/internals.ftl * Automatic changelog update * Add multipart machines system (#35969) # Conflicts: # Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs # Content.Server/Construction/ConstructionSystem.Graph.cs # Content.Server/Entry/IgnoredComponents.cs # Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPartComponent.cs # Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Parts.cs # Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.PowerBox.cs # Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorToggleWireAction.cs # Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorEndCapComponent.cs # Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorFuelChamberComponent.cs # Content.Shared/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs # Resources/Prototypes/Entities/Structures/Power/Generation/PA/emitter.yml # Resources/Prototypes/Entities/Structures/Power/Generation/PA/end_cap.yml # Resources/Prototypes/Entities/Structures/Power/Generation/PA/fuel_chamber.yml # Resources/Prototypes/Entities/Structures/Power/Generation/PA/power_box.yml * improve noir glasses shader (#37996) * improve noir glasses shader * tweak values * Automatic changelog update # Conflicts: # Resources/Changelog/Changelog.yml * Fix IgnoredComponents * Add checks for various complex interactions (#37246) * Prevent toggling radiation collectors * Prevent resisting locks * Prevent unbuckling others, early exit before doafter * Prevent camera and camera router setup * Prevent rotating and flipping * Also prevent adding the unbuckle verb. * Revert ResistLocker changes * Prevent emitter tampering * Also prevent lock verb * Prevent toggling welders * Prevent gun open/close bolt, rack and switch mode * Prevent toggling stun batons # Conflicts: # Content.Shared/Stunnable/SharedStunbatonSystem.cs # Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs * Automatic changelog update * Fix: Wall-mounted SpawnPrototype Issue. (#36353) Fix #34569: Wall-mounted SpawnPrototype Issue. Every wall-mounted prototype that uses SpawnPrototype in it's deconstruction now uses GivePrototype which gives the entity to the user, or drops it on the ground in case their hands are full, no longer spawning the entity inside the wall or on the other side of it * Automatic changelog update * Adds air atmospherics markers to emergency_plasma.yml (#37768) Co-authored-by: GuyThatFawkes <212874941+GuyThatFawkes@users.noreply.github.com> Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * Fix directional window inconsistencies (#38038) * Automatic changelog update * Predict AME Fuel Examine (#38018) * init * :) * Cargo food crate adjustments (#38006) * Adjusted cargo food prices; removed large pizza/softdrinks crates * Adjusted salvage_rewards.yml and cargo_gifts.yml around the removal of large pizza/soda crates * Automatic changelog update * Fixes electropacks not ignoring insulation (#38011) Co-authored-by: TheFlyingSentry <Daniel.l.Elledge@gmail.com> * Automatic changelog update * Cryo sleep units no longer collide with mobs (#37979) * make cryo sleepers not trap people * don't forgor to push change * Automatic changelog update * Increase uranium window health (#38040) init * Automatic changelog update * Stylized the nanotask printouts to be *pretty* (#37805) * Automatic changelog update * Fix buckle interaction * Revert "highlights (#1849)" This reverts commit 94b9607. # Conflicts: # Content.Client/Options/UI/OptionsTabControlRow.xaml.cs # Content.Client/Options/UI/Tabs/AccessibilityTab.xaml # Content.Client/UserInterface/Systems/Chat/ChatUIController.cs # Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterPopup.xaml.cs # Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs # Content.Client/_Shitcode/Options/UI/OptionColorSlider.xaml # Content.Client/_Shitcode/Options/UI/OptionColorSlider.xaml.cs # Content.Shared/_Goobstation/CCVars/CCVars.Goob.cs # Resources/Locale/en-US/_Goobstation/chat/highlights.ftl # Resources/Locale/en-US/_Goobstation/chat/ui.ftl # Resources/Locale/en-US/_Goobstation/escape-menu/ui/options-menu.ftl * Add text highlighting (#31442) Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Co-authored-by: Hans Larsson <hanandlia@gmail.com> Co-authored-by: Tobias Berger <toby@tobot.dev> # Conflicts: # Content.Client/Options/UI/Tabs/AccessibilityTab.xaml # Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs # Content.Shared/CCVar/CCVars.Chat.cs * Add Diona rooting (#32782) * Initial commit * Add sound * Review commets * addressing review * I think this is what Slart meant? * Review fixes * More fixes * tiny formatting * Review fixes * Review fixes * Fix small timing error * Follow new action system * review --------- Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Co-authored-by: ScarKy0 <scarky0@onet.eu> # Conflicts: # Content.Server/Damage/Systems/DamageUserOnTriggerSystem.cs # Content.Shared/Damage/Components/DamageUserOnTriggerComponent.cs # Content.Shared/Slippery/SlipperySystem.cs # Resources/Prototypes/Entities/Mobs/Species/diona.yml * Automatic changelog update # Conflicts: # Resources/Changelog/Changelog.yml * Blood-Red Magboots now correctly show if magboots are active (#38013) * Change JetPack Item Visuals to use GenericVisualizer instead of AppearanceChangeEvents * Fix YAML indentation for jetpacks.yml # Conflicts: # Content.Shared/Movement/Systems/SharedJetpackSystem.cs # Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml * Remove Lube From Trash Puddle Spawns (#38048) * Evac Repair Lockers (#38075) Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> # Conflicts: # Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml * Automatic changelog update * Fix noir shader in compability mode (#38080) fix noir shader in compability mode * Automatic changelog update * Update submodule to 261.2.0 (#38081) * In-hand sprites for some food items (#38024) * so meow changes * qwawa * fixed sprites * Update meta.json * Update meta.json * Update meta.json * Update meta.json * Update meta.json * more inhand variations using coloring not perfect but better than nothing * more meats * pizza inhands, ported from starlight and edited * add link * snack inhands * worldpeas * chips * packets * all snacks and trashes finished * correction # Conflicts: # Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml * Automatic changelog update * Tweak for the visual coverage granted to station AIs by holopads (#38059) * Initial commit * Added option to require anchoring # Conflicts: # Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs * Automatic changelog update * Revise ShowAccessReadersCommand as LocalizedEntityCommands (#37991) * revise ShowAccessReadersCommand * don't believe this is needed anymore? hopefully servers world wide don't explode. * Split codewords into its own system (#37928) * Split codewords into its own system * Fix admin log * Nuke unused code * Fix formatting errors * Fix tests * Make the codeword system add itself if called when not active * Put comment in right place. * Review: Rename prototypes * Review: Make codewords serializable * Fix build * Reviews: Change the system to not be a gamerule. * Fix YAML Linter * Fix test fail * Remove unused import # Conflicts: # Content.Client/Entry/EntryPoint.cs # Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs # Content.Server/GameTicking/Rules/TraitorRuleSystem.cs # Content.Server/Traitor/Components/TraitorCodePaperComponent.cs * Fix soap recipe so it actually works (#37923) Change soap recipe * Automatic changelog update * Automatic changelog update * Added security mime mask (#37890) * Added security mime mask * Improved security mime mask equipped sprites * Improved security mime mask icon sprite * meta.json spacing fix * Reorganized Turret Prototypes (#37863) * Reorganized turret prototypes * Added circuit board to migrations * Fixed frequencies * Fixed typos and set the base control panel to abstract since it's technically not constructable yet * Fixed the typo in the migrations * Addressed changes * Whitespace fixes * Whitespace check fix --------- Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> * Automatic changelog update * Sellable syndicate contraband (#37835) * Sellable syndicate contraband * 1984 tests, laughible * Balancing # Conflicts: # Resources/Prototypes/Entities/Clothing/Belt/belts.yml # Resources/Prototypes/Entities/Clothing/Hands/gloves.yml # Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml # Resources/Prototypes/Entities/Objects/Fun/pai.yml # Resources/Prototypes/Entities/Objects/Power/powersink.yml # Resources/Prototypes/Entities/Objects/Tools/emag.yml # Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml * Standardized running and walking speed debuffs for equipped gear. (#37828) Co-authored-by: RedBookcase <Usualmoves@gmail.com> # Conflicts: # Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml * Access Reader Refactor (#37772) * Initial commit * Integration test fix * Removed redundant dirtying of accessreader # Conflicts: # Content.Shared/Access/Components/AccessReaderComponent.cs * Traitor rule null string fix * Improve Potted Plant Movability and Availability (#37591) * Added Purchasable Potted Plant Crate * Removing some whitespace that made it in elsewhere * Making Potted Plants Items and pickupable * Revert Making potted plants not fade This reverts part of commit a50a7def80c06e5be68a37263306007739952a28. * Adding self to credits * Fixing sus spacing # Conflicts: # Resources/Prototypes/Catalog/Cargo/cargo_fun.yml * Automatic changelog update # Conflicts: # Resources/Changelog/Changelog.yml * Rifle crate order (#35535) * lecter crate and gift * revert cargo gift security armor change * rifle cost down to 8000 spesos # Conflicts: # Resources/Prototypes/Catalog/Fills/Crates/armory.yml * Automatic changelog update * Muzzles reduce emote sound (#34444) * Muzzles reduce emote sound * update based on review comments * review comments # Conflicts: # Content.Server/Chat/Systems/ChatSystem.Emote.cs # Content.Server/Speech/Components/MumbleAccentComponent.cs # Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs * Automatic changelog update * Emote audio param fix * Added Scrap Armor [Reupload]. (#37601) * Added Scrap Armor v2. * Added a note to scrap helmet about vision reduction. * Removed protection from step triggers. * The patient needs broken kneecaps to live. * Add in missing tag * Missing tags pt 2 --------- Co-authored-by: RedBookcase <Usualmoves@gmail.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * Automatic changelog update * Make improvised explosive devices minor contra (#38088) pipe bomb and fire bombs are minor contra * Automatic changelog update * emergency shuttle emergency lockers (#38095) * Cleanup unused/redundant dependencies (#38099) * Shark toys use the bite animation. (#38113) # Conflicts: # Resources/Prototypes/Entities/Objects/Fun/toys.yml * Automatic changelog update * Fix throwing items into disposal units (#38106) * Increase throwing into disposal chance (#38116) * Automatic changelog update * Don't show climb verb for objects that cannot be climbed (#38115) fix climb verb * Fix MapManager * Add player autofill to rename command. (#38074) * simple enough * switch to CompletionResult.FromOptions and CompletionHelper.SessionNames * cleanup # Conflicts: # Content.Server/Mind/Commands/RenameCommand.cs * Reduce Liquid Frezon Duration (#38100) testing * Light Up Landmines (#38092) * Adjust landmines to have unshaded lights. * Someday I will give myself credit for the work I do. * Adjust animation speed. * Automatic changelog update * fix wallmount vending machine dispense direction (#38112) fix wallmount vending machine direction * Fix serialization of `SunShadowCycleComponent` (#38002) * Use a struct to hold the items for `Directions` in `SunShadowComponent`, fix serialization. * actually make them datafields... * Add NetSerializable to datadef * this is why we can't have nice things * ShowEmergencyShuttleCommand and MeleeSpreadCommand LEC conversion. (#37993) progress * Add name to chameleon controller implanter (#38117) Update implanters.yml * Automatic changelog update # Conflicts: # Resources/Changelog/Changelog.yml * chem.yml cleanup (#38129) Update chem.yml * Reduce disabler capacity to 16 shots (#36019) * 14 shots * 14 to 16 # Conflicts: # Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml * Automatic changelog update * Genpop wall lockers (#38102) * sprites * genpop wall lockers * number 5 alive * slight boilerplate code, thank you slarti * fix: allow ejecting diamonds from lathes/silos (#38132) # Conflicts: # Resources/Prototypes/Reagents/Materials/materials.yml * Fix stripping window for more than 2 hands (#37577) * make PacifiedComponent session specific (#38137) # Conflicts: # Content.Shared/CombatMode/Pacification/PacifiedComponent.cs * Forbid string literals for `NpcFactionSystem` methods (#38140) * Add ForbidLiteral attribute to NpcFactionSystem methods * Cleanup resulting warnings # Conflicts: # Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs # Content.Server/Zombies/ZombieSystem.Transform.cs * No raffle for space carp (#38101) No raffle for carp Signed-off-by: Nox38 <nebulousnox38@gmail.com> * Automatic changelog update # Conflicts: # Resources/Changelog/Changelog.yml * adjreagent now accepts float (#38134) * adjreagent now accepts float * var * Automatic changelog update * MapManager warnings cleanup Server Edition 2003 (#36781) * now you see me * unused depen * test fail fix attempt 1 * test fail fix attempt 2 * fix test fail attempt 3 * shot in the dark. * Does this work? * import cleanup * taking a shot at this. * Convert PersistenceSaveCommand to LocalizedEntityCommands. * requested changes * requested changes. also dealt with improperly named private const * Update Content.Server/GameTicking/GameTicker.Spawning.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Server/GameTicking/GameTicker.Spawning.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Convert PlanetCommand to LocalizedEntityCommand * Update BiomeSystem.cs * Update Content.Server/Salvage/SalvageSystem.Runner.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Server/Procedural/DungeonSystem.Rooms.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Server/Salvage/SpawnSalvageMissionJob.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Server/Station/Systems/StationBiomeSystem.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * revert to latest master. * slartis suggestion. * Update SetMapAtmosCommand.cs * cleanup * Update PersistenceSaveCommand.cs * finish localizing persistencesavecommand * this is icky, I change. * :sigh: * revert whatever I did here? * oh I see, some inconsistencies. * revert this * Update PlanetCommand.cs * move this ftl to the commands folder --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> # Conflicts: # Content.Server/Administration/Commands/PersistenceSaveCommand.cs # Content.Server/Polymorph/Systems/PolymorphSystem.cs # Resources/Locale/en-US/persistence/command.ftl * Missing contraband tags on explosives (#37521) * Firebombs as minor contraband * Pipebombs as minor contraband * Seismic charge as cargo/sec contra (like crushers) * Modular payloads # Conflicts: # Resources/Prototypes/Entities/Objects/Devices/payload.yml * Update submodule to 262.0.0 (#38174) * Allow cargo request computers to send orders to the primary account (#37943) # Conflicts: # Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml * Revert "Add trailing whitespace check workflow" (#38179) Revert "Add trailing whitespace check workflow (#37367)" This reverts commit be35f6e. * Give unique names to all curtain construction recipes (#38182) * Give unique names to all curtain construction recipes * Duplicate entry * Automatic changelog update # Conflicts: # Resources/Changelog/Changelog.yml * Revert tile aligned barsigns (#38185) fixtures for bar signs (#37756)" # Conflicts: # Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml * New Recipes: Breakfasts (#37279) * Adds full english and american breakfasts and respective recipes * sprite tweak and added random spawner * reagent rebalance * reagent re-rebalance * spawner ID fix * ACTUALLY actually fixed the spawner, also description changes * reagent re-re-rebalance * spawner fix so the linter stops screaming at me * different check failed kekw * trailing whitespace fix attempt #1 * identation fix? i think? * indetation fix part 2, also vox cant eat this anymore * more yaml fixes --------- Co-authored-by: DispenserDev <mariousjoaquin@gmail.com> * Typo fix in coffin description (#38193) * Automatic changelog update * Emergency Shuttles Update (#38186) # Conflicts: # Resources/Maps/Shuttles/emergency_box.yml # Resources/Maps/Shuttles/emergency_omega.yml * Automatic changelog update # Conflicts: # Resources/Changelog/Maps.yml * hi-viz vest laser reflect (#38180) * Update vests.yml * Update vests.yml * Update Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update # Conflicts: # Resources/Changelog/Changelog.yml * Bring back low pressure damage to its unnerfed value (#38196) * Automatic changelog update * Remade the AI Camera Static Shader (#38093) Redid the camera static shader * Automatic changelog update * Add missing locale in Criminal Records Computer (#38217) add missing filter locale * WHYYYYYYY (cleanup) (#38220) * WHYYYYYYYY * Delete Resources/Locale/en-US/actions/actions/rootable.ftl * cleanup mirror.yml (#38222) * Fix missing bike horn implant cooldown (#38237) * Cleanup `ChameleonJobLoadoutTest` (#38229) Cleanup ChameleonJobLoadoutTest * Automatic changelog update # Conflicts: # Resources/Changelog/Changelog.yml * Fix construction menu grid view quirky button selection (#38214) * make hover and info use construction proto name, not entity name * recipeButtons uses IDs as keys, not names * return making item green when selected * Replace Speech bubble time accumulator with TimeSpan (#38241) * Replace SpeechBubble time accumulator with TimeSpan * CurTime -> RealTime * Add test that entity prototypes don't use LocIds for name/description (#38234) * Add test that entity prototypes don't use LocIds for name/description * Fix violation # Conflicts: # Resources/Locale/en-US/actions/actions/mapping.ftl * Guitar Sprite Fix (#38207) * Modified Guitar Sprites Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Attributions Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> --------- Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Add technology to tech disk names (#38157) # Conflicts: # Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs * Automatic changelog update * Forbid string literals for `SharedToolSystem` methods (#38250) * Forbid string literals for ToolSystem methods * Cleanup violations * Sort usings # Conflicts: # Content.Server/Mech/Systems/MechSystem.cs # Content.Server/Medical/CryoPodSystem.cs # Content.Server/Wires/WiresSystem.cs * Fix mops, rags, and towels interacting with drains (#38252) added the stuff * Automatic changelog update * Makes the grenadine bottle start closed. (#38219) * whywhywhy * removes unneeded line * Automatic changelog update * Automatic changelog update * Improve some `BinSystem` functionality (#38262) * BinSystem improvements * Prevent double-add * Cleanup 2 `SpriteComponent.GetPrototypeTextures` uses (#38263) Cleanup 2 SpriteComponent.GetPrototypeTextures uses * Add the instrument names to the MIDI channel selector (#38083) * Add the instrument to the MIDI channel selector * Reviews Adds support for chained masters Makes the channel UI update on its own when the midi changes (Works with bands too!) * add to admin logs and limit track count * Limit track names by length too * remove left over comment * Requested changes * Reviews # Conflicts: # Content.Client/Instruments/InstrumentSystem.cs # Content.Client/Instruments/UI/ChannelsMenu.xaml.cs # Content.Server/Instruments/InstrumentSystem.cs # Content.Shared.Database/LogType.cs # Content.Shared/CCVar/CCVars.Midi.cs # Content.Shared/Instruments/SharedInstrumentComponent.cs * Automatic changelog update * Add disambiguation to most construction menu recipe names (#38197) * Magazine rsi Cleanup + Magazine Type Recolor (#37709) # Conflicts: # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml # Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json # Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json # Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json # Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json # Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json # Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json * Automatic changelog update * Basilisk Nerfs for Gameplay (#38089) Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> * Automatic changelog update * Launchers require wielding (#38110) Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * Automatic changelog update * Fix `StomachSystem` PVS error (#38268) Fix StomachSystem PVS error # Conflicts: # Content.Server/Body/Systems/StomachSystem.cs * Add propeller hat & swirl lollipop (#38260) # Conflicts: # Resources/Prototypes/Catalog/Cargo/cargo_vending.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml # Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml * Fix rubber magaz sprite * Automatic changelog update # Conflicts: # Resources/Changelog/Changelog.yml * Cleanup chat highlighting code (#38235) * Cache regexes * Convert static LocManager to resolved * Use Any instead of Count > 0 * Use var instead of explicit types * Make _highlights readonly * Fix some popup issues with pipe layer changes (#38244) * fix: only show pipe layer popups to the user changing them * fix: don't show pipe layer subfloor popup when not using a screwdriver * fix: properly pass down user and used for serverside pipe layer changes Technically this doesn't matter as the Shared codepath for this method doesn't actually use these on the server: only the user is used for a clientside popup. Still, will be good to have these for future changes that might need them. * Make BODAs start with Russian accent. (#38275) long hand of Kremlin # Conflicts: # Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml * Fix gas analyzer and anom scanner wrong state (#38285) * Fix gas analyzer and anomaly scanner UI activation issue * save * fix comment * milkalyzer # Conflicts: # Content.Client/Atmos/UI/GasAnalyzerBoundUserInterface.cs * Fix crafting steps with modular machine parts (#38299) fixed lines that were messing with construction menu entries for machine parts * Transparent tear gas (#36440) * tweaked tear gas * changed color of tear gas * sped up metabolism rate of tear gas * sped up tear gas passing more * reduced tear gas content in grenades * added threshold for better effect end timing * removed clickable component from foams * Suggestion changes * Hide in spawn menu --------- Co-authored-by: SlamBamActionman <slambamactionman@gmail.com> # Conflicts: # Resources/Prototypes/Entities/Effects/chemistry_effects.yml # Resources/Prototypes/Reagents/narcotics.yml * Automatic changelog update # Conflicts: # Resources/Changelog/Changelog.yml * Fix visitor mindshields (#36537) * Make visitor mindshields removable, and give disaster victims mindshields. * Fix whitespace * Fix ALL the whitespace * Automatic changelog update * Rat King changed to Antag (#38124) * Changed rat king to be antag Rat King guide updated to show antag rules Initial infected given zombie faction Zombies given zombie faction too (not sure if redundant or not) * Given zombie faction to Initial Infected and Zombies in mind_roles * Changed MindRoleGhostRoleAntag to MindRoleGhostRoleSoloAntagonist removed components from antag listings * Removed changes for zombies * Update Resources/Prototypes/Roles/Antags/zombie.yml Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> * Update Resources/Prototypes/ai_factions.yml Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> * Changed mob prototype to match * Forgot solo again --------- Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> * Automatic changelog update * Fix puncturase cauterizing bleeding (#38289) fix puncturase cauterizing bleeding # Conflicts: # Content.Server/Body/Systems/BloodstreamSystem.cs * Automatic changelog update # Conflicts: # Resources/Changelog/Changelog.yml * Added monkey/kobold emergency EVA sprites & the ability for them to wear them. (#37660) * Added monkey/kobold emergency eva suit sprites, and the ability for them to wear it * Added tag, fixed indentation * Ok actually fixed the indentation this time # Conflicts: # Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml # Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json * Automatic changelog update * Zombies won't attack Initial Infected (#38128) * Added Zombie faction roles everywhere that makes sense for initial infected to be associated with Zombies. * Adding faction component to round start zombie. (not hopeful) * Removed stupid attempts and added zombie faction component to the zombie system when the player is given the ability to force themself to zombify. * Changed use of "zombie" for ProtoId<NpcFactionPrototype> * Update Content.Server/Zombies/ZombieSystem.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Server/Zombies/ZombieSystem.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Removed faction component from ZombieOutbreak event. Shouldn't cause problems with the event as II gets component with their ability to self zombify. --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Added warden's uniforms to their dresser. (#38283) * Added warden's uniforms to their dresser. Signed-off-by: Nox38 <nebulousnox38@gmail.com> * Added warden's guitar Signed-off-by: Nox38 <nebulousnox38@gmail.com> * Removed armored coats and guitar from warden dresser. Signed-off-by: Nox38 <nebulousnox38@gmail.com> --------- Signed-off-by: Nox38 <nebulousnox38@gmail.com> * Automatic changelog update * Add corgium (#37951) * Add corgi essence * Adjust spacing concerns * Renamed 'corgi essence' to 'corgium' based on maintainer discussion # Conflicts: # Resources/Prototypes/Reagents/fun.yml * Automatic changelog update * Add smart corgi prototype (#36664) * Add smart corgi prototype * 1984 - exploded dog names * Tag fixes * exploded anomalyhost tag * Demolish the mysterious corgi flesh-pocket * Review changes: yml convention tweaks and reparenting of Corgi and Smart Corgi to new abstract base * new week, new review, new me # Conflicts: # Resources/Prototypes/Body/Parts/animal.yml # Resources/Prototypes/Entities/Mobs/NPCs/animals.yml * Add pet bag - wearable backpack for pets (#37440) * Add pet bag * Trailing whitespace moment * make the linter happy * Fix trailing whitespace concern. * Fix Construction component oopsy-daisy * yml guideline moment * remove weird extra whitespace * make the maintainer happy * Adjusted bag visuals based on feedback * Allow the fox aghost admin to use pet bags # Conflicts: # Resources/Prototypes/Entities/Clothing/Back/specific.yml # Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml # Resources/Prototypes/InventoryTemplates/diona_inventory_template.yml # Resources/Prototypes/InventoryTemplates/human_inventory_template.yml * Automatic changelog update * Fix for holoparasite's ability to attack the host through mech (#36659) # Conflicts: # Content.Shared/Guardian/GuardianCreatorDoAfterEvent.cs # Content.Shared/Mech/EntitySystems/SharedMechSystem.cs * Automatic changelog update * Retractable items system + Arm Blade action (#38150) # Conflicts: # Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml * Automatic changelog update * Give Syndie-Cats Syndie Access (#38318) * Update animals.yml * Update animals.yml * Automatic changelog update * Ensure large entities don't get stuck on conveyor belt corners (#37466) * Initial commit * Also avoid the friction change doesn't make turned-off conveyor belts continue going * Ensurecomp on conveyor starting * i give up * Minor brackets edit * Documentation * Automatic changelog update * Randomized Markings (#34765) randomized markings * Automatic changelog update # Conflicts: # Resources/Changelog/Changelog.yml * Add hints towards flash protection to all items which provide it (#37267) * Update welding.yml * Update FlashSystem.cs Add subscriber event for flash immunity examine text * Create flash-immunity-component.ftl * Removed changed description text * change to use entity version * fixed mistake * Revert "Randomized Markings" (#38345) * Add group for loadouts (#36951) Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> # Conflicts: # Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs # Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml.cs # Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml * Automatic changelog update * Commands for adding and removing actions (#38317) # Conflicts: # Content.Shared/Actions/SharedActionsSystem.cs * Trinkets to loadout * Automatic changelog update * Fix Smart Corgis not being targeted by hostile faction entities (#38349) * Automatic changelog update * Cleanup duplicate dependency in `AddActionCommand` (#38360) Cleanup duplicate dependency in AddActionCommand * Gun Inhand Sprite Fixes (#38294) * cobra, viper, pulse pistol * c20 and wt550 * l6 + attributions * Thieves can innately pickpocket - thieving gloves rework (#38123) * Thieves can innately pickpocket (Reserve-Station#107) Pickpocketing a skyrim guard's armor off (cherry picked from commit 21b9f1ddb251ea3c7c6803e78871abefcaecbfb4) * this isnt moff * Make predicted, cleanup * !skating-basketball * orks are NOT the best trollface * Implement much more sensible component replication prevention --------- Co-authored-by: DuckManZach <144298822+duckmanzach@users.noreply.github.com> # Conflicts: # Content.Shared/Strip/Components/ThievingComponent.cs # Content.Shared/Strip/ThievingSystem.cs # Resources/Prototypes/Alerts/alerts.yml # Resources/Prototypes/Catalog/uplink_catalog.yml # Resources/Prototypes/GameRules/subgamemodes.yml # Resources/Prototypes/Roles/Antags/thief.yml * Fix trinket dupe * Automatic changelog update * Objectives that do not fit requirements are now deleted (#38365) * Fix * Update Content.Server/Objectives/ObjectivesSystem.cs Thanks Tayrathn! Co-authored-by: Tayrtahn <tayrtahn@gmail.com> --------- Co-authored-by: Tayrtahn <tayrtahn@gmail.com> * predicted hyposprays (#38046) * G O I D A * how * now proper * a * Update HypospraySystem.cs * good catch * Apply suggestions from code review --------- Co-authored-by: ScarKy0 <scarky0@onet.eu> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> # Conflicts: # Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs # Content.Shared/Chemistry/EntitySystems/SharedHypospraySystem.cs * Fixes * Spider web visuals update (#38175) * web update * Update Resources/Prototypes/Entities/Structures/spider_web.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Prototypes/Entities/Structures/spider_web.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * review --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> # Conflicts: # Content.Shared/Spider/SharedSpiderSystem.cs # Content.Shared/Spider/SpiderWebVisualsComponent.cs # Resources/Prototypes/Entities/Objects/Misc/spider_web.yml * fix: no longer accidentally rotate held items (#38331) Signed-off-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com> * Fix SharedActionSystem spamming errors (#38358) * Fixed mis-labeled component filter (#38383) * Automatic changelog update # Conflicts: # Resources/Changelog/Changelog.yml * Fix adjacent north/south cable terminals breaking east/west HV cable (#38377) * Fix some crafting menu oddities (#38372) * Automatic changelog update * Command resolve and LEC conversion batch 3 (#38378) * I'm just a silly goober * requested changes * Update Content.Server/Interaction/TilePryCommand.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> # Conflicts: # Resources/Locale/en-US/game-ticking/forcemap-command.ftl * Increased Borg Density (Drag Speeds) (#38232) Raised borg drag speeds * Automatic changelog update # Conflicts: # Resources/Changelog/Changelog.yml * Thief objectives now verify animal stealing objectives if they actually exist (#38332) * Holy shit it's real. Theres actually animals in this joint * WHITESPACE SPOTTD KILL KILL KILL * Accidentally did a bad yaml oopsie * Apply suggestions from code review * when the stars kiss the sky * Apply suggestions from code review --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * fix: erase expedition disks when their map is deleted (#38322) * fix: erase expedition disks when their map is deleted * fix: include paused entities in disk query, add dirty * Scale down 4k parallax textures (#38390) * Scale down 4k textures, add false preload to new parallaxes * Add filter effect, also make sure the preload yml actually has the correct name... # Conflicts: # Resources/Prototypes/Parallaxes/exo.yml # Resources/Textures/Parallaxes/XenoParallaxNeb.png # Resources/Textures/Parallaxes/space_map3.png * Add directionality to cable terminal port nodes (#38394) * Command resolve mega pr 6 (#38398) commit progress # Conflicts: # Content.Server/Administration/Commands/PardonCommand.cs * Command resolve killing and LEC conversions batch 2 (#38367) commit progress # Conflicts: # Resources/Locale/en-US/movement/eye.ftl # Resources/Locale/en-US/radiation/radiation-command.ftl * Command resolve killing, LEC conversions, and general cleanup. (#38338) * i'm just gonna put this here. * I'm just gonna do it. * Update ShowHTNCommand.cs * I feel dumb. * may as well with this too. * this does in fact not work * :/ # Conflicts: # Content.Client/Decals/ToggleDecalCommand.cs * fix polymorph errors (#38409) fix polymorph error * Command resolve mega pr batch 5 (#38389) * commit progress * requested changes # Conflicts: # Content.Server/Administration/Commands/SetMindCommand.cs # Resources/Locale/en-US/administration/commands/call-shuttle-command.ftl # Resources/Locale/en-US/administration/commands/set-admin-ooc-command.ftl # Resources/Locale/en-US/administration/commands/set-mind-command.ftl * Convert `AtmosphereSystem` sound path strings to `SoundSpecifier`s (#38403) * Convert AtmosphereSystem sound path strings to SoundSpecifiers * Convert to SoundCollections # Conflicts: # Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs # Resources/Prototypes/SoundCollections/atmospherics.yml * fix: deglitchify drowsiness effect on macOS (#37817) * Command resolves (#38415) touchups # Conflicts: # Content.Server/Radiation/Systems/RadiationSystem.Debug.cs * show reflection prob on examine (#38199) * goaaaaaaaal * hmmmmmmmmmm... sorry aeshus, but thats sucks * adwaswa * reviev * awdasdws * redo * should work * mistake * change Co-authored-by: Tayrtahn Tayrtahn@users.noreply.github.com * Update Resources/Locale/en-US/reflect/reflect-component.ftl --------- Co-authored-by: Tayrtahn <tayrtahn@gmail.com> * Automatic changelog update # Conflicts: # Resources/Changelog/Changelog.yml * Fixed vapes unintentionally dealing all burn damage types (#38423) Fixed vapes dealing all burn damage types * Automatic changelog update * Remove `SalvageShuttleCircuitboardStealObjective` from the objective group (#38428) So this was causing vulture to fail to round start because it could not find the prototype... this is being migrated into null anyway so no point in it being here * Cleanup static `Logger` use in `ChatBox` (#38405) Convert static logger to resolved, resolve entman # Conflicts: # Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs * chore: Automatically update REUSE headers * Remove obsolete rubber png * chore: Automatically update REUSE headers * Prototypes fixes * ZombieTag removal * Remove actions from maps * Fix CrateVendingMachineRestockClothes price * Goob chameleon outfits * Fix CERocketLauncherObjective * Remove Loc names from entities prototypes * Fix ChangelingTest * db migration * db migration * Fix upstream --------- Signed-off-by: Nox38 <nebulousnox38@gmail.com> Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> Signed-off-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com> Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: Ciarán Walsh <github@ciaranwal.sh> Co-authored-by: beck-thompson <beck314159@hotmail.com> Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: BombasterDS <deniskaporoshok@gmail.com> Co-authored-by: Krunklehorn <42424291+Krunklehorn@users.noreply.github.com> Co-authored-by: Manuel Gusmão <manuel.mplg@gmail.com> Co-authored-by: JpegOfAFrog <196725584+JpegOfAFrog@users.noreply.github.com> Co-authored-by: GuyThatFawkes <212874941+GuyThatFawkes@users.noreply.github.com> Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Co-authored-by: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com> Co-authored-by: TheFlyingSentry <170261226+TheFlyingSentry@users.noreply.github.com> Co-authored-by: TheFlyingSentry <Daniel.l.Elledge@gmail.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Co-authored-by: vitopigno <103512727+VitusVeit@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: ScarKy0 <scarky0@onet.eu> Co-authored-by: Funce <funce.973@gmail.com> Co-authored-by: Spanky <scott@wearejacob.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Orsoniks <orsoniksstuff@gmail.com> Co-authored-by: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: Gentleman-Bird <dcgreen406@gmail.com> Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Co-authored-by: RedBookcase <crazykid1590@gmail.com> Co-authored-by: RedBookcase <Usualmoves@gmail.com> Co-authored-by: Xeri Marai <8867601+Xeri7@users.noreply.github.com> Co-authored-by: themias <89101928+themias@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: Samuka-C <47865393+Samuka-C@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: Minemoder5000 <minemoder50000@gmail.com> Co-authored-by: jkwookee <157201244+jkwookee@users.noreply.github.com> Co-authored-by: Spanky <180730777+spanky-spanky@users.noreply.github.com> Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com> Co-authored-by: hoshizora <willhornbeck12@gmail.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com> Co-authored-by: Nox <nebulousnox38@gmail.com> Co-authored-by: Archee <archee3@hotmail.co.uk> Co-authored-by: pathetic meowmeow <uhhadd@gmail.com> Co-authored-by: Disp-Dev <91643998+Disp-Dev@users.noreply.github.com> Co-authored-by: DispenserDev <mariousjoaquin@gmail.com> Co-authored-by: cnv41 <cnv41g@gmail.com> Co-authored-by: nabegator <stunprod228@outlook.com> Co-authored-by: qrwas <aleksandr.vernigora93@gmail.com> Co-authored-by: qwerltaz <69696513+qwerltaz@users.noreply.github.com> Co-authored-by: Prole <172158352+Prole0@users.noreply.github.com> Co-authored-by: eoineoineoin <helloworld@eoinrul.es> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: Seam_Less <kai.julian.watson@gmail.com> Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> Co-authored-by: kosticia <kosticia46@gmail.com> Co-authored-by: Nikovnik <116634167+nkokic@users.noreply.github.com> Co-authored-by: SlamBamActionman <slambamactionman@gmail.com> Co-authored-by: M1tht1c <mytht1c@proton.me> Co-authored-by: SyaoranFox <99053675+SyaoranFox@users.noreply.github.com> Co-authored-by: Kittygyat <202250949+Kittygyat@users.noreply.github.com> Co-authored-by: Sparlight <twiksparlight@gmail.com> Co-authored-by: nikitosych <boriszyn@gmail.com> Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Co-authored-by: beck <163376292+widgetbeck@users.noreply.github.com> Co-authored-by: Helix-ctrl <kylemccann08@gmail.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: DuckManZach <144298822+duckmanzach@users.noreply.github.com> Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com> Co-authored-by: Citrea <citrea.lingua@gmx.net> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: TheFlyingSentry <AFlyingSentry@gmail.com> Co-authored-by: Myra <vasilis@pikachu.systems> Co-authored-by: BombasterDS2 <shvalovdenis.workmail@gmail.com> Co-authored-by: GoobBot <uristmchands@proton.me>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
test