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

Ивент Cult of the Lamb #527

Merged
merged 8 commits into from
Mar 28, 2024
Merged

Ивент Cult of the Lamb #527

merged 8 commits into from
Mar 28, 2024

Conversation

Schrodinger71
Copy link
Collaborator

@Schrodinger71 Schrodinger71 commented Mar 26, 2024 •
edited
Loading

Описание PR

Изменения

🆑 Schrodinger71

  • add: Добавлены 3 рандом культиста с похожим снаряжением одетые в сэт чумного доктора (Костяной клинок, Копьё, Прочное Копьё).
  • add: Декаль от взрывной руны.
  • add: Босс Моргот(Клувень)
  • add: Невидимые светильники.
  • fix: - type: Firestarter исправлен и теперь обладатель данного компонента не поджигает сам себя. Чиним за визардами. Спасибо @FaDeOkno 💖

image

Проверки

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

@Schrodinger71 Schrodinger71 self-assigned this Mar 26, 2024
@github-actions github-actions bot added the No C# label Mar 26, 2024
@Schrodinger71 Schrodinger71 added DO NOT MERGE Не мерджить and removed No C# labels Mar 26, 2024
@github-actions github-actions bot added the No C# label Mar 27, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

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

Resources/Textures/ADT/Objects/Misc/empity.rsi

State Old New Status
icon Added

Edit: diff updated after 1ecb1f8

Schrodinger71
Schrodinger71 commented Mar 28, 2024
View reviewed changes
Resources/Prototypes/ADT/Entities/Mobs/player/humanoid.yml Outdated
projAction: CompActionShoot
prototype: BulletKinetic
- type: TeleportAct
projAction: CompActionTeleport
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

это чинить....МХМ.

@Schrodinger71 Schrodinger71 removed the DO NOT MERGE Не мерджить label Mar 28, 2024
@Schrodinger71 Schrodinger71 merged commit 9174e26 into AdventureTimeSS14:master Mar 28, 2024
12 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FaDeOkno FaDeOkno FaDeOkno approved these changes

@PyotrIgn PyotrIgn PyotrIgn approved these changes

Assignees

@Schrodinger71 Schrodinger71

Labels
Changes: Localization Changes: Sprites
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Schrodinger71 @PyotrIgn @FaDeOkno