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

729 #87

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

729 #87

wants to merge 4 commits into from
+233 −17

Conversation

themanyfaceddemon
Copy link
Contributor

Перенос AdventureTimeSS14/space_station#729

Conflicts:

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

no cl

kingmonkeyx and others added 2 commits July 1, 2024 16:45
@themanyfaceddemon
Added Manual Anomaly Finder (AdventureTimeSS14#40)
c0713de 
Добавлен Р.П.А. - ручной поисковик аномалий (by That_is_not_Sloni122). Пинпоинтер, что указывает на все сущности с компонентом `Anomaly`. Также он добавлен в шкаф научрука. А ещё добавлена триторская цель на него.

*P.S. сборка не проверялась. Тесты не проводились.*

Co-authored-by: kingmonkeyx <kingmonkeyx@email>
Reviewed-on: https://codeberg.org/NekoDar/SS14-Sirena/pulls/40
Co-authored-by: kingmonkeyx <kingmonkeyx@noreply.codeberg.org>
Co-committed-by: kingmonkeyx <kingmonkeyx@noreply.codeberg.org>
@Us3rn4me228 @themanyfaceddemon
фикс РПА и его респрайт
956b981
@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Jul 1, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 1, 2024 •
edited
Loading

RSI Diff Bot; head commit 0317eed merging into 20b970b
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Devices/pinpointer.rsi

State Old New Status
pinpointer-anomaly Added

Edit: diff updated after 0317eed

@Schrodinger71 Schrodinger71 linked an issue Jul 1, 2024 that may be closed by this pull request
Порт Р.П.А. с Сирены (729 PR) #99
Open
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@1Stepka1 1Stepka1 marked this pull request as draft August 3, 2024 19:24
@Darkiich Darkiich marked this pull request as ready for review August 5, 2024 11:06
@Darkiich Darkiich marked this pull request as draft August 5, 2024 11:11
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 7, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

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 Изменение спрайтов Merge Conflict No C#
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Порт Р.П.А. с Сирены (729 PR)
3 participants
@themanyfaceddemon @Us3rn4me228 @Darkiich