Upstream #365
Merged
Upstream #365
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
* centcomm name and ftlcomp * networking microopstimization * go sleep. * map names and arrivals
Fixes #29923. Co-authored-by: Eoin Mcloughlin <[email protected]>
Co-authored-by: lapatison <[email protected]> Co-authored-by: NotSoDamn <[email protected]>
* Scale text in admin player overlay Fixes #30040 * Feedback from PR - get UI scale through root window --------- Co-authored-by: Eoin Mcloughlin <[email protected]>
* WIP: first prototype * Change text slightly * Allow names to wrap * Add label for the scan mode * Remove ugly text * Readd bleeding message * Update code * Allow for the Health Analyzer UI to grow vertically
* Disable arrivals message for cryosleep late arrivals * Provide silent to PlayerSpawnCompleteEvent * Fix typo * Move message to event and into arrivals system
* Beginnings of making the breadmemes jobs easier * stuff * stuff pt. 2 * Stuff pt.3 * Stuff I forgot last time * Basic whitelist Only people that are added to the whitelist with the addwhitelist command will be able to join. I call this the "legacy" whitelist * Remove always deny condition in favor of just breaking if playtime check fails * Change default whitelist Default whitelist is now the "legacy" whitelist. * localization * Admin check * minor spelling change * Fix build * Whitelist message * Fix vars not being datafield and spelling mistakes * Minor spelling mistake * Change config for salamander * Reviews and stuff * Add summaries * Fix whitelists * Forgot to add a datafield * Fixing stuff I guess * Reuse admin remarks to reduce load when connecting. * Update log messages to be verbose instead of debug * Reviews * whoops * Explain a bit more how whitelist checking works * Apply CE's review * Append Membership to Blacklist and Whitelist conditions * Fix review comments * Uncapitalize playerConnectionWhitelist, add to ignored client prototypes * Make note count field work * Fix cvar for thingy --------- Co-authored-by: Pieter-Jan Briers <[email protected]>
Make nukie plushies a non-contraband item
"Salvage specialist" to "Salvage Specialist"; all is right with the world
* Station AI overlay * implement * Bunch of ports * Fix a heap of bugs and basic scouting * helldivers * Shuffle interactions a bit * navmap stuff * Revert "navmap stuff" This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062. * AI wires implemented * Fix examines * Optimise the overlay significantly * Back to old static * BUI radial working * lots of work * Saving work * thanks fork * alright * pc * AI upload console * AI upload * stuff * Fix copy-paste shitcode * AI actions * navmap work * Fixes * first impressions * a * reh * Revert "navmap work" This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e. # Conflicts: # Content.Client/Silicons/StationAi/StationAiOverlay.cs * OD * radar * weh * Fix examines * scoop mine eyes * fixes * reh * Optimise * Final round of optimisations * Fixes * fixes
* real * AI * proto fix
* Fix PostMapInit tests nto considering job containerspawns * fix
… is radio-ed too (#31170) * feat: now when research is unlocked in console, approver of reasearch is radio-ed too * refactor: now most of events that require actor name to be radio-ed or logged use TryGetIdentityShortInfoEvent which is subscibed by id-card system and borg system (to work for both carbon and synthetic life-forms) * refactor: moved TryGetIdentityShortInfoEvent on id card system to shared, fixed cargo cent-com-originated orders * remove unused check * refactor: decoupled systems from IdCardSystem (those that are not dependent on it anymore) * refactor: removed unuseed usings * feat: emagged cargo/research consoles wont radio messages on buy/research confirm anymore --------- Co-authored-by: pa.pecherskij <[email protected]>
* Initial pH nodes, and description changes to indicate pH * Psychoactive and stimulant nodes, Medical foundation, bioreactive hint * Added medical reagents to medical node. Added norepinephric acid to acidic and made up a pH * Added pyrotechnic chem node, and corresponding hint * spelled psychedelic correctly * Fixed capitalisation skill issue * fixed indentation skill issue * fixed a further indentation skill issue * Removed extraneous whitespace * Replaced bioreactive with theraputic and psychoactive. Also fixed typo skill issue. * removed unnecessary comment * Replaced heartbreaker with THC for psychadelic * removed artifexium from acidic * added tran acid to acidic * added more medical chems * removed pH values * removed all but medical
* Red Neck Gaiter Added to SecDrobe * Removes Gaiter From TheaterDrobe
…eam-sync # Conflicts: # Resources/Prototypes/Entities/Objects/Misc/books.yml
…ace-station-14 into upstream # Conflicts: # Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs # Content.Server/Cargo/Systems/CargoSystem.cs # Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs # Content.Server/Connection/ConnectionManager.cs # Resources/Credits/GitHub.txt # Resources/Locale/ru-RU/job/job-names.ftl # Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml # Resources/Prototypes/Corvax/Entities/Mobs/Species/vulpkanin.yml # Resources/Prototypes/Entities/Mobs/NPCs/pets.yml # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml # Resources/Prototypes/Maps/box.yml # Resources/Prototypes/Maps/core.yml # Resources/Prototypes/Maps/meta.yml # Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png # Resources/Textures/Tiles/dark_mono.png # Resources/Textures/Tiles/steel_mono.png # Resources/Textures/Tiles/white_mono.png # Resources/migration.yml
…tation_ADT into upstream # Conflicts: # Content.Client/Administration/AdminNameOverlay.cs # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/Database/ServerDbManager.cs # Content.Shared/Administration/PlayerInfo.cs # Content.Shared/Damage/Systems/SlowOnDamageSystem.cs # Resources/Locale/ru-RU/job/job-names.ftl # Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml
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
Проверки
Изменения
🆑 Крыска