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.

Sign up for GitHub

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

Jump to bottom

[Port] Morale System #881

Merged
merged 8 commits into from
Nov 10, 2024
Merged

[Port] Morale System #881

merged 8 commits into from
Nov 10, 2024

Conversation

Roudenn
Copy link
Contributor

@Roudenn Roudenn commented Nov 2, 2024 •
edited
Loading

Описание PR

Port of the Simple-Station/Einstein-Engines#620

Данный ПР добавляет в игру Систему морали с EE.

  • Настроение отображается как Alert в правой части экрана
  • Подвергается различным модификаторам после различных действий
  • Низкое настроение ухудшает зрение и замедляет, высокое наоборот повышает скорость
  • Теперь при хирургических операциях без наркоза настроение пациента сильно ухудшится, а также при отсутствии рук, ног, или тела
  • Настроение можно увидеть на лице гуманоида при осмотре

TODO:

  • Собрать команду чтобы протестировать эту фигню
  • Добавить больше способов повышения настроения
  • Добавить модификаторы настроения антагам

VMSolidus and others added 3 commits November 2, 2024 12:35
@VMSolidus @DangerRevolution
@angelofallars @DEATHB4DEFEAT @Roudenn
Morale System
31d189a 
Co-Authored-By: Danger Revolution! <[email protected]>
Co-Authored-By: Angelo Fallaria <[email protected]>
Co-Authored-By: DEATHB4DEFEAT <[email protected]>
@Roudenn
Surgery mood effects
79d4b23
@Roudenn
Update mood.ftl
7f04f9a
@Roudenn Roudenn requested a review from Rxup as a code owner November 2, 2024 10:17
@github-actions github-actions bot added Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Shaders labels Nov 2, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 2, 2024 •
edited
Loading

RSI Diff Bot; head commit c12ec85 merging into dd6a0a5
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Interface/Alerts/mood.rsi

State Old New Status
mood1 Added
mood2 Added
mood3 Added
mood4 Added
mood5 Added
mood6 Added
mood7 Added
mood8 Added
mood9 Added
mood_happiness_bad Added
mood_happiness_good Added
mood_insane Added

Edit: diff updated after c12ec85

@nomad0260
Copy link
Collaborator

Настроение от убийств повышается?
Или от вида трупа

@Roudenn
Copy link
Contributor Author

Roudenn commented Nov 2, 2024

Настроение от убийств повышается? Или от вида трупа

Неа, к сожалению это реализовать как-то трудновато будет
Нужно добавить ещё бонусы к настроению антагонистам и больше возможностей повысить настроение на станции в целом, например через реагенты

@Roudenn
Copy link
Contributor Author

Roudenn commented Nov 2, 2024 •
edited
Loading

проверки прошли почти с первого раза, ахуй

@KayzelW KayzelW added Port Я портирую эти коммиты. Require Testing Требуется тестирование! labels Nov 2, 2024
@KayzelW KayzelW added the DONT MERGE Ноу, ноу, ноу, мистер, не совершайте ошибок. label Nov 8, 2024
@github-actions github-actions bot added the MERGE CONFLICT ПИЗДА! label Nov 9, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 9, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

2 similar comments
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 9, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 9, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Roudenn
Copy link
Contributor Author

Roudenn commented Nov 9, 2024

Кто-нибудь уберите лейбл мёрдж конфликта, он пофикшен но лейбл не убирается сам

@nomad0260 nomad0260 removed the MERGE CONFLICT ПИЗДА! label Nov 9, 2024
@CrimeMoot CrimeMoot mentioned this pull request Nov 9, 2024
Merged
@Rxup Rxup removed DONT MERGE Ноу, ноу, ноу, мистер, не совершайте ошибок. Require Testing Требуется тестирование! labels Nov 10, 2024
@Rxup Rxup merged commit 819572e into Rxup:master Nov 10, 2024
11 checks passed
@Roudenn Roudenn deleted the MOOOOOD branch November 11, 2024 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Rxup Rxup Awaiting requested review from Rxup Rxup is a code owner

Assignees
No one assigned
Labels
Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Shaders Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Port Я портирую эти коммиты.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Roudenn @nomad0260 @Rxup @KayzelW @VMSolidus