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

3р3тики #780

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

3р3тики #780

wants to merge 16 commits into from
+775 −410

Conversation

Ratyyy
Copy link
Collaborator

@Ratyyy Ratyyy commented Nov 11, 2024

Описание PR

Goob-Station/Goob-Station#795
перенесла этот пр и добавила локаль

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

Ссылка на публикацию в Discord

надо не забывать обновлять

Чейнджлог

🆑 Ratyyy

  • add: Еретики начали использовать кодексы цикатрикс, чтобы использовать заклинания.
  • add: Еретики изобрели ритуал создания зловещей фляги, способной исцелять.
  • fix: Притяжение пути пустоты стало куда слабее.
  • tweak: Внезапно, хватка мансуса начала светится, как и кодекс цикатрикс.

@Ratyyy
hotfix
9bda467
@Ratyyy
Merge branch 'master' of https://github.com/AdventureTimeSS14/space_s…
a12230f 
…tation_ADT

# Conflicts:
#	Resources/Prototypes/ADT/Datasets/tags.yml
#	Resources/Prototypes/ADT/tags.yml
@Ratyyy
Merge branch 'master' of https://github.com/AdventureTimeSS14/space_s…
91d1857 
…tation_ADT
@Ratyyy
Merge branch 'master' of https://github.com/AdventureTimeSS14/space_s…
861f026 
…tation_ADT
@Ratyyy
добавление кило и мапфиксы крысовых карт
9edf1c4
@Ratyyy
Merge branch 'master' of https://github.com/AdventureTimeSS14/space_s…
135fc71 
…tation_ADT

# Conflicts:
#	Resources/Maps/ADTMaps/ADTStations/adt_kilostation.yml
#	Resources/Prototypes/ADT/Maps/ADTMaps/adt_kilo.yml
@Ratyyy
обновление еретиков номер 2
7196b28 
* Radial menu

* fix attributions

* aaasa

* fixes

* sprites

* hi hi hi ha GRRR
# Conflicts:
#	Content.Shared/ADT/Heretic/Components/HereticRitualEvents.cs
@Ratyyy
Merge branch 'master' of https://github.com/AdventureTimeSS14/space_s…
ce18dab 
…tation_ADT

# Conflicts:
#	Content.Server/ADT/Heretic/EntitySystems/HereticRitualSystem.cs
#	Resources/Prototypes/ADT/Heretic/Heretic/heretic_rituals.yml
#	Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@Ratyyy
Merge branch 'master' of https://github.com/AdventureTimeSS14/space_s…
698b4a0 
…tation_ADT
@Ratyyy
Merge branch 'master' of https://github.com/AdventureTimeSS14/space_s…
40b6c81 
…tation_ADT
@Ratyyy
Merge branch 'master' of https://github.com/AdventureTimeSS14/space_s…
63201d0 
…tation_ADT
@Ratyyy
Merge branch 'master' of https://github.com/AdventureTimeSS14/space_s…
faf61d9 
…tation_ADT
@Ratyyy
еретики: часть 2
6c5470b
@github-actions github-actions bot added Changes: UI Изменение интерфейса Changes: Sprites Изменение спрайтов Changes: Localization Изменение локализации labels Nov 11, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 11, 2024 •
edited
Loading

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

Resources/Textures/ADT/Heretic/book.rsi

State Old New Status
icon-on Added
icon Added
icon_closing Added
icon_opening Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Heretic/items.rsi

State Old New Status
clarity Added
crucible Added
crucible_empty Added
crucible_soul Added
eldritch_flask Added
eye_medalion Added
living_heart Added
marshal Added
moon_amulette Added
ogbook Added
rune_carver Added
rusty_medalion Added
soul_bottle_empty Added
soul_bottle_full Added
spacehand_left Added
spacehand_right Added

Edit: diff updated after 731882d

@jungarikjan
Copy link
Contributor

Пожалуйста не мерджить пока я не исправлю локаль

@jungarikjan jungarikjan added the Status: Awaiting Changes Ожидание изменений label Nov 11, 2024
@jungarikjan
Copy link
Contributor

Еду домой с учебы, сегодня локаль пофикшу

@jungarikjan
Copy link
Contributor

Готово, спасибо большое за ожидание. <3

@jungarikjan jungarikjan removed the Status: Awaiting Changes Ожидание изменений label Nov 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов Changes: UI Изменение интерфейса
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Ratyyy @jungarikjan