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

Industrial Radio Jammer + Cyrillic crayons #70

Merged
merged 7 commits into from
Aug 29, 2024
Merged

Industrial Radio Jammer + Cyrillic crayons #70

merged 7 commits into from
Aug 29, 2024

Conversation

aristophanivan
Copy link
Contributor

О PR

  • Добавлены русские буквы-декали
  • Добавлен промышленный глушитель синдиката.

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

Опять же, просба doublechest

Технические детали

Кода нет

Changelog
🆑

  • add: Добавлены русские буквы.
  • add: Добавлен промышленный глушитель синдиката.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 28, 2024 •
edited
Loading

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

Resources/Textures/Stories/Effects/crayondecals.rsi

State Old New Status
cyr_b Added
cyr_c Added
cyr_ch Added
cyr_d Added
cyr_eh Added
cyr_f Added
cyr_g Added
cyr_hard_sign Added
cyr_i Added
cyr_l Added
cyr_p Added
cyr_sh Added
cyr_shh Added
cyr_soft_sign Added
cyr_u Added
cyr_y Added
cyr_ya Added
cyr_z Added
cyr_zh Added

Resources/Textures/Stories/Objects/Devices/jammer_ind.rsi

State Old New Status
inhand-left Added
inhand-right Added
jammer Added
jammer_high_charge Added
jammer_low_charge Added
jammer_medium_charge Added

Edit: diff updated after fa1699d

doublechest0
doublechest0 requested changes Aug 28, 2024
View reviewed changes
Resources/Prototypes/Corvax/Decals/crayons.yml Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Перенести спрайты в Stories папку из Corvax. Перенести прототипы аналогично.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Так они же корваксовские... Ладно...

Resources/Prototypes/Stories/Catalog/uplink_catalog.yml Outdated
Comment on lines 1 to 9
- type: listing
id: UplinkRadioJammerIndustrial
name: Промышленный глушитель связи
description: Это устройство является улучшенной версией обычного глушителя связи. Радиус действия увеличен, но и потребление больше. (Замаскирован под %%%%%%%)
productEntity: RadioJammerIndustrial
cost:
Telecrystal: 12
categories:
- UplinkDisruption
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
- type: listing
id: UplinkRadioJammerIndustrial
name: Промышленный глушитель связи
description: Это устройство является улучшенной версией обычного глушителя связи. Радиус действия увеличен, но и потребление больше. (Замаскирован под %%%%%%%)
productEntity: RadioJammerIndustrial
cost:
Telecrystal: 12
categories:
- UplinkDisruption
- type: listing
id: UplinkRadioJammerIndustrial
name: Экспериментальный глушитель связи
description: Это устройство является улучшенной версией обычного глушителя связи. Радиус действия увеличен, но и потребление больше.
productEntity: RadioJammerIndustrial
cost:
Telecrystal: 6
categories:
- UplinkDisruption

За столько ТК никто это не купит.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Обычная 6 стоит, какой смысл?

Copy link
Contributor

Choose a reason for hiding this comment

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

4 стоит обычная

Resources/Prototypes/Stories/Entities/Objects/Tools/jammer.yml Outdated
Comment on lines 1 to 27
- type: entity
name: Промышленный глушитель связи.
parent: RadioJammer
id: RadioJammerIndustrial
description: Это устройство является улучшенной версией обычного глушителя связи. Радиус действия увеличен, но и потребление больше.
components:
- type: Sprite
sprite: Stories/Objects/Devices/jammer_ind.rsi
- type: RadioJammer
settings:
- wattage: 3
range: 8
message: radio-jammer-component-set-message-low
name: radio-jammer-component-setting-low
- wattage: 6
range: 12
message: radio-jammer-component-set-message-medium
name: radio-jammer-component-setting-medium
- wattage: 24
range: 24
message: radio-jammer-component-set-message-high
name: radio-jammer-component-setting-high
- type: ItemSlots
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellHigh
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
- type: entity
name: Промышленный глушитель связи.
parent: RadioJammer
id: RadioJammerIndustrial
description: Это устройство является улучшенной версией обычного глушителя связи. Радиус действия увеличен, но и потребление больше.
components:
- type: Sprite
sprite: Stories/Objects/Devices/jammer_ind.rsi
- type: RadioJammer
settings:
- wattage: 3
range: 8
message: radio-jammer-component-set-message-low
name: radio-jammer-component-setting-low
- wattage: 6
range: 12
message: radio-jammer-component-set-message-medium
name: radio-jammer-component-setting-medium
- wattage: 24
range: 24
message: radio-jammer-component-set-message-high
name: radio-jammer-component-setting-high
- type: ItemSlots
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellHigh
- type: entity
name: экспериментальный глушитель связи.
parent: RadioJammer
id: RadioJammerIndustrial
description: Это устройство является улучшенной версией обычного глушителя связи. Радиус действия увеличен, но и потребление больше.
components:
- type: Sprite
sprite: Stories/Objects/Devices/jammer_ind.rsi
- type: RadioJammer
settings:
- wattage: 3
range: 6
message: radio-jammer-component-set-message-low
name: radio-jammer-component-setting-low
- wattage: 6
range: 12
message: radio-jammer-component-set-message-medium
name: radio-jammer-component-setting-medium
- wattage: 12
range: 24
message: radio-jammer-component-set-message-high
name: radio-jammer-component-setting-high
- type: ItemSlots
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellHigh

Resources/Textures/Stories/Objects/Devices/jammer_ind.rsi/meta.json Outdated
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8",
Copy link
Contributor

Choose a reason for hiding this comment

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

Ложь.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Бывает, исправим)

@doublechest0 doublechest0 merged commit 19127e3 into Space-Stories:master Aug 29, 2024
3 checks passed
@doublechest0 doublechest0 changed the title Обновление, ура Industrial Radio Jammer + Cyrillic crayons Aug 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@doublechest0 doublechest0 doublechest0 approved these changes

Assignees

@aristophanivan aristophanivan

Labels
Changes: Sprites No C#
Projects
No open projects
🔌 Разработка
Status: Выполнено
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@aristophanivan @doublechest0