Open
Conversation
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
they call me a plumber the the way i fix da toiler
* One commit * Move files --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Cockroach Gib * Prevent Cockroaches From Gibbing Eachother * Added - type: RandomChanceTriggerCondition * Update animals.yml * Named SuccessChance Datafield * successChance * Revert Change * Uncapitalize C * RECAPITALIZE THE C
* 2nd edition * remove OOC * oop * double oops
Putting underwear on dogs.
… a not weightless environment (#40335) * Fix * Update Content.Shared/Gravity/SharedGravitySystem.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
* De-enumify humanoid species skin colours * Change index to resolve --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
no longer nukies in disguise
* Add More Holy Books * Revert "Add More Holy Books" This reverts commit 665eb0de10fe0784d634f9eaf672e60f18a62995. * Fix eyes * Add the undergarments and ftl designations. * Missed something. * second edited line didnt save for some reason * Im tired dont judge me * Fix eyes * Reverting stuff * fix markings * Its joever * Update meta.json * small tweak --------- Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: Steffo99 <1540885+Steffo99@users.noreply.github.com>
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Changes: UI
S: Untriaged
size/M
S: Merge Conflict
and removed
S: Untriaged
size/M
S: Merge Conflict
labels
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.
Описание PR
ПР апстрима. Жуть какая. Пока не мёрджим, я посмотреть на чеки.