Upstream sync #688
Merged
Upstream sync #688
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
Rotating Fire Axe 45 deg
Nuke biomchem again
- Avoids adding pending objects we can never show so the list should fill much faster.
"Fixes a minor typo in the gingerbread bodypart prototype"
No more.
…9761) Added cryosleep UnitSpawner and UnitSpawnerLate Co-authored-by: JIP <[email protected]>
Co-authored-by: PJBot <[email protected]>
* Fixed! * That could have been bad this is why I'm glad I check the diff xD
* Add supplybot moving states * forgor
* Intercom buffs and fixes * remove unused bui state * mild sec intercom buff * reinforce sec intercoms
* Shaking and Stirring * Remove shake message * Switch if order a bit * Add doafter supprot for reactionmixer * Fix nullability * Timespan zero * Forgot to remove loc string * Reorganize usings * Remove unneeded usings, fix b52 needing to be shaken
* added utensil component * BaseSword added
…#29322) * fix(hardsuits): Give the carp hardsuit suit storage * Both carpsuits have suit slots
* metal foam grenades * wow okay * meh * bruh * test * push
* The real AME nerf * oh the real change * Update AmeNodeGroup.cs
* Removes max damage threshold for hyperzine * the description... --------- Co-authored-by: plykiya <[email protected]>
* Silence ringtones on invisible PDAs * Revert "Silence ringtones on invisible PDAs" This reverts commit afc1041f31eebe82e83630a856a8856b877a9826. * Literally just this * Add an admin announcement for news article publishing
* Fix colornetwork description * suggested changes * forgor * done * ok now it IS done
* made the guitars be able to be worn on suitstorage * minor fix
Fix borg popup spam Co-authored-by: Winkarst-cpu <[email protected]>
* Update StealConditionSystem.cs * Update StealConditionSystem.cs
replaced two characters with ones that actually show up ingame
* Add scarf to warm clothing bounty * Added ClothingScarfBase prototype and assigned to all of the scarves
…'t be edited by cybersun pens (#28972) * Add option to adminfax for locking papers. * Replace dummy control with margin
* books bag tabletop * Update Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml --------- Co-authored-by: metalgearsloth <[email protected]>
* First commit * Removed pause stuff * Make the event better * Forgot to add the comment * Proto id stuff * cool comments * serializer * Added the time stuff
* We can now craft pizza boxes * Fixing errors
* Fix for custom solution transfer volume * Dirty call to prevent issues * Another fix, git issue --------- Co-authored-by: Winkarst-cpu <[email protected]>
Fixed whitelist locale
github-actions
bot
added
Changes: Sprites
Rxup
requested changes
Jul 11, 2024
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.