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

qol: Unified Blood Adjust #6180

Merged
merged 25 commits into from
Dec 31, 2024
Merged

qol: Unified Blood Adjust #6180

merged 25 commits into from
Dec 31, 2024

Conversation

Antoonij
Copy link
Contributor

Описание

изменение крови теперь более контролируемо
также это нужно для реализации #6179

Ссылка на предложение/Причина создания ПР

нет

Тесты

не нужны

@Antoonij Antoonij marked this pull request as draft November 15, 2024 11:06
@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Nov 15, 2024
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Nov 15, 2024
@Antoonij Antoonij marked this pull request as ready for review November 15, 2024 11:37
@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Dec 15, 2024
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Dec 16, 2024
@BeebBeebBoob
Copy link
Member

переименуй с /AdjustBloodLoss() на /AdjustBlood() и инветируй потерю и получение крови
т.е. потеря 10 ед. не
AdjustBloodLoss(10), а AdjustBlood(-10)
где слово Adjust - регулировать, подправить, а когда команда adjustbloodloss используется не только как удаление крови, но и также удаление.
Это как команда adjustHealth() или adjust_clockwork_power()

BeebBeebBoob
BeebBeebBoob requested changes Dec 30, 2024
View reviewed changes
code/game/gamemodes/miniantags/abduction/gland.dm Outdated Show resolved Hide resolved
code/modules/antagonists/vampire/vampire_datum.dm Outdated Show resolved Hide resolved
code/modules/antagonists/vampire/vampire_datum.dm Outdated Show resolved Hide resolved
code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm Outdated Show resolved Hide resolved
code/modules/antagonists/vampire/vampire_powers/bestia_powers.dm Outdated Show resolved Hide resolved
code/modules/reagents/chemistry/reagents/medicine.dm Outdated Show resolved Hide resolved
code/modules/reagents/chemistry/reagents/medicine.dm Outdated Show resolved Hide resolved
code/modules/reagents/chemistry/reagents/medicine.dm Outdated Show resolved Hide resolved
code/modules/surgery/organs/blood.dm Outdated Show resolved Hide resolved
code/modules/surgery/organs/blood.dm Outdated Show resolved Hide resolved
Antoonij and others added 7 commits December 30, 2024 23:30
@Antoonij @BeebBeebBoob
Update code/modules/surgery/organs/blood.dm
c55258f 
Co-authored-by: BeebBeebBoob <[email protected]>
@Antoonij @BeebBeebBoob
Update code/modules/reagents/chemistry/reagents/medicine.dm
39c7e82 
Co-authored-by: BeebBeebBoob <[email protected]>
@Antoonij @BeebBeebBoob
Update code/modules/reagents/chemistry/reagents/medicine.dm
ae2ff36 
Co-authored-by: BeebBeebBoob <[email protected]>
@Antoonij @BeebBeebBoob
Update code/game/gamemodes/miniantags/abduction/gland.dm
51e5d34 
Co-authored-by: BeebBeebBoob <[email protected]>
@Antoonij @BeebBeebBoob
Update code/modules/antagonists/vampire/vampire_datum.dm
ef378d2 
Co-authored-by: BeebBeebBoob <[email protected]>
@Antoonij @BeebBeebBoob
Update code/modules/antagonists/vampire/vampire_datum.dm
0c49d70 
Co-authored-by: BeebBeebBoob <[email protected]>
@Antoonij @BeebBeebBoob
Update code/modules/reagents/chemistry/reagents/medicine.dm
9f14de9 
Co-authored-by: BeebBeebBoob <[email protected]>
@BeebBeebBoob BeebBeebBoob merged commit c1fe8c4 into ss220-space:master220 Dec 31, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pilygun pilygun pilygun left review comments

@BeebBeebBoob BeebBeebBoob BeebBeebBoob requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Antoonij @BeebBeebBoob @pilygun