Upstream sync #412
Merged
Upstream sync #412
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
Co-authored-by: metalgearsloth <[email protected]>
Checks if its own fixture is hard so the fly-by fixture can't also proc it.
* inital2 * raemove break
shader cleanup - applies DRY to various shaders in the game
make rouney rotateable
* glowy lights - makes light fixtures actually physically glow when active * serviced the lights * ya sure
…l blindness (#23212) * blindness rework - damaged eyes now simulate legal blindness * hEY THATS FOR DEMONSTRATION PURPOSES ONLY AAA * attributions * makes eyeclosecomponent adminbus compatible * useshader(null)
* update cvars * vote 1984 * rip * add custom reason * make panic_bunker.enabled a server cvar I am kind of guessing --------- Co-authored-by: DrSmugleaf <[email protected]>
skullie contrast
add thingy to lathe
* refueling lit welder explosion fix * add DamgeOnToolInteract to wall dispenser
* monk * meta
gauzerecolor
nerfs service lights because they are bRIGHT
* pry * Update Resources/Prototypes/Entities/Mobs/Player/terminator.yml --------- Co-authored-by: Nemanja <[email protected]>
* comit1 * comit2 * comit 3 * Update Content.Server/VendingMachines/VendingMachineSystem.cs --------- Co-authored-by: Nemanja <[email protected]>
ports /tg/ airlock deny sounds
* action commands * atmos debug commands * comming * credits command * debug commands * usage * usings * debug pathfinding command * grouping entity menu command * hide mechanisms command * commit * mapping client side setup command * open ahelp command * set menu visibility command * commit * show mechanisms command * toggle health overlay command * toggle outline command * stage * disable once * ioc * namespaces * WriteError * clean up command usage * don't abbriviate * ActionsCommands * AtmosDebugCommands * the rest * oops * undo
* Gauzelathe * latherecipe
* Replace EntityUid parsing with NetEntity * fix * Other changes required for arch * And anothher
* fixes major blindness issues like blindness not scaling with render res * HEY. get outta there
Maybe fixes void if there's exceptions, idk
* Match solution names * Y TEST FAIL? * 2am fix it tomorrow if it doesn't work now
SS14-1148 Fix MIDI Loading Failing Whilst a MIDI is playing The behaviour of the button event handling did some wonky async handling that got PJB swearing repeatedly in the contributor VC. Improve switching MIDI songs by: 0. Add a bool that tracks if we're currently waiting for the MIDI file browser to terminate. Use this bool to short-circuit the MidiFileButtonOnPressed function, ensuring you don't have to close a morbillion file windows if you spam-clicked the button or forgot you'd opened the window. 1. Remove a four-year-old hack involving waiting 100ms to load a MIDI after trying to stop the last MIDI, because _the rot consumes_ or some shit
…3496) cleans up a bunch of RandomSpriteComponent yaml entries
* Changes required for frozen event bus PR * Fix RoundEndTest
* Generic offering window * More work * weh * Parity * Progression meter * magnet * rona * PG asteroid work * code red * Asteroid spawnings * clams * a * Marker fixes * More fixes * Workings of biome asteroids * A * Fix this loading code * a * Fix masking * weh * Fixes * Magnet claiming * toe * petogue * magnet * Bunch of fixes * Fix default * Fixes * asteroids * Fix offerings * Localisation and a bunch of fixes * a * Fixes * Preliminary draft * Announcement fixes * Fixes and bump spawn rate * Fix asteroid spawns and UI * More fixes * Expeditions fix * fix * Gravity * Fix announcement rounding * a * Offset tweak * sus * jankass * Fix merge
* Add clown emergency oxygen tank * increase pressure and volume slightly due to less o2 percentage
* Small adjustment for elookup api * fix
* Add RoomFill markers * weh * Also deez * Working * Randomised fills working * Fixes * Fix lack of prototypes * Fix tests * Fix tests?
* moved ComputerBoardComponent to Content.Shared * made flatpacker accept computer boards * made flatpack system and ui function with computer boards * fixed it so that flatpacks of computers are correctly coloured to fit their computer board colour * unhardcoded the computer flatpack assembly cost * Combined GetFlatpackCreationCost(...) with GetflatpackCreationCostForComputer(...) * removed code duplication in SharedFlatpackSystem * removed code duplication from FlatpackCreatorMenu.xaml.cs * remove code duplication from FlatpackSystem (on the server) * fixed indentation error
* Implement cvar * Enable cvar on Wizden
* Aghost Now Can Drop Things Wherever They Want * update admin CL * Update Resources/Changelog/Admin.yml * Update Resources/Prototypes/tags.yml * Update Resources/Prototypes/tags.yml --------- Co-authored-by: metalgearsloth <[email protected]>
* teddy tesla * Update Resources/Prototypes/Entities/Objects/Fun/toys.yml --------- Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
* backspikes added * added backspikes to meta.json * fixed capitalization * fix attempt 2 * suffering * Revert "suffering" This reverts commit d9ee23ccd209e8de5b190668f3b795088e8ab139. * Balance is restored * Revert "Balance is restored" This reverts commit fa9b8168d461f8d5e92f2bbd1e1dd1417972ea05. * Revert "Revert "Balance is restored"" This reverts commit f0a809f258973e0605311250d969e0600a970ebc.
Update trashbag.yml Changed down to a reasonable amount.
cheaplasma Co-authored-by: metalgearsloth <[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.
No description provided.