Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Removes generic_adjective sanity check #748

Merged
merged 3 commits into from
Jun 19, 2024

Conversation

MysticalFaceLesS
Copy link
Member

Оригинальный PR: shiptest-ss13#3097

About The Pull Request

Removed the sanity check I had put in for character adjectives during a previous fix.

It was well intentioned, but as it turns out, if someone is loading a charslot that existed before guestbook was ported or never saved with one, they wouldn't have an adjective saved in their save file, resulting in nulling the variable for generic_adjective, which causes this sanity check to fail and the selection not to show. The goal was meant to prevent a guestbook malfunction from locking up prefs as runtimes can break it, but after spending hours and hours on going over prefscode and analyzing character loading and generation, it's clear that I would have to address this at the point of charslot loading.

I just want this fixed in time for wednesday uptime. BETTER handling will come later, in a separate PR, when I am SURE that they won't break charslots, as well as some other prefs fixups. There's a lot of code in prefs that does not work or do anything, but for now, let's keep it simple. Should be ready to testmerge or full merge.

Changelog

🆑Anticept
fix: Generic adjective selection will show for everyone.
/:cl:

@github-actions github-actions bot added 🪓 НЕ МОДУЛЬНО 🪓 Не мудульно да, переделать бы 🧱 Код 🧱 Изменения .dm файлов 🔵 Требуется проверка labels Jun 18, 2024
Signed-off-by: MrCat15352 <[email protected]>
Signed-off-by: MrCat15352 <[email protected]>
@MrCat15352 MrCat15352 added 🚧 Фикс багов 🚧 Фиксится какая-то проблема или баг 🔆 Обновление 🔆 PR содержит или добавляет что-то новое или старое, или обновляет... ☠Слияние с ОФАМИ☠ PR говорит сам за себя. Подтягиваем последние обновы офов... Да хранит нас дядя Целадонский and removed 🪓 НЕ МОДУЛЬНО 🪓 Не мудульно да, переделать бы labels Jun 19, 2024
@MrCat15352 MrCat15352 merged commit 0757929 into beta-dev Jun 19, 2024
3 checks passed
@MrCat15352 MrCat15352 deleted the upstream-pr-3097 branch June 19, 2024 05:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
☠Слияние с ОФАМИ☠ PR говорит сам за себя. Подтягиваем последние обновы офов... Да хранит нас дядя Целадонский 🔆 Обновление 🔆 PR содержит или добавляет что-то новое или старое, или обновляет... 🔵 Требуется проверка 🚧 Фикс багов 🚧 Фиксится какая-то проблема или баг 🧱 Код 🧱 Изменения .dm файлов
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants