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

Тик так часики #120

Merged
merged 2 commits into from
Dec 5, 2024
Merged

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented Dec 5, 2024

Описание PR

Добавлено несколько видов наручных часов. Время на всех часах синхронизировано и выбирается случайно в начале раунда. Часы теперь доступны всем в лоадаутах, в категории "Безделушки".

Добавлены отдельные часы агента внедрения в аплинк синдиката, в категории "Обман". Часы имеют встроенную функцию универсального пинпойнтера, который был сильно урезан - нельзя определить расстояние до цели, только направление. Так же они имеют слот для одной ID-карты или Емага.

Опознаются как возможная контрабанда детективом, смотрителем и главой службы безопасности.
Учёными опознаются полностью.

Стоят 5 ТК.

Почему / Баланс

Никому не нужны ЛГБТ пины. А вот часики могут пригодиться.
Агентам синдиката прибавляется больше пространства для скрытного отыгрыша.

Медиа

image

Список изменений

🆑

  • add: Добавлено несколько видов наручных часов.
  • add: Наручные часы теперь доступны в лоадаутах, в категории "Безделушки"..
  • add: Добавлены часы синдиката, доступные для покупки за 5 ТК.

@github-actions github-actions bot added S: Untriaged size/L Changes: Sprites Changes: Localization Изменяет локализацию Changes: No C# ПР без сишарпа and removed size/L S: Untriaged labels Dec 5, 2024
Copy link

github-actions bot commented Dec 5, 2024

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

Resources/Textures/_CorvaxNext/Objects/Devices/Watches/blackwatch.rsi

State Old New Status
blackwatch Added
equipped-HAND Added
hours_0 Added
hours_1 Added
hours_10 Added
hours_11 Added
hours_2 Added
hours_3 Added
hours_4 Added
hours_5 Added
hours_6 Added
hours_7 Added
hours_8 Added
hours_9 Added
inhand-left Added
inhand-right Added
minutes_0 Added
minutes_1 Added
minutes_10 Added
minutes_11 Added
minutes_2 Added
minutes_3 Added
minutes_4 Added
minutes_5 Added
minutes_6 Added
minutes_7 Added
minutes_8 Added
minutes_9 Added

Resources/Textures/_CorvaxNext/Objects/Devices/Watches/leatherwatch.rsi

State Old New Status
equipped-HAND Added
hours_0 Added
hours_1 Added
hours_10 Added
hours_11 Added
hours_2 Added
hours_3 Added
hours_4 Added
hours_5 Added
hours_6 Added
hours_7 Added
hours_8 Added
hours_9 Added
inhand-left Added
inhand-right Added
leatherwatch Added
minutes_0 Added
minutes_1 Added
minutes_10 Added
minutes_11 Added
minutes_2 Added
minutes_3 Added
minutes_4 Added
minutes_5 Added
minutes_6 Added
minutes_7 Added
minutes_8 Added
minutes_9 Added

Resources/Textures/_CorvaxNext/Objects/Devices/Watches/pocketwatch.rsi

State Old New Status
equipped-HAND Added
hours_0 Added
hours_1 Added
hours_10 Added
hours_11 Added
hours_2 Added
hours_3 Added
hours_4 Added
hours_5 Added
hours_6 Added
hours_7 Added
hours_8 Added
hours_9 Added
inhand-left Added
inhand-right Added
minutes_0 Added
minutes_1 Added
minutes_10 Added
minutes_11 Added
minutes_2 Added
minutes_3 Added
minutes_4 Added
minutes_5 Added
minutes_6 Added
minutes_7 Added
minutes_8 Added
minutes_9 Added
pocketwatch Added

Resources/Textures/_CorvaxNext/Objects/Devices/Watches/syndiwatch.rsi

State Old New Status
equipped-HAND Added
hours_0 Added
hours_1 Added
hours_10 Added
hours_11 Added
hours_2 Added
hours_3 Added
hours_4 Added
hours_5 Added
hours_6 Added
hours_7 Added
hours_8 Added
hours_9 Added
id_overlay Added
inhand-left Added
inhand-right Added
light_overlay Added
minutes_0 Added
minutes_1 Added
minutes_10 Added
minutes_11 Added
minutes_2 Added
minutes_3 Added
minutes_4 Added
minutes_5 Added
minutes_6 Added
minutes_7 Added
minutes_8 Added
minutes_9 Added
pda Added
pinonclose Added
pinondirect Added
pinonfar Added
pinonmedium Added
pinonnull Added
syndiwatch Added
syndiwatch_clock Added

Edit: diff updated after cb5e3cc

@github-actions github-actions bot added the size/L label Dec 5, 2024
@AwareFoxy
Copy link
Collaborator

Прикольная вещь для сталкеров

@AwareFoxy AwareFoxy merged commit 2747be7 into space-syndicate:master Dec 5, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменяет локализацию Changes: No C# ПР без сишарпа Changes: Sprites size/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants