Open
Conversation
Correct Kelvin displayed on health analyzer UI, use T0C constant. (cherry picked from commit 998bf453684ed91ae5971e41be72820c87b441ef)
…908) (cherry picked from commit 24b6456735ae83dd9de53097d625f20b723c578f)
(cherry picked from commit 0a1ce9dd437f162a59c826904241bf15ad6f2838)
(cherry picked from commit 2360376b4064db390275f407fcb89190c1e78bd7)
Uncooked animal proteins is safe for animal stomachs (cherry picked from commit a49a576b031d2f90b7e127fd2b639a20bb31aaf4)
(cherry picked from commit 5d00305a2279b455a7ff5196f62050abeebc4085)
…26924) (cherry picked from commit b51482f51a67bb90f6ccc7fb355c316e200bb36d)
…6922) (cherry picked from commit 2d53cfeabcc977938f217c303ce46a79d7fe80c9)
fixes polymorph cooldowns (cherry picked from commit d4b7bc5aa328e200bb087672d00c07776f98edce)
(cherry picked from commit b08677916557f34740a9b06e09493751b0af7a82)
(cherry picked from commit eeb460fb2956381b44ead42f0d435ade11ec0ba3)
Fix pulling when already pulling The TryStopPull were failing due to wrong arguments provided. Replacing the virtual item in hand with a different pull was failing due to the hand not being cleared. Fix stop pulling checks that had the wrong variables provided. VirtualItems are already queue deleted at the end of HandleEntityRemoved. (cherry picked from commit 037a7d7d3d53a623f70a07908299e8fc4df1b4a5)
…(#26902) (cherry picked from commit 48330745147aba1ce89cdd6e7949da62dc9cbb78)
(cherry picked from commit 154b8606f9d9cc543c6b8ad422c43f563079327f)
* done * more work (cherry picked from commit 1bf97c94eecfb9b76d4e2f08765ee5e8a7472151)
(cherry picked from commit ed065e8a3dbecb688b8aef1c1d597794de1503ef)
Fixed cryostorage getting captain's record for unknown jobs. Also localized Unknown job string. (cherry picked from commit 9b97a2e05d5fe65b1d81aefcf37b69033c78f21f)
(cherry picked from commit d44db87bfb9e84fb8181d8dbd2ee250d0c6829d3)
…rd idle ai. (#26939) * Fixed Honkbot/jonkbot honking like crazy, gave honkbot/jonkbot standard idle ai. * Update Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml --------- Co-authored-by: Tayrtahn <tayrtahn@gmail.com> (cherry picked from commit 8272d7a345264e3c10a895f838b3f5f4fa6b35e1)
(cherry picked from commit ba9091ff59251f20aa3d21615d52b40cb937f01c)
…type is changed (#26935) Force cancellation of RCD constructions if the construction type is changed (cherry picked from commit 33e5e4e581a8d224cc2c44465db188ded0302e4e)
Fix standart -> standard (cherry picked from commit dc19964d84149354bb10fd186283f1a9d7da9cf5)
* Add stopsWhenEntityDead to sound components * Convert component * Review * Fix dupe sub --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> (cherry picked from commit da618d791a48efacebe441eee9398c0d1c571ec8)
(cherry picked from commit bbff00cd2af7a5f5700489b42d94c9d99bc88a52)
(cherry picked from commit 13cef85a6e7d0f5873d1f66358ef742356541582)
(cherry picked from commit cb4561fe96adacac3283e9af138fff6eb349eb9f)
* Implement changes on not-cooked branch * Made it work * Fix update appearance calls * Fix extra indents, clean-up code, fix tests hopefully * Fix hammy cagecrate * Fix messing up the yml, add artifact crate specific labels back in * Visual Studio hates yml, sad * Seperate the colors for cargonia * sorry json * make label move with artifact door * Apply suggestion changes Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * Fix remaining crate offsets, add a few for livestock and graves (why are you labeling graves) and coffin label sprites (why are you labeling coffins??) --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> (cherry picked from commit 96ad9002f1d6390bf666c74ddfd871a45a8fe1df)
…ready been handled (#25826) * Make UtensilSystem and SharpSystem not run AfterInteract if it has already been handled * merge conflicts --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> (cherry picked from commit c67948407ec9ee21c0459ca9679b6fac904aad63)
(cherry picked from commit f1d1e6c6fdf169b11e950feeac5d68f7f0aedddd)
Added two-message overload to PopupPredicted (cherry picked from commit 9107d421bdd2600883780d02d521ebbbec06ac68)
In SS13 this closet gives you THREE welding masks and THREE welders. Over here, sometimes it only contained a single mini welding tool. (cherry picked from commit 84c3d225ca4022c0a61aa494ea69692775403244)
* Added ClothingGotEquipped/ClothingGotUnequipped events * Better version * Implemented in a few places * More implementations * Add ClothingDidEquipped/ClothingDidUnequipped events (cherry picked from commit 50631f430d62fc413bc8757f8d1e1c4523417816)
cleaned pallet descriptions (cherry picked from commit e009a80a8cabe013ecd9b16e5309e15303ad010b)
…#26545) * SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers Bit of a grab-bag of cleanup of Xenoarchaeology prompted by #26480. 1. Traversal distortion biases are now "up" and "down" instead of "in" and "out". 2. Node generation has been tidied up to make it a little clearer how it works. 3. Traversal Distorters have been removed from the game along with their board. 4. Traversal distortion is now done by the artifact analyzers by default. 5. Some loc strings have been made clearer. 6. The Abnormal Artifact Manipulation tech has been made slightly cheaper. 7. The aformentioned tech is now localized as Artifact Recycling, given all it does is unlock the crusher. 8. The Xenoarchaeology guidebook entry has been given a bit of a rewrite, putting all information into one page and making sure to cover the basics that otherwise would require someone typing "Liltenhead artifact tutorial" into Youtube. * Fix references to deleted guidebook entry * Add fancy button to console because @EmoGarbage404 asked me to * migration comprete * Fixed a goober comment * maint fails to resolve conflicts: more at 11 * Resolve PR comments * Make UI nice --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> (cherry picked from commit f059714a75601c73c0b7b917d0faac35c99f96fe)
(cherry picked from commit 541e87395a3817e51b1face897713d1ce358fa2a)
Fix (cherry picked from commit 877ccd6e8f5fe8a692110b9e01762f2f90b927a2)
- added an interior exit button to the xenoarch chambers - added some extra wires in the engi outpost - moved corpsman medicine locker - gave det back their extra rubbers that somehow got deleted - fixed maints above singulo not having power - put a mass scanner on salv dock, gave them one handheld to start with - gave perma a dinnerware crate and more instruments - improved firing range (conveyors!!!)
Signed-off-by: NullWanderer <56081759+NullWanderer@users.noreply.github.com>
remove bad openables Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* lighthouse update * more update --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
# Conflicts: # Content.Client/Entry/EntryPoint.cs # Content.Shared/Humanoid/HumanoidAppearanceComponent.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Resources/Locale/en-US/markings/gauze.ftl # Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml # Resources/Prototypes/Entities/Clothing/Hands/colored.yml # Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml # Resources/Prototypes/Entities/Clothing/Head/hoods.yml # Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml # Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml # Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml # Resources/Prototypes/Roles/Antags/nukeops.yml
…eadHatHairflower on all maps cuz it now can be as neckle and as hat
* Reduce inventory of unlocked Booze-O-Mats * drinkglass 10->15 * remove excess data --------- Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
jukie, robust armory, N2 lockers
* subpatch 14 * fix pesky invalids
# Conflicts: # Resources/Maps/lighthouse.yml
# Conflicts: # Resources/Maps/pebble.yml
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
About the PR
Why / Balance
Technical details
Media
Breaking changes
Changelog