diff --git a/Resources/Locale/en-US/_prototypes/_scp/entities/mobs/player/scp/main/scp007.ftl b/Resources/Locale/en-US/_prototypes/_scp/entities/mobs/player/scp/main/scp007.ftl new file mode 100644 index 00000000000..a153ca5280b --- /dev/null +++ b/Resources/Locale/en-US/_prototypes/_scp/entities/mobs/player/scp/main/scp007.ftl @@ -0,0 +1 @@ +ent-Scp007 = ??? diff --git a/Resources/Locale/en-US/_prototypes/_scp/entities/objects/scpparts/parts.ftl b/Resources/Locale/en-US/_prototypes/_scp/entities/objects/scpparts/parts.ftl index 3bbba876a78..911e802b2de 100644 --- a/Resources/Locale/en-US/_prototypes/_scp/entities/objects/scpparts/parts.ftl +++ b/Resources/Locale/en-US/_prototypes/_scp/entities/objects/scpparts/parts.ftl @@ -16,3 +16,5 @@ ent-Scp096Photo = strange photograph .desc = A small photograph in which the contents are almost indistinguishable. You can barely recognize the outline of a humanoid silhouette. ent-Scp019GlassShard = ceramic shard .desc = Ceramic shard with recognizable ancient Greek style and decor. +ent-ScpDirtLump = lump of dirt + .desc = A small pile of soil. diff --git a/Resources/Locale/en-US/_prototypes/_scp/entities/objects/specific/wondertainmentPapers.ftl b/Resources/Locale/en-US/_prototypes/_scp/entities/objects/specific/wondertainmentPapers.ftl new file mode 100644 index 00000000000..1511523ee2c --- /dev/null +++ b/Resources/Locale/en-US/_prototypes/_scp/entities/objects/specific/wondertainmentPapers.ftl @@ -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. diff --git a/Resources/Locale/en-US/_prototypes/_scp/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/en-US/_prototypes/_scp/entities/structures/wallmounts/signs/posters.ftl index 5f480cca4ac..cb71cbc435c 100644 --- a/Resources/Locale/en-US/_prototypes/_scp/entities/structures/wallmounts/signs/posters.ftl +++ b/Resources/Locale/en-US/_prototypes/_scp/entities/structures/wallmounts/signs/posters.ftl @@ -196,6 +196,8 @@ ent-PosterSCP457 = "SCP-457" poster .desc = Information poster for SCP-457. ent-PosterSCP500 = "SCP-500" poster .desc = Information poster for SCP-500. +ent-PosterSCP527 = "SCP-527" poster + .desc = Information poster for SCP-527. ent-PosterSCP969 = "SCP-969" poster .desc = Information poster for SCP-969. ent-PosterSCP999 = "SCP-999" poster diff --git a/Resources/Locale/en-US/_prototypes/_scp/entities/structures/wallmounts/signs/signs.ftl b/Resources/Locale/en-US/_prototypes/_scp/entities/structures/wallmounts/signs/signs.ftl index ca760812108..3be3aa4443a 100644 --- a/Resources/Locale/en-US/_prototypes/_scp/entities/structures/wallmounts/signs/signs.ftl +++ b/Resources/Locale/en-US/_prototypes/_scp/entities/structures/wallmounts/signs/signs.ftl @@ -22,6 +22,8 @@ ent-SignDirectionalScp330 = "SCP-330" sign .desc = { ent-BaseSignDirectionalScp.desc } ent-SignDirectionalScp500 = "SCP-500" sign .desc = { ent-BaseSignDirectionalScp.desc } +ent-SignDirectionalScp527 = "SCP-527" sign + .desc = { ent-BaseSignDirectionalScp.desc } ent-SignDirectionalScp612 = "SCP-612" sign .desc = { ent-BaseSignDirectionalScp.desc } ent-SignDirectionalScp939 = "SCP-939" sign diff --git a/Resources/Locale/en-US/_strings/_scp/paper/wondertainmentPapers.ftl b/Resources/Locale/en-US/_strings/_scp/paper/wondertainmentPapers.ftl new file mode 100644 index 00000000000..2caf17d55c1 --- /dev/null +++ b/Resources/Locale/en-US/_strings/_scp/paper/wondertainmentPapers.ftl @@ -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. \ No newline at end of file diff --git a/Resources/Locale/en-US/_strings/_scp/roles/scp.ftl b/Resources/Locale/en-US/_strings/_scp/roles/scp.ftl index 11309a0f33f..e093f70826d 100644 --- a/Resources/Locale/en-US/_strings/_scp/roles/scp.ftl +++ b/Resources/Locale/en-US/_strings/_scp/roles/scp.ftl @@ -13,7 +13,11 @@ job-description-scp939 = Sightless, predatory creatures, attracting victims with job-name-scp999 = SCP-999 "The Tickle Monster" job-description-scp999 = A friendly, gelatinous entity that causes boundless joy and laughter. Able to relieve stress and cure depression. +job-name-scp007 = SCP-007 «Abdominal Planet» +job-description-scp007 = A good young man with a replica of the Earth in his stomach. He is completely indifferent to this. job-name-scp0192 = SCP-019-2 «The Monster Pot» job-description-scp0192 = An extremely aggressive creature that emerges from SCP-019. +job-name-scp527 = SCP-527 «Mr. Fish» +job-description-scp527 = Mr. Fish - one of the Little Misters in Dr. Wondertainment's collection. He has a fish head instead of a human head... That's all. job-name-scp1589 = SCP-1589 «Roman Anthropophagus» job-description-scp1589 = An obedient and calm giant who carries out any orders. diff --git a/Resources/Locale/en-US/_strings/_scp/scp/scp007.ftl b/Resources/Locale/en-US/_strings/_scp/scp/scp007.ftl new file mode 100644 index 00000000000..794e6571a13 --- /dev/null +++ b/Resources/Locale/en-US/_strings/_scp/scp/scp007.ftl @@ -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 the stomach area. diff --git a/Resources/Locale/en-US/_strings/_scp/scp/scp527.ftl b/Resources/Locale/en-US/_strings/_scp/scp/scp527.ftl new file mode 100644 index 00000000000..dce1def9057 --- /dev/null +++ b/Resources/Locale/en-US/_strings/_scp/scp/scp527.ftl @@ -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. diff --git a/Resources/Locale/ru-RU/_prototypes/_scp/entities/mobs/player/scp/main/scp007.ftl b/Resources/Locale/ru-RU/_prototypes/_scp/entities/mobs/player/scp/main/scp007.ftl new file mode 100644 index 00000000000..a153ca5280b --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_scp/entities/mobs/player/scp/main/scp007.ftl @@ -0,0 +1 @@ +ent-Scp007 = ??? diff --git a/Resources/Locale/ru-RU/_prototypes/_scp/entities/mobs/player/scp/main/scp527.ftl b/Resources/Locale/ru-RU/_prototypes/_scp/entities/mobs/player/scp/main/scp527.ftl new file mode 100644 index 00000000000..5e2cf9a0814 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_scp/entities/mobs/player/scp/main/scp527.ftl @@ -0,0 +1 @@ +ent-Scp527 = ??? diff --git a/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/scpparts/parts.ftl b/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/scpparts/parts.ftl index c40537cb642..c54b47204f9 100644 --- a/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/scpparts/parts.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/scpparts/parts.ftl @@ -16,3 +16,5 @@ ent-Scp096Photo = странная фотография .desc = Небольшая фотография, на которой практически неразличимо содержимое. ent-Scp019GlassShard = керамический осколок .desc = Керамический осколок с узнаваемым Древнегреческим стилем и декором. +ent-ScpDirtLump = комок грязи + .desc = Небольшая горсть почвы. diff --git a/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/specific/wondertainmentPapers.ftl b/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/specific/wondertainmentPapers.ftl new file mode 100644 index 00000000000..af154b5d8a1 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/specific/wondertainmentPapers.ftl @@ -0,0 +1,5 @@ +ent-Scp527PaperCollection = коллекционная бумага + .desc = Поздравительная бумага о нахождении некого "Маленького Господина". + +ent-Scp1508PaperFlyer = детский вкладыш + .desc = Реклама для "Майки, Друг-Уборщик©". Судя по тексту, эта игрушка будет убираться за тобой. diff --git a/Resources/Locale/ru-RU/_prototypes/_scp/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/ru-RU/_prototypes/_scp/entities/structures/wallmounts/signs/posters.ftl index 647db886c17..aaff6d7e759 100644 --- a/Resources/Locale/ru-RU/_prototypes/_scp/entities/structures/wallmounts/signs/posters.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_scp/entities/structures/wallmounts/signs/posters.ftl @@ -168,6 +168,8 @@ ent-PosterScpContainmentRoomBase = { ent-PosterBase } .desc = { ent-PosterBase.desc } ent-PosterSCP005 = плакат «SCP-005» .desc = Информационный плакат SCP-005 +ent-PosterSCP007 = плакат «SCP-007» + .desc = Информационный плакат SCP-007 ent-PosterScp012 = плакат «SCP-012» .desc = Информационный плакат SCP-012 ent-PosterScp018 = плакат «SCP-018» @@ -210,6 +212,8 @@ ent-PosterSCP457 = плакат «SCP-457» .desc = Информационный плакат SCP-457 ent-PosterSCP500 = плакат «SCP-500» .desc = Информационный плакат SCP-500 +ent-PosterSCP527 = плакат «SCP-527» + .desc = Информационный плакат SCP-527 ent-PosterSCP714 = плакат «SCP-714» .desc = Информационный плакат SCP-714 ent-PosterSCP969 = плакат «SCP-969» diff --git a/Resources/Locale/ru-RU/_prototypes/_scp/entities/structures/wallmounts/signs/signs.ftl b/Resources/Locale/ru-RU/_prototypes/_scp/entities/structures/wallmounts/signs/signs.ftl index 5a14380bbd0..102cd0f29b3 100644 --- a/Resources/Locale/ru-RU/_prototypes/_scp/entities/structures/wallmounts/signs/signs.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_scp/entities/structures/wallmounts/signs/signs.ftl @@ -4,6 +4,8 @@ ent-BaseSignDirectionalScp = направленный указатель .desc = Показывает в сторону, в которую не стоит ходить без четкого понимая, куда это приведет. ent-SignDirectionalScp005 = указатель «SCP-005» .desc = { ent-BaseSignDirectionalScp.desc } +ent-SignDirectionalScp007 = указатель «SCP-007» + .desc = { ent-BaseSignDirectionalScp.desc } ent-SignDirectionalScp012 = указатель «SCP-012» .desc = { ent-BaseSignDirectionalScp.desc } ent-SignDirectionalScp018 = указатель «SCP-018» @@ -36,6 +38,8 @@ ent-SignDirectionalScp427 = указатель «SCP-427» .desc = { ent-BaseSignDirectionalScp.desc } ent-SignDirectionalScp500 = указатель «SCP-500» .desc = { ent-BaseSignDirectionalScp.desc } +ent-SignDirectionalScp527 = указатель «SCP-527» + .desc = { ent-BaseSignDirectionalScp.desc } ent-SignDirectionalScp612 = указатель «SCP-612» .desc = { ent-BaseSignDirectionalScp.desc } ent-SignDirectionalScp714 = указатель «SCP-714» diff --git a/Resources/Locale/ru-RU/_strings/_scp/paper/wondertainmentPapers.ftl b/Resources/Locale/ru-RU/_strings/_scp/paper/wondertainmentPapers.ftl new file mode 100644 index 00000000000..f619f97807c --- /dev/null +++ b/Resources/Locale/ru-RU/_strings/_scp/paper/wondertainmentPapers.ftl @@ -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 = + ЭЙ, ДЕТИШКИ! + Работа по дому превратилась в жуткую обузу? + Чтобы вы привели в порядок свою комнату, мама до того кричит на вас, что вы назвали её ведьмой? + Что ж, друзья мои, теперь вам на помощь придёт новый друг от ДОКТОРА РАЗВЛЕЧУДОВА©, создателя генерала Бипа и Робо-Чувака!! Его зовут Майки, Друг-Уборщик©! Он может делать всё, что хотят от вас мама и папа, а можете продолжать веселиться с друзьями! + И пока вы отдыхаете, проверьте новый РАЗВЛЕ-КАТА-ЧУДНЫЙ-ЛОГ©-2003! Благодаря нашим новым игрушкам, это лучший способ потратить полученное свободное от работы время! + Батарейки в комплект не входят. Если ваш Майки, Друг-Уборщик© начинает играть, отлынивать от работы, рисовать смешные картинки или просто плохо справляется, пришлите его обратно к нам для восстановления! Просто заплатите за доставку и ремонт. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_strings/_scp/roles/scp.ftl b/Resources/Locale/ru-RU/_strings/_scp/roles/scp.ftl index 895b8596954..cea0b16f02c 100644 --- a/Resources/Locale/ru-RU/_strings/_scp/roles/scp.ftl +++ b/Resources/Locale/ru-RU/_strings/_scp/roles/scp.ftl @@ -13,10 +13,14 @@ job-description-scp939 = Хищные существа без глаз, прив job-name-scp999 = SCP-999 «Щекоточный монстр» job-description-scp999 = Дружелюбная студнеобразная сущность, вызывающая безграничную радость и смех. Способен снимать стресс и лечить депрессию. +job-name-scp007 = SCP-007 «Планета в животе» +job-description-scp007 = Добродушный молодой мужчина с копией Земли в области живота. Он совершенно безразличен к этому. job-name-scp0192 = SCP-019-2 «Чудовищная ваза» job-description-scp0192 = Чрезвычайно агрессивное существо, вылезающее из SCP-019. job-name-scp131 = SCP-131 «Каплеглазики» job-description-scp131 = Небольшие безобидные механические существа, обладающие большим выделяющимся глазом. +job-name-scp527 = SCP-527 «Г-н Рыба» +job-description-scp527 = Г-н Рыба - один из Маленьких Господ в коллекции Доктора Развлечудова. Вместо человеческой головы имеет рыбью голову... Это всё. job-name-scp1508 = SCP-1508 «Майки, Друг-Уборщик» job-description-scp1508 = Верный картонный друг, который старается помогать людям. job-name-scp1589 = SCP-1589 «Древнеримский голем» diff --git a/Resources/Locale/ru-RU/_strings/_scp/scp/scp007.ftl b/Resources/Locale/ru-RU/_strings/_scp/scp/scp007.ftl new file mode 100644 index 00000000000..e353f835a63 --- /dev/null +++ b/Resources/Locale/ru-RU/_strings/_scp/scp/scp007.ftl @@ -0,0 +1,2 @@ +ghost-role-information-scp007-name = SCP-007 +ghost-role-information-scp007-description = Вы аномальный человек с миниатюрной копией Земли в области живота. diff --git a/Resources/Locale/ru-RU/_strings/_scp/scp/scp527.ftl b/Resources/Locale/ru-RU/_strings/_scp/scp/scp527.ftl new file mode 100644 index 00000000000..3cda2db15f2 --- /dev/null +++ b/Resources/Locale/ru-RU/_strings/_scp/scp/scp527.ftl @@ -0,0 +1,2 @@ +ghost-role-information-scp527-name = SCP-527 +ghost-role-information-scp527-description = Вы неприхотливый разумный объект, не имеющий никаких особенностей за исключением рыбьей головы. diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml index 57e55a03388..4bc31884f9e 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml @@ -142,6 +142,21 @@ - type: PhysicalComposition materialComposition: Steel: 100 + # Fire edit start - исследования сцп + - type: ScpInteractTool + delay: 2 + cooldown: 600 # 5 минут + cooldownMessage: scp-interact-time-left + event: !type:ScpSpawnInteractDoAfterEvent + toSpawn: ScpDirtLump + sound: /Audio/Effects/break_stone.ogg # TODO: Звук + whitelist: + tags: + - Scp124 + - type: GuideHelp + guides: + - ScpResearchAdvanced + # Fire edit end - type: entity name: plant bag diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml index a54bcf983d7..f9d56725435 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml @@ -210,6 +210,21 @@ path: /Audio/_Sunrise/Medical/Surgery/retractor1.ogg endSound: path: /Audio/_Sunrise/Medical/Surgery/retractor2.ogg + # Fire edit start - исследования сцп + - type: ScpInteractTool + delay: 30 + cooldown: 600 # 5 минут + cooldownMessage: scp-interact-time-left + event: !type:ScpSpawnInteractDoAfterEvent + toSpawn: ScpDirtLump + sound: /Audio/Effects/break_stone.ogg # TODO: Звук + whitelist: + tags: + - Scp007 + - type: GuideHelp + guides: + - ScpResearchAdvanced + # Fire edit end - type: entity name: advanced retractor diff --git a/Resources/Prototypes/_Scp/Entities/Markers/scp.yml b/Resources/Prototypes/_Scp/Entities/Markers/scp.yml index a4a1c6f43f7..dcd894fcf33 100644 --- a/Resources/Prototypes/_Scp/Entities/Markers/scp.yml +++ b/Resources/Prototypes/_Scp/Entities/Markers/scp.yml @@ -196,6 +196,34 @@ prototypes: - Scp1589 +- type: entity + name: SCP-527 spawner + id: SpawnScp527 + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Scp/Mobs/Scp/scp-527.rsi + state: scp-527 + - type: ConditionalSpawner + prototypes: + - Scp527 + +- type: entity + name: SCP-007 spawner + id: SpawnScp007 + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Scp/Mobs/Scp/scp-007.rsi + state: scp-007 + - type: ConditionalSpawner + prototypes: + - Scp007 + - type: entity name: SCP-457 spawner id: SpawnScp457 diff --git a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp007.yml b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp007.yml new file mode 100644 index 00000000000..30acce0dde4 --- /dev/null +++ b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp007.yml @@ -0,0 +1,79 @@ +- type: entity + id: Scp007 + name: ??? + suffix: SCP-007 + parent: + - BaseScpFriendlySapient + - MobCombat + - MobBloodstream + components: + - type: SlowOnDamage + speedModifierThresholds: + 80: 0.9 + 130: 0.8 + 160: 0.7 + - type: TTS + voice: DeathNoteYagami + - type: Mood + - type: Blinkable + - type: AutoGhostRole + disconnectDelay: 600 + pollDuration: 900 + transferDelay: 180 + - type: Sprite + drawdepth: Mobs + sprite: _Scp/Mobs/Scp/scp-007.rsi + layers: + - state: scp-007 + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + color: "#ffffff" + visible: false + - type: Scp + class: Euclid + - type: NpcFactionMember + factions: + - SimpleNeutral + - type: MovementSpeedModifier + baseWalkSpeed: 2 + baseSprintSpeed: 5 + - type: GhostPanelAntagonistMarker + name: ghost-panel-antagonist-scp-minor-name + description: ghost-panel-antagonist-scp-minor-description + priority: 0 + - type: MobThresholds + thresholds: + 0: Alive + 200: Dead + - type: GhostRole + makeSentient: true + name: ghost-role-information-scp007-name + description: ghost-role-information-scp007-description + raffle: + settings: short + job: Scp007 + - type: GhostTakeoverAvailable + - type: GuideHelp + guides: + - ScpResearch + - ScpResearchAdvanced + - type: Loadout + prototypes: [ Scp007Gear ] + - type: Cuffable + - type: Tag + tags: + - FootstepSound + - CannotSuicide + - DoorBumpOpener + - Scp007 + +- type: startingGear + id: Scp007Gear + equipment: + id: KeyCardPassEmpty + shoes: ClothingShoesBootsLaceup + jumpsuit: ClothingUniformJumpsuitSecBlue + belt: ClothingBeltStorageWaistbag + pants: ClothingPantsManStripe + socks: ClothingKneeWhite diff --git a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp1508.yml b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp1508.yml index 5711862fc81..8ca157de85b 100644 --- a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp1508.yml +++ b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp1508.yml @@ -129,3 +129,5 @@ id: Scp1508Gear equipment: belt: ClothingBeltScp1508 + inhand: + - Scp1508PaperFlyer diff --git a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp173.yml b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp173.yml index d37d2d4b6c5..3ee663bfca2 100644 --- a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp173.yml +++ b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp173.yml @@ -42,7 +42,7 @@ - whitelist: components: - MobState - - HumanoidAppearance + - Blinkable requireAll: true damage: types: @@ -53,7 +53,7 @@ useVariance: false requiredMobStates: - Alive - - Critical +# - Critical стакает урон если у существа нет состояния смерти - whitelist: tags: - Scp173DestroyOnCollide diff --git a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp527.yml b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp527.yml new file mode 100644 index 00000000000..22c7bafe906 --- /dev/null +++ b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp527.yml @@ -0,0 +1,80 @@ +- type: entity + id: Scp527 + name: ??? + suffix: SCP-527 + parent: + - BaseScpFriendlySapient + - MobCombat + - MobBloodstream + components: + - type: SlowOnDamage + speedModifierThresholds: + 80: 0.9 + 130: 0.8 + 160: 0.7 + - type: TTS + voice: ChocolateFabricWonka + - type: Mood + - type: Blinkable + - type: AutoGhostRole + disconnectDelay: 600 + pollDuration: 900 + transferDelay: 180 + - type: Sprite + drawdepth: Mobs + sprite: _Scp/Mobs/Scp/scp-527.rsi + layers: + - state: scp-527 + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + color: "#ffffff" + visible: false + - type: Scp + class: Euclid + - type: NpcFactionMember + factions: + - SimpleNeutral + - type: MovementSpeedModifier + baseWalkSpeed: 2 + baseSprintSpeed: 5 + - type: GhostPanelAntagonistMarker + name: ghost-panel-antagonist-scp-minor-name + description: ghost-panel-antagonist-scp-minor-description + priority: 0 + - type: MobThresholds + thresholds: + 0: Alive + 200: Dead + - type: GhostRole + makeSentient: true + name: ghost-role-information-scp527-name + description: ghost-role-information-scp527-description + raffle: + settings: short + job: Scp527 + - type: GhostTakeoverAvailable + - type: GuideHelp + guides: + - ScpResearch + - type: Loadout + prototypes: [ Scp527Gear ] + - type: Thirst + - type: Hunger + - type: Cuffable + +- type: startingGear + id: Scp527Gear + equipment: + id: KeyCardPassEmpty + gloves: ClothingHandsGlovesColorBlack + shoes: ClothingShoesBootsLaceup + jumpsuit: ClothingUniformJumpsuitLawyerBlack + head: ClothingHeadHatTophat + belt: ClothingBeltStorageWaistbag + pants: ClothingPantsManHearts + socks: ClothingKneeWhite + pocket1: LuxuryPen + pocket2: Scp527PaperCollection + inhand: + - OffsetCaneWood diff --git a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/base_scp.yml b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/base_scp.yml index 72b08d34b62..76682b04a0b 100644 --- a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/base_scp.yml +++ b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/base_scp.yml @@ -185,3 +185,89 @@ - BaseFriendlyScpArtifactMajor id: BaseScpFriendly +- type: entity # Для человекоподобных SCP: 007, 527 и т.д. + abstract: true + parent: + - BaseScpFriendly + - InventoryBase + - StripableInventoryBase + id: BaseScpFriendlySapient + components: + - type: CanJump + isOnlyEmotion: false + - type: CanFall + - type: Pullable + - type: Puller + needsHands: true + - type: Vocal + sounds: + Male: MaleHuman + Female: MaleHuman + Unsexed: MaleHuman + - type: Speech + - type: TTS + - type: UserInterface + interfaces: + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface + enum.StoreUiKey.Key: + type: StoreBoundUserInterface + - type: Buckle + - type: Stripping + - type: Body + prototype: Human + requiredLegs: 2 + - type: FieldOfView + angle: 240 + - type: Crawler + - type: Emoting + - type: BodyEmotes + soundsId: GeneralBodyEmotes + - type: MovementSpeedModifier + baseWalkSpeed: 2 + baseSprintSpeed: 5 + - type: Hands + - type: ComplexInteraction + - type: ScpRestriction + canBeDisarmed: true + canBePulled: true + canPull: true + canStandingState: true + canMobCollide: true + - type: RotationVisuals + defaultRotation: 90 + horizontalRotation: 90 + - type: StandingState + - type: StatusEffects + allowed: + - Electrocution + - RatvarianLanguage + - PressureImmunity + - Muted + - TemporaryBlindness + - Pacified + - Flashed + - RadiationProtection + - Adrenaline + - LoveEffect + - Flip + - type: Climbing + - type: Paws + screamInterval: 3 + thresholdDamage: 5 + coughInterval: 5 + emotesTakeDamage: + - Pain + - type: DamageForceSay + - type: Blindable + - type: Fear + phobias: + - Exoremophobia + - Necrophobia + - type: ProximityTarget + - type: ComponentToggler + components: + - type: FearSource + phobiaType: Necrophobia + uponComeCloser: None + - type: WatchingTarget diff --git a/Resources/Prototypes/_Scp/Entities/Objects/Scp/scp124.yml b/Resources/Prototypes/_Scp/Entities/Objects/Scp/scp124.yml index 6e374735cdb..11d1a63c853 100644 --- a/Resources/Prototypes/_Scp/Entities/Objects/Scp/scp124.yml +++ b/Resources/Prototypes/_Scp/Entities/Objects/Scp/scp124.yml @@ -14,6 +14,9 @@ size: Normal - type: Soil spawnPrototype: Scp124Soil + - type: Tag + tags: + - Scp124 - type: entity id: Scp124Soil @@ -44,3 +47,7 @@ - type: GuideHelp guides: - ScpResearch + - ScpResearchAdvanced + - type: Tag + tags: + - Scp124 \ No newline at end of file diff --git a/Resources/Prototypes/_Scp/Entities/Objects/ScpParts/parts.yml b/Resources/Prototypes/_Scp/Entities/Objects/ScpParts/parts.yml index f9d93a6e4a1..2338598bb95 100644 --- a/Resources/Prototypes/_Scp/Entities/Objects/ScpParts/parts.yml +++ b/Resources/Prototypes/_Scp/Entities/Objects/ScpParts/parts.yml @@ -84,7 +84,7 @@ - type: entity id: Scp019GlassShard - parent: BaseScpMaterial + parent: BaseScpResearchMaterial name: ceramic shard description: Ceramic shard with recognizable ancient Greek style and decor. components: @@ -95,6 +95,21 @@ tags: - Scp019GlassShard +# Scp007, Scp124 + +- type: entity + id: ScpDirtLump + parent: BaseScpResearchMaterial + name: lump of dirt + description: A small pile of soil. + components: + - type: Sprite + sprite: _Scp/Objects/Research/research_material.rsi + state: scp-dirt + - type: Tag + tags: + - ScpDirtLump + # Scp096 - type: entity # Для спавнов diff --git a/Resources/Prototypes/_Scp/Entities/Objects/Specific/wondertainmentPapers.yml b/Resources/Prototypes/_Scp/Entities/Objects/Specific/wondertainmentPapers.yml new file mode 100644 index 00000000000..be4a0e8798d --- /dev/null +++ b/Resources/Prototypes/_Scp/Entities/Objects/Specific/wondertainmentPapers.yml @@ -0,0 +1,17 @@ +- type: entity + id: Scp527PaperCollection + name: collection paper + description: A congratulatory paper about the discovery of a certain "Little Mister". + parent: Paper + components: + - type: Paper + content: info-paper-scp-527-collection + +- type: entity + id: Scp1508PaperFlyer + name: children's flyer + description: An advertisement for "Mikey the Janitor-Friend©". Judging by the text, this thing will clean up after you. + parent: Paper + components: + - type: Paper + content: info-paper-scp-1508-flyer diff --git a/Resources/Prototypes/_Scp/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/_Scp/Entities/Structures/Wallmounts/Signs/posters.yml index dc3d1966d46..9c1d9aab539 100644 --- a/Resources/Prototypes/_Scp/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/_Scp/Entities/Structures/Wallmounts/Signs/posters.yml @@ -636,6 +636,15 @@ - type: Sprite state: scp005 +- type: entity + parent: PosterScpContainmentRoomBase + id: PosterSCP007 + name: SCP-007 poster + description: Information poster for SCP-007. + components: + - type: Sprite + state: scp007 + - type: entity parent: PosterScpContainmentRoomBase id: PosterScp012 @@ -825,6 +834,15 @@ - type: Sprite state: scp500 +- type: entity + parent: PosterScpContainmentRoomBase + id: PosterSCP527 + name: SCP-527 poster + description: Information poster for SCP-527. + components: + - type: Sprite + state: scp527 + - type: entity parent: PosterScpContainmentRoomBase id: PosterSCP969 diff --git a/Resources/Prototypes/_Scp/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/_Scp/Entities/Structures/Wallmounts/Signs/signs.yml index 4be8ed64cb4..c397b3ee50b 100644 --- a/Resources/Prototypes/_Scp/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/_Scp/Entities/Structures/Wallmounts/Signs/signs.yml @@ -33,6 +33,15 @@ - type: Sprite state: 005 +- type: entity + parent: BaseSignDirectionalScp + id: SignDirectionalScp007 + name: SCP-007 sign + description: Points in a direction you shouldn't go without a clear understanding of where it leads. + components: + - type: Sprite + state: 007 + - type: entity parent: BaseSignDirectionalScp id: SignDirectionalScp012 @@ -177,6 +186,15 @@ - type: Sprite state: 500 +- type: entity + parent: BaseSignDirectionalScp + id: SignDirectionalScp527 + name: SCP-527 sign + description: Points in a direction you shouldn't go without a clear understanding of where it leads. + components: + - type: Sprite + state: 527 + - type: entity parent: BaseSignDirectionalScp id: SignDirectionalScp612 diff --git a/Resources/Prototypes/_Scp/Roles/Jobs/SCP/ghostrole.yml b/Resources/Prototypes/_Scp/Roles/Jobs/SCP/ghostrole.yml index 151c86dca4c..8bc43e7ffba 100644 --- a/Resources/Prototypes/_Scp/Roles/Jobs/SCP/ghostrole.yml +++ b/Resources/Prototypes/_Scp/Roles/Jobs/SCP/ghostrole.yml @@ -74,6 +74,42 @@ # Евклид +- type: job + id: Scp007 + name: job-name-scp007 + description: job-description-scp007 + playTimeTracker: JobScp007 + requirements: + - !type:OverallPlaytimeRequirement + time: 108000 # 30h + weight: 965 + #icon: TODO + joinNotifyCrew: false + overrideConsoleVisibility: false + canBeAntag: false + jobEntity: Scp007 + alwaysShowInBanPanel: true + setPreference: false + applyTraits: false + +- type: job + id: Scp527 + name: job-name-scp527 + description: job-description-scp527 + playTimeTracker: JobScp527 + requirements: + - !type:OverallPlaytimeRequirement + time: 108000 # 30h + weight: 965 + #icon: TODO + joinNotifyCrew: false + overrideConsoleVisibility: false + canBeAntag: false + jobEntity: Scp527 + alwaysShowInBanPanel: true + setPreference: false + applyTraits: false + - type: job id: Scp1589 name: job-name-scp1589 diff --git a/Resources/Prototypes/_Scp/Roles/play_time_trackers.yml b/Resources/Prototypes/_Scp/Roles/play_time_trackers.yml index c3819286184..26334394198 100644 --- a/Resources/Prototypes/_Scp/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_Scp/Roles/play_time_trackers.yml @@ -150,6 +150,9 @@ # SCP +- type: playTimeTracker + id: JobScp007 + - type: playTimeTracker id: JobScp0192 @@ -174,6 +177,9 @@ - type: playTimeTracker id: JobScp173 +- type: playTimeTracker + id: JobScp527 + - type: playTimeTracker id: JobScp939 diff --git a/Resources/Prototypes/_Scp/tags.yml b/Resources/Prototypes/_Scp/tags.yml index ea10bf6e89e..fd6027fe9a7 100644 --- a/Resources/Prototypes/_Scp/tags.yml +++ b/Resources/Prototypes/_Scp/tags.yml @@ -94,6 +94,9 @@ - type: Tag id: Scp173Shard +- type: Tag + id: ScpDirtLump + - type: Tag id: Scp019GlassShard @@ -121,5 +124,11 @@ - type: Tag id: LavenderFlower +- type: Tag + id: Scp007 + +- type: Tag + id: Scp124 + - type: Tag id: ScpCageDoor173 diff --git a/Resources/ServerInfo/_Scp/Guidebook/Research/ResearchAdvanced.xml b/Resources/ServerInfo/_Scp/Guidebook/Research/ResearchAdvanced.xml index 61db7155226..425a30818fa 100644 --- a/Resources/ServerInfo/_Scp/Guidebook/Research/ResearchAdvanced.xml +++ b/Resources/ServerInfo/_Scp/Guidebook/Research/ResearchAdvanced.xml @@ -38,6 +38,18 @@ Некоторые образцы желе могут содержать пепел. Все случайно + # SCP-007 + + ## Ретрактор + + Используйте ретрактор на объекте, чтобы получить комок почвы. Почва работает как артефакт, который можно изучить для получения [color=#8b0000]очков исследования SCP[/color] + + # SCP-124 + + ## Лопатка + + Используйте лопатку на объекте, чтобы получить комок почвы. Почва работает как артефакт, который можно изучить для получения [color=#8b0000]очков исследования SCP[/color] + # SCP-096 ## Фотоаппарат diff --git a/Resources/Textures/_Scp/Mobs/Scp/scp-007.rsi/meta.json b/Resources/Textures/_Scp/Mobs/Scp/scp-007.rsi/meta.json new file mode 100644 index 00000000000..874bcc00b19 --- /dev/null +++ b/Resources/Textures/_Scp/Mobs/Scp/scp-007.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "scp-007", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Scp/Mobs/Scp/scp-007.rsi/scp-007.png b/Resources/Textures/_Scp/Mobs/Scp/scp-007.rsi/scp-007.png new file mode 100644 index 00000000000..ebf734027aa Binary files /dev/null and b/Resources/Textures/_Scp/Mobs/Scp/scp-007.rsi/scp-007.png differ diff --git a/Resources/Textures/_Scp/Mobs/Scp/scp-527.rsi/meta.json b/Resources/Textures/_Scp/Mobs/Scp/scp-527.rsi/meta.json new file mode 100644 index 00000000000..ed505ec3d52 --- /dev/null +++ b/Resources/Textures/_Scp/Mobs/Scp/scp-527.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "made by peper", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "scp-527", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Scp/Mobs/Scp/scp-527.rsi/scp-527.png b/Resources/Textures/_Scp/Mobs/Scp/scp-527.rsi/scp-527.png new file mode 100644 index 00000000000..46fc9dee2d4 Binary files /dev/null and b/Resources/Textures/_Scp/Mobs/Scp/scp-527.rsi/scp-527.png differ diff --git a/Resources/Textures/_Scp/Objects/Research/research_material.rsi/meta.json b/Resources/Textures/_Scp/Objects/Research/research_material.rsi/meta.json index de1b657ac13..d8102fb18c3 100644 --- a/Resources/Textures/_Scp/Objects/Research/research_material.rsi/meta.json +++ b/Resources/Textures/_Scp/Objects/Research/research_material.rsi/meta.json @@ -22,6 +22,9 @@ { "name": "scp019-shard" }, + { + "name": "scp-dirt" + }, { "name": "scp096-photo-undeveloped" }, diff --git a/Resources/Textures/_Scp/Objects/Research/research_material.rsi/scp-dirt.png b/Resources/Textures/_Scp/Objects/Research/research_material.rsi/scp-dirt.png new file mode 100644 index 00000000000..011f3407576 Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Research/research_material.rsi/scp-dirt.png differ diff --git a/Resources/Textures/_Scp/Structures/Wallmounts/scp-posters.rsi/meta.json b/Resources/Textures/_Scp/Structures/Wallmounts/scp-posters.rsi/meta.json index df681d008fe..7d34488c4aa 100644 --- a/Resources/Textures/_Scp/Structures/Wallmounts/scp-posters.rsi/meta.json +++ b/Resources/Textures/_Scp/Structures/Wallmounts/scp-posters.rsi/meta.json @@ -8,6 +8,7 @@ }, "states": [ { "name": "scp005" }, + { "name": "scp007" }, { "name": "scp012" }, { "name": "scp018" }, { "name": "scp019" }, @@ -30,6 +31,7 @@ { "name": "scp427" }, { "name": "scp457" }, { "name": "scp500" }, + { "name": "scp527" }, { "name": "scp714" }, { "name": "scp969" }, { "name": "scp999" }, diff --git a/Resources/Textures/_Scp/Structures/Wallmounts/scp-posters.rsi/scp007.png b/Resources/Textures/_Scp/Structures/Wallmounts/scp-posters.rsi/scp007.png new file mode 100644 index 00000000000..84097f6d3c3 Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Wallmounts/scp-posters.rsi/scp007.png differ diff --git a/Resources/Textures/_Scp/Structures/Wallmounts/scp-posters.rsi/scp527.png b/Resources/Textures/_Scp/Structures/Wallmounts/scp-posters.rsi/scp527.png new file mode 100644 index 00000000000..d8d2c68d103 Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Wallmounts/scp-posters.rsi/scp527.png differ diff --git a/Resources/Textures/_Scp/Structures/Wallmounts/signs-directional.rsi/007.png b/Resources/Textures/_Scp/Structures/Wallmounts/signs-directional.rsi/007.png new file mode 100644 index 00000000000..0a1f57eed62 Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Wallmounts/signs-directional.rsi/007.png differ diff --git a/Resources/Textures/_Scp/Structures/Wallmounts/signs-directional.rsi/527.png b/Resources/Textures/_Scp/Structures/Wallmounts/signs-directional.rsi/527.png new file mode 100644 index 00000000000..324f8bb306a Binary files /dev/null and b/Resources/Textures/_Scp/Structures/Wallmounts/signs-directional.rsi/527.png differ diff --git a/Resources/Textures/_Scp/Structures/Wallmounts/signs-directional.rsi/meta.json b/Resources/Textures/_Scp/Structures/Wallmounts/signs-directional.rsi/meta.json index 64f46107dfe..d97b68be0b2 100644 --- a/Resources/Textures/_Scp/Structures/Wallmounts/signs-directional.rsi/meta.json +++ b/Resources/Textures/_Scp/Structures/Wallmounts/signs-directional.rsi/meta.json @@ -8,6 +8,7 @@ }, "states": [ { "name": "005", "directions": 4 }, + { "name": "007", "directions": 4 }, { "name": "012", "directions": 4 }, { "name": "018", "directions": 4 }, { "name": "035", "directions": 4 }, @@ -24,6 +25,7 @@ { "name": "330", "directions": 4 }, { "name": "427", "directions": 4 }, { "name": "500", "directions": 4 }, + { "name": "527", "directions": 4 }, { "name": "612", "directions": 4 }, { "name": "714", "directions": 4 }, { "name": "939", "directions": 4 },