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

Возможность стать антагом за атмоса и добавил МЩ Ревизору или кто он там #327

Merged
merged 2 commits into from
Aug 21, 2024
Merged

Возможность стать антагом за атмоса и добавил МЩ Ревизору или кто он там #327

merged 2 commits into from
Aug 21, 2024

Conversation

Darkiich
Copy link
Contributor

@Darkiich Darkiich commented Aug 21, 2024 •
edited
Loading

Описание PR

Медиа

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

🆑 Дубик

  • add: НТ не купило у атмосферных техников Фрезон, поэтому некоторые из них примкнули к синдикату

@github-actions github-actions bot added the No C# label Aug 21, 2024
@Darkiich Darkiich changed the title Возможность стать антагом за атмоса и добавил МЩ Ревизору или кто это там Возможность стать антагом за атмоса и добавил МЩ Ревизору или кто он там Aug 21, 2024
@Darkiich Darkiich self-assigned this Aug 21, 2024
@Darkiich Darkiich requested a review from Bolper August 21, 2024 17:17
Bolper
Bolper approved these changes Aug 21, 2024
View reviewed changes
Copy link
Contributor

@Bolper Bolper left a comment

Choose a reason for hiding this comment

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

Всё ок. И да, помарочка.
Screenshot_2024-08-21-20-19-46-620_com github android

@Darkiich Darkiich added this pull request to the merge queue Aug 21, 2024
Merged via the queue into AdventureTimeSS14:master with commit e46e33c Aug 21, 2024
16 checks passed
@Darkiich Darkiich deleted the mch branch August 21, 2024 18:13
Ratyyy added a commit that referenced this pull request Sep 11, 2024
@Ratyyy
Adding functionality for plasma cutters (#327)
8f29193 
* Plasma-recharge system for cutters

* Cutters rebalance

* Asteroid rock fix

* Remove ATLAS from pull, yea (#326)

* How did it get here?

* Shit happens

* Cutters system upgrade

* Add funny shape for cutters (+RP)

* Adv cutter recipe & craft nerf

* "Ion cutters" are no more!

* "shitty code" is now less "shitty"

* "Equipment" to "Weapon"

* Clear code

* Add `technologyPrerequisites:`

* I don't know how this happen

* `AddCharge` raises localevent now
# Conflicts:
#	Resources/Locale/en-US/research/technologies.ftl
#	Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl
#	Resources/Locale/ru-RU/research/technologies.ftl
#	Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Recipes/Lathes/security.yml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Schrodinger71 Schrodinger71 Schrodinger71 left review comments

@Bolper Bolper Bolper approved these changes

@1Stepka1 1Stepka1 Awaiting requested review from 1Stepka1

Assignees

@Darkiich Darkiich

Labels
No C# Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Darkiich @Schrodinger71 @Bolper