Upstream sync #582
Merged
Upstream sync #582
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
Required for space-wizards/RobustToolbox#4885 to not kill content
fix bias button for real
* Mega Antag Refactor * last minute delta save * more workshopping * more shit * ok tested this for once * okkkkk sure * generic delays for starting rules * well darn * nukies partially * ouagh * ballin' faded and smonkin wed * obliterated the diff * Spread my arms and soak up congratulations * I've got plenty of love, but nothing to show for it * but there’s too much sunlight Shining on my laptop monitor, so I Can’t see anything with any amount of clarity * ok this junk * OOK! * fubar * most of sloth's review * oh boy * eek * hell yea! * ASDFJASDJFvsakcvjkzjnhhhyh
* Fix DoAfter attempt event null error * A
* Added selectable power level to radio jammer * Cleaned up OnGetVerb * Settings are now stored in the .yml file. Simplified stuff a lot! * Minor fixes! * Small little baby fix :) * Added the power level switch to the examine menu and also removed the ftl file as it was in the incorrect location. * Minor code cleanup * Changed byte -> int * Update sprite * Fixed licence * Added power LED that changes if the jammer is on low power. * Removed tabs * Changed github link to the commit * Changed all the RemComp to RemComDeferred * Moved NetworkedComponent to shared * Changed radio jammer textures back with minor edits * Added a space because it was annoying me * Jammer now updates range for suit sensors properly! Thanks nikthechampiongr :) * Removed useless comment * Cleaned up code that updates the range of tracking devices. * Fixed client namespace and removed newline * Cleaned up ChangeLEDState and ChangeChargeLevel. * Added comments * Read only * Fixed another comment * Locked in * Made server inherit shared * Update Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs * Update Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs * review fixes --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
* 15 > 50 * update 50 >> 60
* Add command to toggle ghost visibility on the client * Fix description * Fix index of arg parsing * Allow setting GhostVisibility directly
* loadouts now have aaall the glasses * cheap sunglasses dont exist at all * empty commit to rerun tests, there's no way i fucked something up
* fix antag bugs * Update NukeopsRuleComponent.cs
…ing and bag pickup (#27234) * Upgraded UseDelay to support multiple delays per entity * Implement secondary delay for bibles. Also some improvements to make it work nicely. * Documentation is good * Reserve the previous change; now Storage uses the special ID and Bible uses the default. * .0 * Added VV support to UseDelayInfo * Serialize better * No register, just setlength
I found the echo from my own radio very annoying.
* Whitelisted Sec / Merc Webbing * Update belts.yml * Misplaced Components fixed * Trying to fix mapped fills * Update belts.yml * Update belts.yml * Removed an Empty line * Update belts.yml
Bloodloss-RatKing
* Update quiver.yml * Create quiver.yml * Update clothing.yml * Update pneumatic_cannon.yml * Update pneumatic_cannon.yml * Update pneumatic_cannon.yml * Update pneumatic_cannon.yml
* Fix UseDelay issues - Fix it not predicting properly by deep-copying the classes (realistically they should be structs). - Fix the `z` path not applying UseDelay similarly to the `e` path. * click
* Move job info changing methods for id cards to shared * Revert "Move job info changing methods for id cards to shared" This reverts commit 95cbc46b2d1934fa7bf5c72d7d3de9f9168992a1. * Reapply changes
do the easy reviews
* done * cryo tweaks * fixes error
Co-authored-by: Plykiya <[email protected]>
* Fix network configurator memory leaking Doesn't dispose this window. * Fix the other part
* Add UnwieldOverride variable that overrides unwielding inhand to enable other interactions * Give LMGs UnwieldOverride * logically inverted UnwieldOverride to UnwieldOnUse * fixed typo
* added chopstick sprites * Create chopsticks.yml * added chopstick yml * hopfully it acts like a forke * added chopsticks to dinnerware vendor * uncapitalized the name * Update Resources/Prototypes/Entities/Objects/Misc/chopsticks.yml Co-authored-by: lzk <[email protected]> * made the chopsticks icon a reasonable size * added chopsticks to chang vendor * made paired chopsticks you can break apart * added them to vendors --------- Co-authored-by: redfire1331 <[email protected]> Co-authored-by: lzk <[email protected]>
* Added keybind for scoreboard, starting work * Fixed the window appearing * Added loc text * Updated namespace for ScoreboardUIController.cs * Switched to UISystemDependency "- UIControllers can use [Dependency] as normal for IoC services and other controllers, but must use [UISystemDependency] for entity systems, which may be null as controllers exist before entity systems do." Jezithyr — 10/12/2022 1:20 PM * Reverted back to functional state * Replace with UISystemDependency * Move RoundEndSummaryWindow to ScoreboardUIController * Convert to EntitySystem * Clean up command bind * Move to RoundEnd directory * Remove Nukeops rule when no nukies * Cleanup * Change to toggle hotkey * Cleanup * Revert "Remove Nukeops rule when no nukies" This reverts commit 5d4bbca09f45110b24a674d59b505be87b602b67. * Cleanup * Make the Toggle hotkey work in lobby * Fix error --------- Co-authored-by: SlamBamActionman <[email protected]> Co-authored-by: ShadowCommander <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
…key with a verb (#25982) * inital * Update animals.yml * Update animals.yml * Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs Co-authored-by: Tayrtahn <[email protected]> * Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs Co-authored-by: Tayrtahn <[email protected]> * Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs Co-authored-by: Tayrtahn <[email protected]> * Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs Co-authored-by: Tayrtahn <[email protected]> * Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs Co-authored-by: Tayrtahn <[email protected]> * selecting different role will change the description and name * fix name * gargh * the review Hello * e --------- Co-authored-by: Tayrtahn <[email protected]>
* first draft loooong hair * *added the old dress item *added old dress to the theatrical performances create * updated spooky long hair name * fixed an oopsie made when updating item names
Add more character slots
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.