-
-
Notifications
You must be signed in to change notification settings - Fork 81
Добавление SCP 007 и SCP 527 #1064
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
666XxttimurkaxX666
wants to merge
12
commits into
space-sunrise:master
Choose a base branch
from
666XxttimurkaxX666:add-scp-527-scp-007
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 1 commit
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
3079199
Добавление SCP 007 и SCP 527
666XxttimurkaxX666 6f139d5
у
666XxttimurkaxX666 b7503da
f
666XxttimurkaxX666 64170d5
Update scp527.yml
666XxttimurkaxX666 63f3553
они тоже боятся
666XxttimurkaxX666 b862210
у
666XxttimurkaxX666 74d755e
Update base_scp.yml
666XxttimurkaxX666 c2ba3ea
Update base_scp.yml
666XxttimurkaxX666 2105741
Merge branch 'master' into add-scp-527-scp-007
666XxttimurkaxX666 3378ba5
респрайт рыбы
666XxttimurkaxX666 e44e458
Merge branch 'master' into add-scp-527-scp-007
WardexOfficial bbfc8eb
Merge branch 'master' into add-scp-527-scp-007
WardexOfficial 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
There are no files selected for viewing
1 change: 1 addition & 0 deletions
1
Resources/Locale/en-US/_prototypes/_scp/entities/mobs/player/scp/main/scp007.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 @@ | ||
| ent-Scp007 = ??? | ||
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
5 changes: 5 additions & 0 deletions
5
Resources/Locale/en-US/_prototypes/_scp/entities/objects/specific/wondertainmentPapers.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 @@ | ||
| ent-Scp527PaperCollection = collection paper | ||
| .desc = A congratulatory paper about the discovery of a certain "Little Mister". | ||
|
|
||
| ent-Scp1508PaperFlyer = children's flyer | ||
| .desc = An advertisement for "Mikey the Janitor-Friend©". Judging by the text, this thing will clean up after you. |
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
33 changes: 33 additions & 0 deletions
33
Resources/Locale/en-US/_strings/_scp/paper/wondertainmentPapers.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,33 @@ | ||
| info-paper-scp-527-collection = | ||
| Wow! You've just found yourself your very own Little Mister, a limited edition collection from Dr. Wondertainment! | ||
|
|
||
| Find them all and become Mr. Collector!! | ||
|
|
||
| 01. Mr. Chameleon | ||
| 02. Mr. Headless | ||
| 03. Mr. Laugh | ||
| 04. Mr. Forgetful | ||
| 05. Mr. Shapey | ||
| 06. Mr. Soap | ||
| 07. Mr. Hungry | ||
| 08. Mr. Brass | ||
| 09. Mr. Hot | ||
| 10. Ms. Sweetie | ||
| 11. Mr. Life and Mr. Death | ||
| 12. Mr. Fish < | ||
| 13. Mr. Moon | ||
| 14. Mr. Redd (discontinued) | ||
| 15. Mr. Money | ||
| 16. Mr. Lost | ||
| 17. Mr. Lie | ||
| 18. Mr. Mad | ||
| 19. Mr. Scary | ||
| 20. Mr. Stripes | ||
|
|
||
| info-paper-scp-1508-flyer = | ||
| HEY, KIDDOES! | ||
| Has doing chores around the house turned into a total drag? | ||
| Does your mom yell at you so much to get your room cleaned that you’ve started calling her a witch? | ||
| Well, my friends, now a brand-new buddy from DR. WONDERTAINMENT©, creator of General Beep and Robo-Dude, is here to save the day!! His name is Mikey the Janitor-Friend©! He can do everything your mom and dad want you to do, while you can just keep on having fun with your pals! | ||
| And while you’re slacking off, check out the all-new WONDER-CATA-LOG-TABULOUS©-2003! With our latest toys, it’s the best way to spend all that newfound free time! | ||
| Batteries not included. If your Mikey the Janitor-Friend© begins to play, shirk work, draw funny pictures, or simply performs poorly, send him right back to us for reconditioning! Just pay for shipping and handling. |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| ghost-role-information-scp007-name = SCP-007 | ||
| ghost-role-information-scp007-description = You are an abnormal person with a miniature copy of the Earth in stomach area. | ||
|
666XxttimurkaxX666 marked this conversation as resolved.
Outdated
|
||
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 @@ | ||
| ghost-role-information-scp527-name = SCP-527 | ||
| ghost-role-information-scp527-description = You are an unpretentious intelligent object, with no special features except for your fish head. |
1 change: 1 addition & 0 deletions
1
Resources/Locale/ru-RU/_prototypes/_scp/entities/mobs/player/scp/main/scp007.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 @@ | ||
| ent-Scp007 = ??? | ||
|
666XxttimurkaxX666 marked this conversation as resolved.
|
||
1 change: 1 addition & 0 deletions
1
Resources/Locale/ru-RU/_prototypes/_scp/entities/mobs/player/scp/main/scp527.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 @@ | ||
| ent-Scp527 = ??? | ||
|
666XxttimurkaxX666 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
5 changes: 5 additions & 0 deletions
5
Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/specific/wondertainmentPapers.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 @@ | ||
| ent-Scp527PaperCollection = коллекционная бумага | ||
| .desc = Поздравительная бумага о нахождении некого "Маленького Господина". | ||
|
|
||
| ent-Scp1508PaperFlyer = детский вкладыш | ||
| .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
33 changes: 33 additions & 0 deletions
33
Resources/Locale/ru-RU/_strings/_scp/paper/wondertainmentPapers.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,33 @@ | ||
| info-paper-scp-527-collection = | ||
| Вот это да! Ты только что нашел своего Маленького Господина из малотиражной коллекции Доктора Развлечудова! | ||
|
|
||
| Отыщи их всех и стань Господином Коллекционером!! | ||
|
|
||
| 01. Г-н Хамелеон | ||
| 02. Г-н Безголовый | ||
| 03. Г-н Смех | ||
| 04. Г-н Забывчивый | ||
| 05. Г-н Образ | ||
| 06. Г-н Мыло | ||
| 07. Г-н Голодный | ||
| 08. Г-н Латунь | ||
| 09. Г-н Горячий | ||
| 10. Г-жа Сладость | ||
| 11. Г-н Жизнь и г-н Смерть | ||
| 12. Г-н Рыба < | ||
| 13. Г-н Луна | ||
| 14. Г-н Редд (отменён) | ||
| 15. Г-н Деньги | ||
| 16. Г-н Потерянный | ||
| 17. Г-н Ложь | ||
| 18. Г-н Безумец | ||
| 19. Г-н Жуть | ||
| 20. Г-н Полосатый | ||
|
|
||
| info-paper-scp-1508-flyer = | ||
| ЭЙ, ДЕТИШКИ! | ||
| Работа по дому превратилась в жуткую обузу? | ||
| Чтобы вы привели в порядок свою комнату, мама до того кричит на вас, что вы назвали её ведьмой? | ||
| Что ж, друзья мои, теперь вам на помощь придёт новый друг от ДОКТОРА РАЗВЛЕЧУДОВА©, создателя генерала Бипа и Робо-Чувака!! Его зовут Майки, Друг-Уборщик©! Он может делать всё, что хотят от вас мама и папа, а можете продолжать веселиться с друзьями! | ||
|
666XxttimurkaxX666 marked this conversation as resolved.
|
||
| И пока вы отдыхаете, проверьте новый РАЗВЛЕ-КАТА-ЧУДНЫЙ-ЛОГ©-2003! Благодаря нашим новым игрушкам, это лучший способ потратить полученное свободное от работы время! | ||
| Батарейки в комплект не входят. Если ваш Майки, Друг-Уборщик© начинает играть, отлынивать от работы, рисовать смешные картинки или просто плохо справляется, пришлите его обратно к нам для восстановления! Просто заплатите за доставку и ремонт. | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| ghost-role-information-scp007-name = SCP-007 | ||
| ghost-role-information-scp007-description = Вы аномальный человек с миниатюрной копией Земли в области живота. |
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 @@ | ||
| ghost-role-information-scp527-name = SCP-527 | ||
| ghost-role-information-scp527-description = Вы неприхотливый разумный объект, не имеющий никаких особенностей за исключением рыбьей головы. |
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
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.