[pull] upstream from space-wizards:master #1023
Open
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
i hate solutions i hate solutions Co-authored-by: Princess Cheeseballs <[email protected]>
…nt. (#42026) Change "mafioso" (singular) to "mafiosi" (plural)
* Fix spreaders not re-spreading on deletion * Rename another variable for clarity
* Initial change to fix minimums * Switch to clamp for setting min
add botany tools to marathon Co-authored-by: Jessica M <[email protected]>
Fix audio loading issues
Markup text was erroneously being appended via AddText().
* Use singular form for greytider in Italian accent * Use "curva" for "greytide" instead of "curvisti" in Italian accent
* Creates TemperatureDamageThresholdsComponent * Obsolete TemperatureComponent fields * Use TemperatureDamageThresholdsComponent Moves all the uses of the relocated TemperatureComponent fields to use the TDTC versions * Removes the obsolete TemperatureComponent fields * Update YAML definitions * Update doc comments * Split TemperatureSystem Creates TemperatureDamageSystem and moves the damage handling from TemperatureSystem * Cull unused using statements * Use component-based damage tick scheduling * Fix temperature damage processing Check was inverted resulting in things never starting to take temperature damage * Poke tests * Add TemperatureDamageThresholds to new prototypes * Move TemperatureDamageThresholdsComponent to Shared Parity with TemperatureComponent * While I'm here Fixes warning regarding obsolete ProtoId validator attribute * Fix YAML errors * Fix merge errors * Rename TemperatureDamageThresholdsComponent -> TemperatureDamageComponent * Use ContentHelpers.RoundToLevels for temperature alerts * Fix YML * A fuckton of cleanup * working cleanup * fix * misc additions --------- Co-authored-by: Princess Cheeseballs <[email protected]> Co-authored-by: ArtisticRoomba <[email protected]>
[HOTFIX] Fix MMI mind transfer (#41941) Co-authored-by: ScarKy0 <[email protected]>
Would show player's real identity instead of assumed identity Co-authored-by: TVK-04 <>
Update dotnet sdk from 9 to 10 in shell.nix
* Added Jet Injectors * Small fixes * YML Linter fix * Requested Adjustments * Better Sprites for the Jet Injector * Actually forgor to give credit * Fix merge conflicts and refactor * Undo Oversight * Introduction of Advanced Jet Injectors * minor oversight * Adhere to requests * Remove Loadout, add Lockers * harder better faster stronger * vend shortage * Sound effect * will this work or do I just gotta choose one at random??? * alright fine I'll do it this way * quiet the hissing, raise the pitch * Merge new sprites --------- Co-authored-by: Princess Cheeseballs <[email protected]>
* delete metabolismmovespeedmodifiersystem * Revert "delete metabolismmovespeedmodifiersystem" This reverts commit 19572fa. * delete metabolismmovespeedmodifiersystem and component --------- Co-authored-by: Princess Cheeseballs <[email protected]>
* Add antag control for the space ninja * Remove whitespace --------- Co-authored-by: beck-thompson <[email protected]>
…nInit. (#42122) * Refactor OnIFFShow and OnInitIFFConsole by extracting AddAllSupportedIFFFlags method. Fix possible addition of unallowed flags. Fix posible addition of unallowed flags in OnInitIFFConsole by performing AllowedFlags check in the extracted function. * Add documentation to HideOnInit * Update IFFConsoleComponent.cs --------- Co-authored-by: SlamBamActionman <[email protected]>
* removes extended survival box, but adds most contents into the ninja's satchel * major essential bugfix
* no restock time * add timer
* Ammonia restores Rat King Bloodlevel Adds a saline effect to ammonia for creatures with the rat metabolizer type condition (aka, rat kings) * error fix code did not like amount under condition so fixing that, and restoring amount to 1 to be identical to how it was working in the video. amount 6 was comical levels of blood restoration
move detective stamp down 2 pixels
* Buttons and basic internal data * The buttons DO something * it works?!! * I hate predictions * 5000 monkeys on typewritters * who let the monkeys code? * Localizations * waiter, more commits please * Not going insane (this is a lie) * last one I SWEAR * Some improvements ported from Moff * clean it up a little * one more cleanup * The chemmaster is not a mime * Fix my mistakes + address the other review * Point to what chemmaster is broken, and why it's broken * ChemMasterComponent changes * Margin for packaging source --------- Co-authored-by: Princess Cheeseballs <[email protected]>
* toolshed :) * Yeah they call me the gamer * Fix test fails * refactor: extract method ZeroAsNull --------- Co-authored-by: Princess Cheeseballs <[email protected]> Co-authored-by: pa.pecherskij <[email protected]>
Move module remove button to the left side Co-authored-by: Jessica M <[email protected]>
* Fix warnings * Update Content.Server/Medical/DefibrillatorSystem.cs * Update Content.Server/Medical/DefibrillatorSystem.cs --------- Co-authored-by: slarticodefast <[email protected]>
Make paper extinguishable with fire extinguisher
* Does not build do not PR * using blah blah blah rider hates me --------- Co-authored-by: Princess Cheeseballs <[email protected]>
* Ninjas now recieve a custom satchel * Original Size * Requested Changes + Making bag silent * Add code comment
Add broken FTL links
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )