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

add: ghostface equipment [bounty] #6371

Merged
merged 7 commits into from
Jan 23, 2025
Merged

add: ghostface equipment [bounty] #6371

merged 7 commits into from
Jan 23, 2025

Conversation

Honker9999999
Copy link
Contributor

@Honker9999999 Honker9999999 commented Jan 16, 2025 •
edited
Loading

Описание

Добавляет костюм, маску и ножик из фильма "Крик". Есть бронированные у тритора. "Игрушечных" в вендоматах в ПРе нет, но добавлю как только ПР с обновлением ассортимента вендомата будет замержен (или обновлю тот, если первым замерджат этот)
В целом, в ТЗ описано.

Меняет количество предметов в вендомате костюмом (AutoDrobe) до 10. Делает их платными.

Причина создания ПР / Почему это хорошо для игры

https://discord.com/channels/617003227182792704/755125334097133628/1309241120752144436 (гостфейс)

https://discord.com/channels/617003227182792704/755125334097133628/1305226742415228978 (вендомат)
Предложки объединены в одну дабы избежать лишнего мердж конфликта.

Тесты

Компилится
В игре спрайты есть, рантаймов или прямых вылетов во время использования маски, ножа или костюма не замечено.

@github-actions github-actions bot added the DMI Affects DMI files label Jan 16, 2025
PlayerUnknown14
PlayerUnknown14 requested changes Jan 19, 2025
View reviewed changes
Copy link
Member

@PlayerUnknown14 PlayerUnknown14 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Пропиши ru_names для всех obj.

PlayerUnknown14
PlayerUnknown14 requested changes Jan 19, 2025
View reviewed changes
Copy link
Member

@PlayerUnknown14 PlayerUnknown14 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

е - ё. Поправить.

@BeebBeebBoob
Copy link
Member

BeebBeebBoob commented Jan 19, 2025 •
edited
Loading

Меняет количество предметов в вендомате костюмом (AutoDrobe) до 10. Делает их платными.

Сделай это в отдельном ПРе пожалуйста

@BeebBeebBoob
Copy link
Member

И да. Я вижу: чтобы избежать мерж конфликтов. Но сделай.

BeebBeebBoob
BeebBeebBoob requested changes Jan 19, 2025
View reviewed changes
Copy link
Member

@BeebBeebBoob BeebBeebBoob left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Разделить ПР

@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Jan 19, 2025
PlayerUnknown14
PlayerUnknown14 requested changes Jan 21, 2025
View reviewed changes
Copy link
Member

@PlayerUnknown14 PlayerUnknown14 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Поправить буквы.

code/datums/uplink_item.dm Outdated Show resolved Hide resolved
code/datums/uplink_item.dm Outdated Show resolved Hide resolved
code/game/objects/items/devices/voice.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/storage/uplink_kits.dm Show resolved Hide resolved
code/game/objects/items/weapons/storage/uplink_kits.dm Show resolved Hide resolved
code/modules/clothing/suits/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/suits/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/suits/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/suits/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/suits/miscellaneous.dm Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Jan 21, 2025
@Honker9999999 Honker9999999 mentioned this pull request Jan 21, 2025
Merged
PlayerUnknown14
PlayerUnknown14 requested changes Jan 22, 2025
View reviewed changes
code/datums/uplink_item.dm Outdated Show resolved Hide resolved
code/datums/uplink_item.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/weaponry.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/weaponry.dm Outdated Show resolved Hide resolved
code/modules/clothing/masks/gasmask.dm Outdated Show resolved Hide resolved
code/modules/clothing/suits/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/suits/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/suits/miscellaneous.dm Outdated Show resolved Hide resolved
Honker9999999 and others added 2 commits January 22, 2025 20:56
@Honker9999999
loc
40e044a
@Honker9999999 @PlayerUnknown14
Update code/game/objects/items/weapons/weaponry.dm
2d77acc 
Co-authored-by: PlayerUnknown14 <139672964+PlayerUnknown14@users.noreply.github.com>
@PlayerUnknown14 PlayerUnknown14 added the Has Approve Have been approved by somebody from Review Team and awaiting for one more approve label Jan 23, 2025
@BeebBeebBoob BeebBeebBoob merged commit 9cf111e into ss220-space:master220 Jan 23, 2025
12 checks passed
Ssheya pushed a commit to Ssheya/Paradise that referenced this pull request Jan 25, 2025
@Honker9999999 @PlayerUnknown14 @Ssheya
add: ghostface equipment [bounty] (ss220-space#6371)
b7ca449 
* add: ghostface equipment

* runames

* fixes

* hotfix

* loc

* Update code/game/objects/items/weapons/weaponry.dm

Co-authored-by: PlayerUnknown14 <139672964+PlayerUnknown14@users.noreply.github.com>

---------

Co-authored-by: PlayerUnknown14 <139672964+PlayerUnknown14@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PlayerUnknown14 PlayerUnknown14 PlayerUnknown14 approved these changes

@BeebBeebBoob BeebBeebBoob Awaiting requested review from BeebBeebBoob

Assignees
No one assigned
Labels
DMI Affects DMI files Has Approve Have been approved by somebody from Review Team and awaiting for one more approve
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Honker9999999 @BeebBeebBoob @PlayerUnknown14