test - #3
Closed
DRkYosif wants to merge 525 commits into
Closed
Conversation
* simple enough * switch to CompletionResult.FromOptions and CompletionHelper.SessionNames * cleanup
* Adjust landmines to have unshaded lights. * Someday I will give myself credit for the work I do. * Adjust animation speed.
fix wallmount vending machine direction
* Use a struct to hold the items for `Directions` in `SunShadowComponent`, fix serialization. * actually make them datafields... * Add NetSerializable to datadef * this is why we can't have nice things
Update implanters.yml
Update chem.yml
* 14 shots * 14 to 16
* sprites * genpop wall lockers * number 5 alive * slight boilerplate code, thank you slarti
* Add ForbidLiteral attribute to NpcFactionSystem methods * Cleanup resulting warnings
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
No raffle for carp Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* adjreagent now accepts float * var
* now you see me * unused depen * test fail fix attempt 1 * test fail fix attempt 2 * fix test fail attempt 3 * shot in the dark. * Does this work? * import cleanup * taking a shot at this. * Convert PersistenceSaveCommand to LocalizedEntityCommands. * requested changes * requested changes. also dealt with improperly named private const * Update Content.Server/GameTicking/GameTicker.Spawning.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Server/GameTicking/GameTicker.Spawning.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Convert PlanetCommand to LocalizedEntityCommand * Update BiomeSystem.cs * Update Content.Server/Salvage/SalvageSystem.Runner.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Server/Procedural/DungeonSystem.Rooms.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Server/Salvage/SpawnSalvageMissionJob.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Server/Station/Systems/StationBiomeSystem.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * revert to latest master. * slartis suggestion. * Update SetMapAtmosCommand.cs * cleanup * Update PersistenceSaveCommand.cs * finish localizing persistencesavecommand * this is icky, I change. * :sigh: * revert whatever I did here? * oh I see, some inconsistencies. * revert this * Update PlanetCommand.cs * move this ftl to the commands folder --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Firebombs as minor contraband * Pipebombs as minor contraband * Seismic charge as cargo/sec contra (like crushers) * Modular payloads
b fix fix yaml linter Update swords.yml fix fix map resave Update ServerConsciousnessSystem.cs typo fix fix AllTechPrintableTest local test fix fix fix maps
Upstream sync
* рнд сервер и консоль не работает из энергии * fix
* Update LobbyGui.xaml * Update lobby-state.ftl * Style+fix
* stuff * some other stuff * almost forgor * s * finally
* fuck * fix * s * Update CargoTest.cs * Update teg.ftl --------- Co-authored-by: Zack Backmen <backmen@bk.ru>
* fuck * s * Update CargoTest.cs * fixes fixes fixes
* AirDrop system via code * fix?
* AirDrop system via code * fix? * fix pvs * . * finally * Update AirDropSystem.cs * cleanup * Delete equipped-OUTERCLOTHING-reptilian.png * Revert "Delete equipped-OUTERCLOTHING-reptilian.png" This reverts commit 91c0b00. * Update equipped-OUTERCLOTHING-reptilian.png * no saves * Update AirDropSystem.cs * bruh --------- Co-authored-by: Kayzel <43700376+KayzelW@users.noreply.github.com>
* shark port + demon fix * Update demon.ftl * Update Resources/Prototypes/_Backmen/Entities/Objects/Devices/translator_implants.yml Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * удалил дефисы * demons+shark into carshnil and evepishtu * accentless * добавил расам аварийники при спавне * fix glasses * фиксы вернул контейнеры демонам, добавил отображение в визоры и удалил лишний конейнер акулам и демонам * merge resolve * 2 * Update hud.yml * Update hud.yml * Update hud.yml * fix cs code * oops --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Zack Backmen <backmen@bk.ru>
* AirDrop visual fix * fix
* many promoted * rm deadspace block && remove voices * Update main.toml * revert "self hosted #1294" * fix server names * fixes * Update tts-voices-bkm.yml * upd * Update gamerule-admin.ftl * rm corvax maps * Update README.md * upd rm corvax maps * round start crash * Update PostMapInitTest.cs --------- Co-authored-by: Zack Backmen <backmen@bk.ru>
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
Медиа
Тип PR
Изменения