Upstream sync #518
Merged
Upstream sync #518
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
* Allow surgery tools in medbelt * add lil more changes
…955) * Added new Buy & Sell specific cargo pallets * Remapped trading outpost with new pallets, tweaked texture * Removed debug message * Fixed/Compacted conditional checking to let old pallets still work for backwards compatability * Update Content.Server/Cargo/Components/CargoPalletComponent.cs Alright, updating all the references to it. Co-authored-by: Tayrtahn <[email protected]> * Changed textures, changed to enum instead of string for pallet type check * Few minor code tweaks/formatting fixes * Missed the prototype change * Update Content.Server/Cargo/Components/CargoPalletComponent.cs * Update Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs --------- Co-authored-by: Tayrtahn <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
* Fix some tags * oop
Typo in pressure that will kill someone.
* inital * 2-9 * add crafting function, rename ied to fire bomb * add firebomb ignition * fikss * change damage values * add note * fix tests i think * ok * good * Review * warning --------- Co-authored-by: metalgearsloth <[email protected]>
* Throttle people trying to connect to a full server. To reduce spam/load on the server and connection logs table. Players are forced to wait 30 seconds after getting denied for "server full", before they can try connecting again. This code is an absolute nightmare mess. I tried to re-use the existing code for the redial timer but god everything here sucks so much. Requires space-wizards/RobustToolbox#4487 * Use new NetDisconnectMessage API instead. * Add admin.bypass_max_players CVar. Just something to help with debugging the player cap on dev, I don't expect this to ever be disabled on real servers.
* Split smoke grenade sound into two parts and converted to mono * Restore old sound for admin trigger effect
Previously the C-20r magazines were only available for nukies to purchase, but regular syndicate agents could purchase the actual C-20r bundle to get the gun. This strikes me an inconsistent.
* Sort agents by completed objectives * Use StringBuilder
* Make radio jammer block suit sensors * Fix stupid Use CancellableEventArgs instead of doing what the hell I was doing before. * Address Reviews. Change the event from a CancellableEntityEventArgs to a ByRefEvent.
Co-authored-by: metalgearsloth <[email protected]>
* Initial commit * Fixed short circuiting * Use DebugTools * Use Entity<TComp> more, and make them nullable * Bring these two together
* carp plushie textures * add the plushies * add plushies to spawners * rainbow carp and make special plushies rarer --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* Removed obsolete MapManager calls * More code cleanup * EnsureComp * Rerun tests
* cheap sunglasses * Update glasses.yml * Update Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml * Fix price --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
People will do anything but add uniform dying.
* add color field to clothing layers * add support to randomsprite * bababa * finalize spriting work * add to game * fix * remove space * edit patelle, +1 decor variant * added only pants, some sprite fix * inflation * fix mixed * not tested commit * Revert "not tested commit" This reverts commit 4a904df3452263e87c9cb819ab5d8cf411ebe468. * naked human is fun * update * add new style * some sprite pixel tweak * Update meta.json
Prevent dead users from turning their bar stools Previously, players could always turn a bar stool or office chair they were buckled into; even while stone cold dead!
* Red Neck Gaiter * Minor Meta Mistake
* Fix tranq rounds injecting when reflected * Cleanup using directives * Remove FixtureId from component
* eepy stasis bed * Make healing 100x worse because it's funny --------- Co-authored-by: Plykiya <[email protected]>
Co-authored-by: deltanedas <@deltanedas:kde.org>
…26161) Don't do Trim 2 times
* SS14-17183 Nerf vending machines Vending machines provide too much food (and drink) at the moment to the crew, robbing the chef/bartender of a reason to exist, and robbing the janitor of a reason to want to refil vending machines early in the round. This PR adds a new "initialStockQuality" field to vending machines and sets it at 0.33 for almost all food and drink vendors. The intent at the moment is to drop food and drink vending machine stocks by somewhere around a half - two thirds of the time, about two-thirds of the stock of a given item will be missing. This number can be tuned to discourage people relying on vending machines and make round start a bit more variable when hunting noms. * Add comment to InitialStockQuality. * Update Content.Shared/VendingMachines/VendingMachineComponent.cs --------- Co-authored-by: Nemanja <[email protected]>
* Round start Ion storms * five * Update Resources/Prototypes/GameRules/events.yml --------- Co-authored-by: Plykiya <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
* Fixes target hand check when no hands were needed. * Adds missing CanStripX checks. * Whitespace. * Fixed bad math causing instant strips.
pro Co-authored-by: deltanedas <@deltanedas:kde.org>
Fix anomaly decay logs (#26122)
* inital * Update animals.yml
the old seal of the detective on paper has been changed to a new one
…ps (#26193) Co-authored-by: Jeff <[email protected]>
Co-authored-by: PJBot <[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.