Catch-Up Cherry Pick 2 #944
Open
+57,700
−32,461
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
* Fix all activatable bugs Apparently this was a load-bearing nullable enum. * build (cherry picked from commit 74041cf66fc73326ce75b5e9ffd498567f68fbcc)
The Honored Quran (cherry picked from commit 34ab1e760d5999212fc4590ea729fd2748cb6020)
* Resprites the captain's antique laser pistol * Adds artist credit * Improves icon outline and shading * Replaces new sprites with something more resembling the in-game version (cherry picked from commit 8869fc3bb24f904b507b9c116b727fceceb7c141)
Initial commit (cherry picked from commit 2cb421bc430cfeff2e1669880f15c834533fd282)
TOO MANY DAMN SYNDIES Co-authored-by: Plykiya <[email protected]> (cherry picked from commit be09520aa578478c153c0de33a39d80830660676)
* try * pipupi * Update ClientClothingSystem.cs * Update vox.yml * Update ClientClothingSystem.cs (cherry picked from commit f079e77554c326b89fb5f24d64b5947dbfc93126)
* Change emag recipes to print mags instead of single ammo * Get rid of useless single ammo printing recipes * Add in submachine gun mags * missing magazine shotgun beanbag in nonlethal research * Sort lathes that use ammo crafting recipes alphabetically --------- Co-authored-by: Plykiya <[email protected]> (cherry picked from commit a478446e5a11fa73935aaf0d4d6863e8b4bdd77a)
* sys * item * ahm. * Update Content.Server/Power/Components/ChargerComponent.cs --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit a7ad59f6babb3df03859a4550223b93ef6e65a34)
* Fix handlabeler/utility belt misprediction * Partly moved HandLabelerSystem to shared And cleaned up HandLabelerComponent * WIP format the files so later commits look clearer Doesn't change individual code lines, but may move functions to another file * WIP some more code movement * Hand Labeler is now mostly predicted Only the UI isn't * WIP: Formatting and moved stuff * Using componentstates for prediction correction * review * Update label on label change * Don't overwrite label while editing --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: ElectroJr <[email protected]> (cherry picked from commit a4504e2fefbead6b21a19f93a43148d6a9e6ebab)
IDK (cherry picked from commit d66ad739ee89ea6a73176d0c3b9f108b4eb94445)
(cherry picked from commit 72f790844f7684dbcd0c3f6f38d4feeb05467d5f)
* added bar specs * specs in boozeomat * added jigger in bartender guide * fixed ice bucket * cdn --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit f5aa5f1f22cf255beae398e349e567d466567e40)
* A beer can and a wine can * fix wrong file locations --------- Signed-off-by: c4llv07e <[email protected]> Co-authored-by: c4llv07e <[email protected]> Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit f5b8b5fbdcb4675cd29d15e2cd4112e587b03034)
* Added localization of groups and types: damage, metabolism (displayed in the guide book). The text for the health analyzer, weapon damage inspection is now taken from damage prototypes * fix damage tests * fix damage test yml * fix damage test prototypes * Update Content.Shared/Damage/Prototypes/DamageGroupPrototype.cs * Update Content.Shared/Damage/Prototypes/DamageTypePrototype.cs --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 3fcbbc0732819e8dcaed1cb6d0d49538c8c13c1f)
* Create Medal tag and assign tag to medals * Update Resources/Prototypes/tags.yml --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 9f747485e9b9aaab313f59ea15f33533d98b993e)
actual actual locker construction fix (cherry picked from commit 783d3a9aa821b91cb3c1de45efc10ebdb6c54054)
* Reverts Exterminator * Includes commented out parts + sprites * Readd stuff, comment out yaml * Popup ads * review --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit f544c9129870e9c34903cc8f76fdd6b3f1d463a5)
* moved from 9 sheets of glass to 5 sheets of glass for all circuit recipes * Revert "moved from 9 sheets of glass to 5 sheets of glass for all circuit recipes" This reverts commit 45bb8d40150cddbbe005f5d66d34532b79143f98. * adresses merge conflict * fixed error * parents base computer board to base machine board * Revert "parents base computer board to base machine board" This reverts commit dec3a799a90b4a0cb121b6694ecf65d9a0abd6a3. * other thing was causing errors, guess it's this now (cherry picked from commit fe8ad485f274a5ee09f8fd04ffdf9e055095a548)
* not done yet * i may be stupid * Update electronics.yml --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit a8c297a374366b129a9b8c2859ffcae03a38693f)
* feat(fax): Client fax file-print parses and stores label * feat(fax): Fax machines print, copy, and send paper labels * style(Fax): Comments and formatting * feat(fax): Make fax admin logging more consistent and clear * refactor(fax): Replace ternary with a simpler null coalescing * refactor(fax): Make FaxSystem Send method signature consistent with Copy, PrintFile * refactor(fax): Read entire file and process later instead of peeking first * refactor(fax): Remove local variables only used for style * style(fax): Fix some nearby style errors * fix(fax): Undo an inaccurate change to admin log formatting * refactor(fax): Separate `firstLine` variable * fix(fax): Use Environment.NewLine * bienvenidos --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit faa7f3461cec072e2023af3d1a93d647d66f4f78)
Actual fix for lockers and deconstruction Co-authored-by: Plykiya <[email protected]> (cherry picked from commit db200faf11fc6f3ed3572394c51cc8d011fcb76f)
…m Glass Shards (#26764) * Hardsuits and softsuits count as having shoes for step triggers * Add softsuit tag prototype * Change to suitEVA tag * Get rid of softsuit tag, found suitEVA tag * Full pass of ShoesRequiredStepTriggerImmune * Adds check to outerClothing for ShoesRequiredStepTriggerImmune * return * fuck Dionas * Convert to comp, space dragons immune as well * Merge conflict * Merge conflict * fix leftover tags * empty spaces * turns out the dragon didn't need it * minor optimization * Add access for system, add comp to baseShoes, check slotflags for every slot besides pockets * fix * fuck it we ball --------- Co-authored-by: Plykiya <[email protected]> Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 0efcd30ac6d58fe0a24565c3ddd102277997fbba)
Update bow.yml (cherry picked from commit 1efdf4a40a434e52a7c909e496c0675fef406ee4)
(cherry picked from commit f3e9db014194d7517bb1ae1188c71553bb49b893)
* WIP * sprites n stuff * flavour * maybe fix * add stack * fix parent (cherry picked from commit 008935f6ec6f9cd5c56e943a5ce02c1f54cec893)
(cherry picked from commit 2135cbdb23ccd73236a008512ae6d788c88f206b)
Make smile grabbable like geras Co-authored-by: Plykiya <[email protected]> (cherry picked from commit 4416a21dd529768472de7f0f76a78a5b39f39b24)
Fix doubled message Co-authored-by: Plykiya <[email protected]> (cherry picked from commit 405e020bfa1d5990b86a7dfa69d0f70711d54a0d)
…7446) innital commit (cherry picked from commit cdd900cef65cda204c34a00d7309656e10bb2d09)
(cherry picked from commit a466b35b275c48294cb465aa7c9ca50b7b4ea75f)
…/Einstein-Engines into DEATHB4DEFEAT-wizden-mass-pick-2
Merge Master Mass Pick
…/Einstein-Engines into wizden-mass-pick-2
(cherry picked from commit d0cf620a85bd14ce8bdc641f6dde1715e771879e)
* yes * fixes (cherry picked from commit 94a113dbd6a076d199591eefb7875f91e9f7c463)
Wizden mass pick 2 fix
* fix harm mode rotation * cleanup * -pi to pi (cherry picked from commit daae8253c6d89c2014e0dd5bfeb5d85393d8be77)
Fix MouseRotator on rotated grids (#29663)
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
FoxxoTrystan
requested review from
a team,
Pspritechologist and
FoxxoTrystan
and removed request for
a team
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.
Description
Picked 400 commits (and skipped many, many more) from WizDen since #540.
Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby Refactor).
TODO
Changelog
🆑