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

add: welder sword #5976

Merged
merged 16 commits into from
Jan 2, 2025
Merged

Conversation

dageavtobusnick
Copy link
Contributor

@dageavtobusnick dageavtobusnick commented Oct 4, 2024

Описание

Добавляет аналог есворда и даблы в виде welder sword.
welder sword
одноручное
урон в активном состоянии 30 ожогов
в неактивном 3 брута
запас топлива 50
блок 50
техи: combat=3;magnets=4;plasmatech=5
double-bladed welding sword
двуручное при активации
урон в активном состоянии 40 ожогов
в неактивном 5 брута
запас топлива 70
блок 75
техи: combat=5;magnets=5;plasmatech=6;
не отражает лазеры
Оба меча тратят единицу топлива при ударе, а так же тратят его со временем во включенном состоянии. Заправляются от фуелтанка, как сварка.
При объединении 2-x одноручных мечей получается двухклинковый вариант.
Спрайты предоставил: @radio_aktivny_chel

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

Щитспавн оружие. Предлога не нужна.

Демонстрация изменений

1
2
3

Тесты

Запустил. Выдал себе несколько мечей. И двойной и одинарный вариант работают, как задумано. Работа сварок и фуелтанка из-за правок не сломалась.

@github-actions github-actions bot added the DMI Affects DMI files label Oct 4, 2024
@PiotrTheTchaikowsky
Copy link
Contributor

Жаль что никто никогда не увидит это оружие из за щитспавна и боязни админов двигаться

@dageavtobusnick
Copy link
Contributor Author

Жаль что никто никогда не увидит это оружие из за щитспавна и боязни админов двигаться

Увы.

@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Oct 5, 2024
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Oct 5, 2024
@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Oct 13, 2024
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Oct 14, 2024
@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Oct 26, 2024
@github-actions github-actions bot added Merge Conflict This doesn't seem right and removed Merge Conflict This doesn't seem right labels Oct 29, 2024
@github-actions github-actions bot added Merge Conflict This doesn't seem right and removed Merge Conflict This doesn't seem right labels Nov 5, 2024
@github-actions github-actions bot added Merge Conflict This doesn't seem right and removed Merge Conflict This doesn't seem right labels Dec 14, 2024
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Dec 21, 2024
@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Dec 30, 2024
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Dec 31, 2024
@dageavtobusnick
Copy link
Contributor Author

dageavtobusnick commented Dec 31, 2024

@BeebBeebBoob Можно ревью или мерж этого несчастного ПР-а? С начала октября висит без каких-либо замечаний.

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/game/objects/items/tools/welder.dm Outdated Show resolved Hide resolved
code/game/objects/items/tools/welder.dm Outdated Show resolved Hide resolved
code/game/objects/items/tools/welder.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/cigs.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/welder_sword.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/welder_sword.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/welder_sword.dm Outdated Show resolved Hide resolved
code/game/objects/items/weapons/welder_sword.dm Outdated Show resolved Hide resolved
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.

Буквы нраица.

@PlayerUnknown14 PlayerUnknown14 added this pull request to the merge queue Jan 2, 2025
Merged via the queue into ss220-space:master220 with commit bde72a0 Jan 2, 2025
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
DMI Affects DMI files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants