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

Novakid #170

Merged
merged 17 commits into from
Aug 6, 2024
Merged

Novakid #170

merged 17 commits into from
Aug 6, 2024

Conversation

AnderFan
Copy link
Contributor

@AnderFan AnderFan commented Aug 2, 2024

Перенесены новакиды, исправлена устаревшая строчка кода в системе их свечения.
Большое спасибо Шрёдьке и Коте за помощь.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 2, 2024

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

@github-actions github-actions bot added Merge Conflict Changes: Sprites Изменение спрайтов Changes: Localization Изменение локализации and removed Merge Conflict labels Aug 2, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 2, 2024 •
edited
Loading

RSI Diff Bot; head commit 2a3dd9d merging into 8813c92
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Mobs/Novakid/custom.rsi

State Old New Status
G_a Added
K Added
Nebula Added
braid Added
comet Added
cone_a Added
connect_a Added
constellation Added
crack Added
cross Added
crucifix Added
dot_a Added
dotline_a Added
dual Added
duality Added
eye Added
eyes_a Added
fame Added
gas_cloud Added
gaseous_avalanche Added
h Added
head_novakid_defolt Added
heart Added
house Added
indicator Added
light_shine Added
lima-a Added
linedot_a Added
little_light_starshine Added
little_star Added
lunar_day Added
meteoric_shower Added
milky_way Added
note Added
omega_a Added
plus Added
prism Added
rose Added
rune Added
shatter_a Added
solar_corona Added
squad Added
star_a Added
star_rain Added
starfall Added
starfire Added
sunshine Added
supernova Added
thrill Added
torso_novakid_defolt Added
triple Added
two-a Added
uncrucifix Added
universal_style Added
virgo Added
x Added
ye Added
zeta Added

Resources/Textures/ADT/Mobs/Novakid/parts.rsi

State Old New Status
full_f Added
full_m Added
head_f Added
head_m Added
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
torso_f Added
torso_m Added

Edit: diff updated after 2a3dd9d

@Schrodinger71 Schrodinger71 linked an issue Aug 2, 2024 that may be closed by this pull request
Перенос Новакидов #47
Closed
@Schrodinger71
Copy link
Collaborator

image

@AnderFan AnderFan closed this Aug 3, 2024
@AnderFan AnderFan reopened this Aug 3, 2024
@FrisKisDr
Copy link
Contributor

ХЕХЕ. Мои любимые поломки метаболизма

@AnderFan
Copy link
Contributor Author

AnderFan commented Aug 4, 2024

ПОбеда!

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 5, 2024

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

@AnderFan
Copy link
Contributor Author

AnderFan commented Aug 5, 2024

Гойда!

@Schrodinger71 Schrodinger71 requested a review from 1Stepka1 August 5, 2024 07:00
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 5, 2024

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

1Stepka1
1Stepka1 requested changes Aug 6, 2024
View reviewed changes
Copy link
Collaborator

@1Stepka1 1Stepka1 left a comment

Choose a reason for hiding this comment

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

Как-то многовато для одного пра правок,но надеюсь ты справишься и сделаешь нашу сборку лучше

Resources/Locale/ru-RU/ADT/Novakid/species.ftl Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

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

Это что за нагромождение всего? Посмотри как делают другие, и это точно не так как здесь сделано

Resources/Audio/ADT/Novakid/novakid_laugh01.ogg Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

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

Где attributions.yml в папке с этими звуками? Откуда они вообще?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Я не знаю, я не писал новакдов ;(

Copy link
Collaborator

@1Stepka1 1Stepka1 Aug 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Ну так узнай откуда взялись эти файлы вообще,там фрискиса спроси или иллюми или что-то ещё,если не сможешь то всегда можешь поменять на другие где уже известны авторы и лицензия

Content.Client/ADT/NovakidFeatures/NovakidFeaturesSystem.cs Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

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

Что за странные названия NovakidFeatures? У них что их несколько? Вижу что нет, лучше переименовать или сократить до просто Novakid

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/species/novakid.ftl Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

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

Ты куда это запихнул? Это же папка не с ADT контентом

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/novakid.ftl Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

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

Ты куда это запихнул? Это же папка не с ADT контентом

Resources/Prototypes/Reagents/gases.yml
Comment on lines +85 to +88
conditions:
- !type:OrganType
type: Novakid
shouldHave: false
Copy link
Collaborator

Choose a reason for hiding this comment

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

Добавить комментарий что эта часть была изменена нами

Resources/Prototypes/Reagents/gases.yml
Comment on lines +98 to +124
conditions:
- !type:OrganType
type: Novakid
shouldHave: false
- !type:ReagentThreshold
reagent: Plasma
min: 1
ignoreResistances: true
damage:
types:
Poison: 1
- !type:ChemVomit
probability: 0.12
conditions:
- !type:OrganType
type: Novakid
shouldHave: false
- !type:ReagentThreshold
reagent: Plasma
min: 0.8
- !type:HealthChange
conditions:
- !type:OrganType
type: Novakid
- !type:ReagentThreshold
reagent: Plasma
min: 0.6
Copy link
Collaborator

Choose a reason for hiding this comment

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

Здесь тоже

Resources/Prototypes/Reagents/gases.yml Outdated
Comment on lines 129 to 154
Blunt: -0.015
Slash: -0.015
Piercing: -0.015
Heat: -0.015
Poison: -0.012
- !type:GenericStatusEffect
conditions:
- !type:OrganType
type: Novakid
- !type:ReagentThreshold
reagent: Plasma
min: 1
key: SeeingRainbows
component: SeeingRainbows
type: Add
time: 5
refresh: false
- !type:Drunk
conditions:
- !type:OrganType
type: Novakid
shouldHave: false
- !type:ReagentThreshold
reagent: Plasma
min: 1
# Cant be added until I add metabolism effects on reagent removal
Copy link
Collaborator

Choose a reason for hiding this comment

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

И тут

Copy link
Contributor Author

Choose a reason for hiding this comment

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

не гойда..

@Schrodinger71 Schrodinger71 requested review from 1Stepka1 and removed request for 1Stepka1 August 6, 2024 11:05
@Schrodinger71 Schrodinger71 added Status: Awaiting Changes Ожидание изменений and removed Status: Needs Review labels Aug 6, 2024
@AnderFan AnderFan closed this Aug 6, 2024
@AnderFan AnderFan reopened this Aug 6, 2024
@Schrodinger71 Schrodinger71 requested a review from 1Stepka1 August 6, 2024 18:43
@github-actions github-actions bot added Status: Needs Review and removed Status: Awaiting Changes Ожидание изменений labels Aug 6, 2024
@Schrodinger71 Schrodinger71 added this pull request to the merge queue Aug 6, 2024
Merged via the queue into AdventureTimeSS14:master with commit 58bf7d2 Aug 6, 2024
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@1Stepka1 1Stepka1 1Stepka1 approved these changes

Assignees
No one assigned
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Перенос Новакидов
5 participants
@AnderFan @Schrodinger71 @FrisKisDr @1Stepka1 @Darkiich