-
Notifications
You must be signed in to change notification settings - Fork 69
Спонсорский шмот для сервисного отдела #159
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.
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
Open
bzzzbzzbz
wants to merge
19
commits into
ArcaneSS14:master
Choose a base branch
from
bzzzbzzbz:new_sponsor_clothes
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
cf23608
залил спрайты
bzzzbzzbz 8fc39b0
переделал шмот си в шмот нтр
bzzzbzzbz e679a6a
прототипы
bzzzbzzbz 4e74d7f
локализация
bzzzbzzbz e67316a
залил в лодауты
bzzzbzzbz b3e022f
мелкие фиксы от кролика
bzzzbzzbz 9892446
чуть не забыл про мету для микрофона
bzzzbzzbz 126cbd4
ещё фиксы от кролика
bzzzbzzbz bc63f7d
Merge branch 'master' into new_sponsor_clothes
UmbiMax 54b7271
фикс тестов
bzzzbzzbz b5c26ff
Merge branch 'master' into new_sponsor_clothes
UmbiMax 48a994e
Merge branch 'master' into new_sponsor_clothes
UmbiMax ac5b9bb
Merge branch 'master' into new_sponsor_clothes
bzzzbzzbz f523a6d
Merge branch 'master' into new_sponsor_clothes
bzzzbzzbz a52b099
фикс тестов
bzzzbzzbz fcc3c5f
фикс меток
bzzzbzzbz 7d54f14
Merge branch 'master' into new_sponsor_clothes
bzzzbzzbz 49e8a7b
Merge branch 'master' into new_sponsor_clothes
bzzzbzzbz b67a83f
Merge branch 'master' into new_sponsor_clothes
UmbiMax File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
5 changes: 5 additions & 0 deletions
5
Resources/Locale/ru-RU/_Arcane/entities/clothing/belt/belt.ftl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # Sponsor | ||
|
|
||
| ent-ClothingBeltServiceApron = фартук официанта | ||
| .desc = Маленький чёрный фартук. | ||
|
|
4 changes: 4 additions & 0 deletions
4
Resources/Locale/ru-RU/_Arcane/entities/clothing/eyes/glasses.ftl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| # Sponsor | ||
|
|
||
| ent-ClothingEyesBookWorm = очки книжного червя | ||
| .desc = Огромные и нелепые. Зато именно они позволяют тебе нормально видеть. |
4 changes: 4 additions & 0 deletions
4
Resources/Locale/ru-RU/_Arcane/entities/clothing/hands/gloves.ftl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,6 @@ | ||
| # Sponsor | ||
|
|
||
| ent-ClothingHandsQMLongGloves = длинные перчатки квартирмейстера | ||
| .desc = Чёрные перчатки, защищающие руки от порезов денежными купюрами. | ||
| ent-ClothingHandsMimeMittens = мимские митенки | ||
| .desc = Длинные полосатые перчатки без пальцев. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
Resources/Locale/ru-RU/_Arcane/entities/clothing/neck/specific.ftl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| # Sponsor | ||
|
|
||
| ent-ClothingOuterCleanerJumpsuit = комбинезон уборщика на лямках | ||
| .desc = Дешёвый комбинезон с большим карманом посередине. | ||
| ent-ClothingOuterCookApron = поварской фартук | ||
| .desc = Фартук повара. | ||
| ent-ClothingOuterMusicianJacket = кожанка музыканта | ||
| .desc = Rock you like a hurricane! | ||
| ent-ClothingOuterRadioHostJacket = пиджак радиоведущего | ||
| .desc = Never gonna give you up! | ||
| ent-ClothingOuterCow = мимикрический костюм | ||
| .desc = Муу. | ||
| ent-ClothingOuterServiceJacket = жилет сервисника | ||
| .desc = Чёрная жилетка. |
9 changes: 9 additions & 0 deletions
9
Resources/Locale/ru-RU/_Arcane/entities/clothing/shoes/shoes.ftl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,15 @@ | ||
| ent-ClothingShoesBeer = пивные тапочки | ||
| .desc = Пивные тапочки. | ||
|
|
||
| # Sponsor | ||
|
|
||
| ent-ClothingShoesOldFashionedMedical = старомодные туфли врача | ||
| .desc = Классические туфли эпохи возрождения. | ||
| ent-ClothingShoesQMBoots = ботинки квартирмейстера | ||
| .desc = Дорогие стильные чёрные ботинки. | ||
| ent-ClothingShoesJesters = ботинки шута | ||
| .desc = Старомодные туфли клоуна. | ||
| ent-ClothingShoesTwilightSparkle = ботинки книжного червя | ||
| .desc = Почему они такие высокие? | ||
| ent-ClothingShoesWorkerBoots = ботинки рабочего | ||
| .desc = Удобные ботинки, чтобы бегать по станции. |
5 changes: 5 additions & 0 deletions
5
Resources/Locale/ru-RU/_Arcane/entities/clothing/underwear/socks.ftl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,7 @@ | ||
| ent-ClothingSocksBeer = пивные чулки | ||
| .desc = Пивные чулки. | ||
|
|
||
| # Sponsor | ||
|
|
||
| ent-ClothingMimeStockings = чулки мима | ||
| .desc = Полосатые чулки. |
5 changes: 5 additions & 0 deletions
5
Resources/Locale/ru-RU/_Arcane/entities/clothing/underwear/underwear.ftl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,7 @@ | ||
| ent-ClothingUnderwearBeerPants = пивные трусы | ||
| .desc = Пивные трусы. | ||
|
|
||
| # Sponsor | ||
|
|
||
| ent-ClothingUnderwearJesterPants = портки шута | ||
| .desc = Портки шута. |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/_Arcane/entities/objects/specific/sponsor/microphone.ftl
|
bzzzbzzbz marked this conversation as resolved.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| ent-RadioHostMicrophone = микрофон | ||
| .desc = Петь и танцевать! |
22 changes: 22 additions & 0 deletions
22
Resources/Locale/ru-RU/_Arcane/loadouts/loadout-groups.ftl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| # Librarian | ||
| loadout-group-librarian-shoes = Библиотекарь, обувь | ||
| loadout-group-librarian-glasses = Библиотекарь, очки | ||
|
|
||
| # Clown | ||
| loadout-group-clown-underwear = Клоун, нижнее бельё | ||
|
|
||
| # Mime | ||
| loadout-group-mime-hands = Мим, руки | ||
| loadout-group-mime-socks = Мим, носки | ||
|
|
||
| # Musician | ||
| loadout-group-musician-shoes = Музыкант, обувь | ||
|
|
||
| # Radio Host | ||
| loadout-group-radiohost-outerclothing = Радиоведущий, верхняя одежда | ||
| loadout-group-radiohost-microphone = Радиоведущий, микрофон | ||
|
|
||
| # Service Worker | ||
| loadout-group-service-worker-jumpsuit = Сервисный работник, униформа | ||
| loadout-group-service-worker-shoes = Сервисный работник, обувь | ||
| loadout-group-service-worker-belt = Сервисный работник, пояс | ||
|
bzzzbzzbz marked this conversation as resolved.
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.