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

Добавил трейт UwUканья #114

Merged
merged 4 commits into from
Jun 14, 2024
Merged

Добавил трейт UwUканья #114

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d41f3a
Добавил трейт UwUканья
pxc1984 Jun 13, 2024
20cc8ed
Merge remote-tracking branch 'upstream/master' into owoaccent
pxc1984 Jun 13, 2024
d03702f
review changes
pxc1984 Jun 14, 2024
4412634
Merge branch 'master' into owoaccent
pxc1984 Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/traits/traits.ftl
View file
Open in desktop
pxc1984 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,6 @@ trait-italian-desc = Mamma mia! You seem to have lived in space italy!

trait-colorblindness-name = Color blindness
trait-colorblindness-desc = You see the world differently than everyone else

trait-OwOAccent-name = OwO accent
trait-OwOAccent-desc = You just want to UwU
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/traits/traits.ftl
View file
Open in desktop
pxc1984 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,5 @@ trait-liar-desc = Вы с трудом заставляете себя гово
trait-colorblindness-name = Дальтонизм
trait-colorblindness-desc = Вы видите мир не так, как все.

trait-OwOAccent-name = Акцент OwO
trait-OwOAccent-desc = Как же ти хочешь пвосто все бвосить и сказать (・`ω´・)
11 changes: 11 additions & 0 deletions Resources/Prototypes/_Sunrise/Traits/speech.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: trait
id: OwOAccent
name: trait-OwOAccent-name
description: trait-OwOAccent-desc
category: SpeechTraits
cost: 1
blacklist:
components:
- BorgChassis
components:
- type: OwOAccent
Loading