Upstream1911 #806
Merged
Upstream1911 #806
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
* Add on-call functionality for adminning The first time an ahelp gets SOS it gets relayed to the specified channel with the specified ping. Every time after that it doesn't until it gets a non-SOS response received. * Remove redundant name Pretty sure this already gets chucked on the name of the msg itself I think it just didn't show in screenshot because they were subsequent. * Update Content.Server/Administration/Systems/BwoinkSystem.cs Co-authored-by: Chief-Engineer <[email protected]> --------- Co-authored-by: Chief-Engineer <[email protected]> Co-authored-by: deathride58 <[email protected]>
* idk how to revert a pr so I just deleted some lines * pill destructible with explosion resistance * comment for explosion resist * "and" to "but" --------- Co-authored-by: SlamBamActionman <[email protected]>
* med lathe gauze price reduction * gauze craft doafter time * 3 second doafter craft
* add * Revert "add" This reverts commit 25da34b0fead5812fe5800c9bf5dd7b10ef48d7d. * antagonism allowed:tm:
* Changes the AME sound effect to not be the default MetalThud. * Was told on discord to make a minor change to autorerun the tests due to the Build & Test Debug failing! * Attribution and licensing, as requsted by deathride58 * Fixes the high-pitched squeak audible to some people! * Audio file tweaked by SlamBamActionMan to eliminate a weird squeak they were still able to hear. Thanks!
* Allow for the ai's laws to be changed from its core and eye * Address reviews
* clean up tools lathe recipes * add medical and cooking tools * add result * add result to others * review * engine --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* Deduping of recent messages should consider the channel it's being sent to * rerun actions
added headphones to trinkets
* capacity upgrade * comment update
* Add debug messages to traitor activation * more debug
* Adds storage sprites for combat knife and survival knife. Replaces inhand sprites. * Fixes meta.json copyright
fix broken computer white shadows
Co-authored-by: PJBot <[email protected]>
Make wielding system use identity
* Make ghost roles collapsible * Save `BodyVisible` state of each `Collapsible` box * Make ghost role collapsible only when group has more than 1 role * Make it a little prettier * Make only ghost role buttons collapsible * Apply requested changes * Typo * Small cleanup * Store in list, instead of iterating * Make unique ids more unique * Move it out of the cycle * Make _collapsibleBoxes into dictionary and use key instead of Collapsible boxes names Added TODO. So after the problem will be fixed in `GhostRolesEui`, it should be mirrored and fixed here too. * Put TODO in GhostRolesEui. I guess Issue must be made for this * Use HashSet instead of Dictionary as suggested. Invert the HashSet, so being present means it uncollapsed I decided to invert HashSet to _uncollapsedStates, because players surely will have more collapsed buttons than opened, so we optimise memory usage a little bit. * Remove extra space from ghost roles window * Add buttons stretching. Size 3:1
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
PyotrIgn
approved these changes
Dec 14, 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.
О пулл реквесте
АПСТРИМ!!
Требования
Критические изменения
TaskBoard к починке апстрима:
Content.Server\Weapons\Ranged\Systems\GunSystem.cs @Inconnu1337
Требует Тестов
обратить внимание на
Content.Shared\Store\ListingPrototype.cs
скорее всего тут всё норм
Content.Shared\Interaction\SharedInteractionSystem.Clumsy.cs
был удалён, а у нас там изменения
Изменить Ccvar. из за рефакторинга всё съехало
Ccvar
CVarDef.Create("server.rules_file", "ADTRuleset", CVar.REPLICATED | CVar.SERVER); //ADT tweak rule
CVarDef.Create("admin.new_player_threshold", 600, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER); // ADT-Tweak
CVarDef.Create("game.contraband_examine", false, CVar.SERVER | CVar.REPLICATED); ///ADT no wizard cringe
CVarDef.Create("ahelp.admin_prefix", true, CVar.SERVERONLY); // ADT-Tweak
CVarDef.Create("atmos.space_wind", true, CVar.SERVERONLY); ///ADT
CVarDef.Create("shuttle.emergency_early_launch_allowed", true, CVar.SERVERONLY); //ADT-Tweak - включен ранний запуск аварийного шаттла командованием
CVarDef.Create("shuttle.emergency_dock_time", 300f, CVar.SERVERONLY); //ADT-Tweak - время стыковки эвакшаттла увеличен до 5 минут
CVarDef.Create("shuttle.emergency_authorize_time", 30f, CVar.SERVERONLY); //ADT-Tweak - предупреждение о запуске за 30 секунд до отправки
CVarDef.Create("shuttle.auto_call_time", 270, CVar.SERVERONLY); //ADT-Tweak - автоматический эвак вызывается после 3 часов
CVarDef.Create("viewport.maximum_width", 29, CVar.REPLICATED | CVar.SERVER); //ADT 16:9
CVarDef.Create("viewport.width", 29, CVar.CLIENTONLY | CVar.ARCHIVE); //ADT 16:9
CVarDef.Create("chat.max_announcement_length", 700, CVar.SERVER | CVar.REPLICATED);// ADT Tweak 256
CVarDef.Create("infolinks.appeal", "https://discord.com/channels/901772674865455115/1245787985891561544", CVar.SERVER | CVar.REPLICATED); //ADT-Tweak: Ссылка на обжалование
CCVAR КОТОРЫЕ НИГДЕ НЕ БЫЛИ ОТМЕЧЕНЫ "
ADT" ИЗ ЗА ЧЕГО Я ИХ ПРИКРЕПЛЯЮ ПРОСТО СКРИНОМ БИЛДИНГА. ПАСИБА ЗА ПОДСТАВУПросто проверить обратить внимание на Resources\Prototypes\Entities\Objects\Devices\pda.yml
Тут были закоменчены 28, 85 commented эти строки Content.Shared\ADT\Crawling\Systems\SharedCrawlingSystem.cs, BonkSystem удалили? @FaDeOkno
Чейнджлог
🆑 Шрёдька, Пётр, Инконну, и какой-то там КэшРаш на пару с Даркичем.