[WiP] Upstream merge 59 #1504
Closed
[WiP] Upstream merge 59 #1504
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
* fixed cartridges installing more than once * replaced prototypes with CartridgeComponent * relocated checks from InstallProgram to InstallCartridge
* Sprites&Meta * Changing prototypes * Adding to Theater vend * Sprite_Change * Sprite_Change * Prototype_Changes Is this exactly how it should be?... * FUCKING FIX * weh --------- Co-authored-by: Арт <[email protected]>
* hos cap resprite * 1. 2. 3 4 Oh
* Fix DeviceLinkSinkComponent not updating sources on shutdown * Log error * Misc link changes & fixes * Fix core
* Add prediction for Tech Disks, cleanup * Remove IsServer check in OnMapInit * Use HashSet for techs, remove LINQ
* Code cleanup for radio jammer * More Entity<T> for the people, and fix an accidental variable reuse
* partial buckling refactor * git mv test * change test namespace * git mv test * Update test namespace * Add pulling test * Network BuckleTime * Add two more tests * smelly
Fix everything.
* emergency toolbox fill rework * Fuck
* Add wet floor sign & warning cone to autolathe * removing
* Tools batch files * fine
Jesus fucking christ man
…ce-wizards#29225) * Prevent fly-by fixture from powering containment field generator * Update according to review
… snouts not being hidden (space-wizards#29214) * inital * Update ClothingSystem.cs * Update helmets.yml
* Fix and enabled TestEmptyLoadout * Fine, have a real name
* add a type specifier where one was forgor * Fix other way because degub conditions * okay this feels kinda dumb but it does fix it. * Update Content.Client/Effects/ColorFlashEffectSystem.cs --------- Co-authored-by: metalgearsloth <[email protected]>
Update base_clothinghead.yml
…ace-wizards#27817) * b * Update antags.ftl * m * ok * Update events.yml * antag * a * Create InitialInfectedExemptComponent.cs * Delete InitialInfectedExemptComponent.cs * yes * Delete InitialInfectedExemptComponent.cs * Create AntagImmuneComponent.cs
* add dress * add dress * add dress * add dress * add dress * add dress * add dress * add dress * add dress yml * add dress in dresser
fix sleeper agents not showing in summary Co-authored-by: deltanedas <@deltanedas:kde.org>
Obsolete anchor entity functions Co-authored-by: plykiya <[email protected]>
* make bar sign selectable * ajcm strongest soldier * AJCM comes down hard for round 2 * good shit * ok ballin * bless'ed be the webedit
* helm fireproofing * suit fireproofing * Update hardsuit-helmets.yml * Update hardsuits.yml
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Changes: Sprites
ой бля ты живой |
|
Да я чёт с утра подумал что на следующем собрании меня будут пиздить и решил доделать по-бырому за день |
да ниче страшного, тебе труповать сколько надо можно |
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
мерж апстрима
готово на ~1/3 (последний коммит - a3db80a)
Медиа
Проверки
Изменения
no cl no fun