Upstream sync #2498
Merged
Upstream sync #2498
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
* update space law * missed a thing
* Fix DoDrop to DropNextTo in container cases DoDrop is too heavy to calculation. In any other case we should use alternatives, for example DropNextTo helper method * codestyle change
* Fix Reagent Fire Stacks * Comments on code * little nicer wording?
…… (#30954) Lines 88 and 89, updated 'narsie' and 'ratvar' to 'Nar'Sie' and Ratvar, per issue #30719.
* add the mantle * fix a few things * fix merge conflict stuff, remove from winterdrobe and lathe. * Add mantle to loadouts (20 hour requirement)
* init * wtf git
* add base * add fake suffix and flavor fix * address some reviews * parent it * fix test fail * add FoodSequence support and address small review
add the thing i missed
* add keybinds for rotating and flipping objects * no popup for verbs
* Make the Borgs Names Appear When they Make an Announcement * bwomp * re-order * Use Name instead of metadata * goiup
* Added new map Cog and its own evac shuttle * removed cog from default.yml so all checks will pass I added cog here because i thought it might need to be here for map choosing??????????? ill add it back if needed * updated cog and fixed a bunch of stuff that was not visable in the image, also nerfed the singo so it no longer solos * added renault spawner that was missing and changed some minor stuff * moved a escape pod from med/sci hallway to northern maints * added shutters to the brig and added vents and scrubbers where they were missing in the halls * extended salv's docking port so they can dock * Fixed according to cog review thread * fix pools * fix PostMapInitTest * Update MapLoadBenchmark.cs * added cap and hop spawn that i just forgot to add??????????????????? * fixed again --------- Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
Throngonkler Plush sprite
fixed up dumb text
* Main * Update shelfs.yml * Little bug fix
* concrete weather * miss
debug ghostrole lottery changes
various cog fixes
* works, still has testing values, im sure I did stupid shit. * shitvent crapfactor * snap extra word out of existence * shit I died of old * remove useless inaccurate design comments * Oopsie, handle requirement params in RandomRuleSystem too * I'm a slash slinging hasher * Address reviews, add admin alerts I forgor * EntityMan saves the day * address reviews 1 * eh, I actually don't care about the cargo gifts thing. * started * Do reviews * you actually meant 1.2 lmao * dependency inheritance is a fickle bitch * I have no idea. * Threads are for sheets not computers. * fix traitor rule test * fix round type tattling * break things * It worky * Toolshed makes we want to drink depresso. * Finished? * remove debug values * timings * use defaults * alphabetize * bobby drop tables * Float required fr fr * continue * more continence * uno mas * obsolution * cleanup and documentations * Yell at self * use the right value defaults * housekeeping
No idea how long this was broken; mains wire relies upon this id being accurate which means it needs doing before the calls.
* first part * second part
Initial commit
…ream-sync # Conflicts: # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/Chat/Managers/ChatManager.cs # Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Guidebook/rules.yml # Resources/Prototypes/Maps/cluster.yml # Resources/Prototypes/Maps/europa.yml # Resources/Prototypes/Maps/origin.yml
github-actions
bot
added
Status: Needs Review
|
мне хуёво, может вечером/ночью буду делать перевод, но не щас |
lzk228
added a commit
to lzk228/space-station-14
that referenced
this pull request
Aug 18, 2024
Morb0
pushed a commit
that referenced
this pull request
Aug 23, 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.
Описание PR
Медиа
Проверки
Изменения