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

Новые турели #17 #97

Merged
merged 27 commits into from
Aug 22, 2024
Merged

Новые турели #17 #97

merged 27 commits into from
Aug 22, 2024

Conversation

homexp13
Copy link
Collaborator

@homexp13 homexp13 commented Aug 21, 2024 •
edited
Loading

Основные изменения

фидовские турки

от себя добавил апгрейд кит инжам для турели

Как это улучшит игру

Много красивых турелей, более разнообразные механики. Турели больше не продаются в коробках. Турели больше нельзя настакивать около друг-друга. Инженеры всегда получают бесплатную турель.

Ченджлог

:cl: fe-ed
add: Добавил новые турели.
del: Удалил старые турели и коробки.
balance: Инженеры получают 1 бесплатную турель.
soundadd: Новое звуковое сопровождение у турелей.
imageadd: Полный респрайт всех турелей/их магазинов.
/:cl:

@homexp13
Copy link
Collaborator Author

всё должно впринципе работать, фид просто конфликты не решил

@homexp13 homexp13 requested a review from Helg2 August 21, 2024 16:23
Helg2
Helg2 requested changes Aug 21, 2024
View reviewed changes
Copy link
Collaborator

@Helg2 Helg2 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Рассортируй .dmi турелей, а то это организационный пиздец

code/modules/projectiles/guns/sentries.dm Outdated Show resolved Hide resolved
code/modules/projectiles/guns/sentries.dm Outdated Show resolved Hide resolved
code/modules/projectiles/guns/sentries.dm Outdated Show resolved Hide resolved
code/modules/projectiles/guns/sentries.dm Outdated Show resolved Hide resolved
code/modules/projectiles/guns/sentries.dm Outdated Show resolved Hide resolved
code/modules/projectiles/sentries.dm Outdated Show resolved Hide resolved
code/modules/reqs/supplypacks.dm Outdated Show resolved Hide resolved
code/modules/reqs/supplypacks.dm Outdated Show resolved Hide resolved
code/modules/reqs/supplypacks.dm Outdated Show resolved Hide resolved
code/modules/projectiles/sentries.dm Show resolved Hide resolved
homexp13 and others added 6 commits August 21, 2024 20:04
@homexp13 @Helg2
Update code/modules/projectiles/guns/sentries.dm
ee413ec 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13 @Helg2
Update code/modules/projectiles/guns/sentries.dm
9a85f6f 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13 @Helg2
Update code/modules/reqs/supplypacks.dm
5925bb9 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13 @Helg2
Update code/modules/reqs/supplypacks.dm
d9e2bb6 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13 @Helg2
Update code/modules/projectiles/sentries.dm
2697cde 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13 @Helg2
Update code/modules/projectiles/sentries.dm
e09b07b 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
Helg2
Helg2 reviewed Aug 21, 2024
View reviewed changes
Copy link
Collaborator

@Helg2 Helg2 left a comment

Choose a reason for hiding this comment

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

Я не подписывался быть редактором xd

code/modules/reqs/supplypacks.dm Outdated Show resolved Hide resolved
code/modules/projectiles/sentries.dm Outdated Show resolved Hide resolved
code/modules/projectiles/sentries.dm Outdated Show resolved Hide resolved
code/modules/projectiles/sentries.dm Outdated Show resolved Hide resolved
code/modules/projectiles/sentries.dm Outdated Show resolved Hide resolved
code/modules/projectiles/sentries.dm Outdated Show resolved Hide resolved
code/modules/projectiles/sentries.dm Outdated Show resolved Hide resolved
homexp13 and others added 14 commits August 21, 2024 20:15
@homexp13
fid moment
23efead
@homexp13
doc
9404934
@homexp13 @Helg2
Update code/modules/projectiles/sentries.dm
148ed22 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13 @Helg2
Update code/modules/reqs/supplypacks.dm
72ddccd 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13 @Helg2
Update code/modules/reqs/supplypacks.dm
d938f0e 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13 @Helg2
Update code/modules/projectiles/sentries.dm
ec56403 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13 @Helg2
Update code/modules/projectiles/sentries.dm
b77364e 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13 @Helg2
Update code/modules/projectiles/sentries.dm
dfe1b37 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13 @Helg2
Update code/modules/projectiles/sentries.dm
1f3e923 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13 @Helg2
Update code/modules/projectiles/sentries.dm
92873be 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13 @Helg2
Update code/modules/projectiles/sentries.dm
2855311 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13
Merge branch 'turrets' of https://github.com/homexp13/RuTGMC-Reborn i…
a56d2af 
…nto turrets
@homexp13
set_on <--
5101775
@homexp13
icons
10ca61a
@homexp13
Copy link
Collaborator Author

перенёс патроны в ammo.dmi, иконки выбора турели в radial.dmi

@homexp13 homexp13 requested a review from Helg2 August 22, 2024 06:40
@Tatarla Tatarla added Marine Затронута сторона Маринов. Removal Удаление любого содержимого. Feature Добавление новых механик и прочего. Sprites Любые изменения спрайтов. labels Aug 22, 2024
Helg2
Helg2 approved these changes Aug 22, 2024
View reviewed changes
Copy link
Collaborator

@Helg2 Helg2 left a comment

Choose a reason for hiding this comment

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

Ну вроде норм

@Tatarla Tatarla merged commit 7979b15 into PMC-Unga-Marines:master Aug 22, 2024
3 of 6 checks passed
github-actions bot added a commit that referenced this pull request Aug 22, 2024
@github-actions
Automatic changelog for PR #97 [ci skip]
1933a5f
@Bemchina
Copy link

Вот бы турель дополнительную можно было купить очков за 30±(25 на улучшение турелей(50 на 2, так у инженера 5 поинтов останется на очки и 3 сишки)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Helg2 Helg2 Helg2 approved these changes

Assignees
No one assigned
Labels
Feature Добавление новых механик и прочего. Marine Затронута сторона Маринов. Removal Удаление любого содержимого. Sprites Любые изменения спрайтов.
Projects
None yet
Milestone
Подготовка к разработке
Development

Successfully merging this pull request may close these issues.
7 participants
@homexp13 @Bemchina @Helg2 @Tatarla @Pariah919 @Lumipharon @fe-ed