Open
Conversation
* Add lye reagent and its recipes * Move and add soap recipes * Add temperature to soap recipes * Silly comments * Remove NaHO based lye recipe due to sigynate recipe conflict. * Typo * Typo, again * Change lye color and description
* added equip and unequip triggers for equipment and equipee * Update Content.Shared/Trigger/Components/Triggers/TriggerOnDidEquipComponent.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* fix recycler 3 * Update Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
* Add trigger for InteractOnUsing * Add blacklist and targetUsed fields * Update Content.Shared/Trigger/Components/Triggers/TriggerOnInteractUsingComponent.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Increase bananium horn use delay to 3 seconds
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
* Cleanup warnings in ChatSystem * fix after merge --------- Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* tiny fix * also fix the window bug --------- Co-authored-by: ruddygreat <ruddygreat1@gmail.com>
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
…rifle to be used by pacifists (#37164) Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
…plant it's own prototype
github-actions
bot
added
the
S: Merge Conflict
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
4 tasks
github-actions
bot
removed
the
S: Merge Conflict
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
Pulls in changes from wizden stable up to the 1st of September (
9f36a3b4ea321ca0cb8d0fa0f2a585b14d136d78)Why / Balance
The other november merge was excessively huge. This one is only 458 commits. (for now)
Technical details
How to test
Things to test:
Media
Requirements
Breaking changes
Triggers have been refactored and moved to shared.
DisableSuitSensorsComponenthas been moved to shared.Changelog