diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/posters.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/posters.ftl index 96e6e47d5f1..54f1408c6da 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/posters.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/posters.ftl @@ -8,3 +8,29 @@ ent-LPPPosterSport = Sport .desc = Work out, you fat skoof. ent-LPPPosterTimeTea = Tea time .desc = Oh, you're from England? +ent-LPPPosterBeach = Summer epsiode + .desc = It's a bit cold, but you can imagine that this picture is HOT. +ent-LPPPosterPress = Check this bo... Press! + .desc = You're on the wrong side of Heaven my friend +ent-LPPPosterLustfulVulp1 = Horny vulp + .desc = Run for your life! +ent-LPPPosterLustfulVulp2 = night games with HighAnge + .desc = Why do I need to come up with all of these descriptions... +ent-LPPPosterBeach2 = Summer epsiode part 2 + .desc = It's like the first one, but with more funservice. +ent-LPPPosterTajaranHalloween = Halloween tajaran + .desc = Trick or treet as they say... +ent-LPPPosterTajaranBikini = My eyes are higher + .desc = The poster shows tajaran's semi-nude female torso with an emphasis on her breasts. +ent-LPPPosterTajaranBunny2 = playful card games with Maria + .desc = I think it's a strip game, and you're already out of your underpants. +ent-LPPPosterTajaranBunny1 = Easter tajaran + .desc = I don't think rabbits are on their menu... +ent-LPPPosterTajaranBody = Hot tajaran in your sector! + .desc = Deal with it already! +ent-LPPPosterTajaranNewYear = Present for New Year + .desc = Oooh yeah babyy that's we all waiting for! +ent-LPPPosterTajaranUnderwear = Use underwearmats! + .desc = Best panties, bras and stockings in all Galaxy! +ent-LPPPosterVulpBunnyUma = Bunnygirl Vulp + .desc = Some poster with... Sticky white thing on it... Oh, nevermind, it's just a glue. diff --git a/Resources/Locale/ru-RU/random-barks/cow.ftl b/Resources/Locale/ru-RU/random-barks/cow.ftl index aaff7aa64bc..5a75afc7755 100644 --- a/Resources/Locale/ru-RU/random-barks/cow.ftl +++ b/Resources/Locale/ru-RU/random-barks/cow.ftl @@ -4,7 +4,7 @@ bark-cow-3 = Хрр bark-cow-4 = Мууууууууууууууу bark-cow-5 = Муууууу bark-cow-6 = Пол это еда -bark-cow-7 = Я голодный +bark-cow-7 = Я голодный bark-cow-8 = Как долго я здесь нахожусь? bark-cow-9 = Мууууу Мууууууу bark-cow-10 = Хрр... Мууууу diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/posters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/posters.ftl index 6fc46cf6286..242dbb66cdf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/posters.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/posters.ftl @@ -8,3 +8,29 @@ ent-LPPPosterSport = Спорт .desc = Занимайся спортом, жирный скуф ent-LPPPosterTimeTea = Время чая .desc = Оу, вы из Англии? +ent-LPPPosterBeach = Пляжный эпизод! + .desc = Сейчас уже довольно холодно, но представим, насколько этот постер ГОРЯЧ. +ent-LPPPosterPress = зацени эти сис.. Пресс! + .desc = Ты не на той стороне рая, мой друг. +ent-LPPPosterLustfulVulp1 = похотливая вульпа + .desc = Беги, сука, беги! +ent-LPPPosterLustfulVulp2 = ночные игры с ХайЭнджом + .desc = Почему я вообще должен придумывать описания этих плакатов... +ent-LPPPosterBeach2 = Пляжный эпизод часть 2 + .desc = Это прямо как первый эпизод, но здесь больше фансервиса! +ent-LPPPosterTajaranHalloween = Хэллуинская таяранка + .desc = Сладость или гадость, как они говорят... +ent-LPPPosterTajaranBikini = Мои глаза выше + .desc = На плакате изображен полуобнаженный женский торс Таяранки с акцентом на грудь. +ent-LPPPosterTajaranBunny2 = Игривые карточные игры с Марией + .desc = Я думаю, это игра на раздевание, а ты уже без трусов. +ent-LPPPosterTajaranBunny1 = Пасхальный тайяр + .desc = Не думаю, что кролики входят в их меню... +ent-LPPPosterTajaranBody = Горячий таяры в вашем секторе! + .desc = Разберитесь с этим наконец! +ent-LPPPosterTajaranNewYear = Подарок к Новому году + .desc = Ооо, да, детка, мы все этого ждали! +ent-LPPPosterTajaranUnderwear = Используйте нижнебельё маты! + .desc = Лучшие трусики, бюстгальтеры и чулки во всей Галактике! +ent-LPPPosterVulpBunnyUma = Вульпа девочка кролик + .desc = Какой-то плакат с... Липкой белой штукой на нём... О, неважно, это просто клей. diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index bbbaecf1d1e..4be7b598748 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -170,11 +170,24 @@ - PosterLegitCornzza # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml - PosterLegitFuckAround # DeltaV Poster, see Resources/Prototypes/DeltaV/Entities/Structures/Wallmount/Signs/posters.yml - # - < DarkSide - LOST PARADISE, see Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/posters.yml + # - < DarkSide/MegaDaimond - LOST PARADISE, see Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/posters.yml - LPPPosterHappyNewYear - LPPPosterNoAlcohol - LPPPosterSport - LPPPosterTimeTea + - LPPPosterBeach + - LPPPosterBeach2 + - LPPPosterPress + - LPPPosterLustfulVulp1 + - LPPPosterLustfulVulp2 + - LPPPosterTajaranHalloween + - LPPPosterTajaranBikini + - LPPPosterTajaranBunny1 + - LPPPosterTajaranBunny2 + - LPPPosterTajaranBody + - LPPPosterTajaranNewYear + - LPPPosterTajaranUnderwear + - LPPPosterVulpBunnyUma # - > - + chance: 1 diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/posters.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/posters.yml index deee5f7327a..f3cfbec199d 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/posters.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/posters.yml @@ -45,4 +45,119 @@ - type: Sprite state: timetea -# - > +- type: entity + parent: LPPPosterBase + id: LPPPosterBeach + name: "Summer epsiode" + description: "It's a bit cold, but you can imagine that this picture is HOT." + components: + - type: Sprite + state: lustfulvulp-beach + +- type: entity + parent: LPPPosterBase + id: LPPPosterPress + name: "Check this bo... Press!" + description: "You're on the wrong side of Heaven my friend" + components: + - type: Sprite + state: lustfulvulp-press + +- type: entity + parent: LPPPosterBase + id: LPPPosterLustfulVulp1 + name: "Horny vulp" + description: "Run for your life!" + components: + - type: Sprite + state: lustfulvulp-uma + +- type: entity + parent: LPPPosterBase + id: LPPPosterLustfulVulp2 + name: "night games with HighAnge" + description: "Why do I need to come up with all of these descriptions..." + components: + - type: Sprite + state: lustfulvulp-vulp + +- type: entity + parent: LPPPosterBase + id: LPPPosterBeach2 + name: "Summer epsiode part 2" + description: "It's like the first one, but with more funservice." + components: + - type: Sprite + state: lustfulvulp-basin + +- type: entity + parent: LPPPosterBase + id: LPPPosterTajaranHalloween + name: "Halloween tajaran" + description: "Trick or treet as they say..." + components: + - type: Sprite + state: lustfultajaran-hellowin + +- type: entity + parent: LPPPosterBase + id: LPPPosterTajaranBikini + name: "My eyes are higher" + description: "The poster shows tajaran's semi-nude female torso with an emphasis on her breasts." + components: + - type: Sprite + state: lustfultajaran-bikini + +- type: entity + parent: LPPPosterBase + id: LPPPosterTajaranBunny2 + name: "playful card games with Maria" + description: "I think it's a strip game, and you're already out of your underpants." + components: + - type: Sprite + state: lustfultajaran-bunny2 + +- type: entity + parent: LPPPosterBase + id: LPPPosterTajaranBunny1 + name: "Easter tajaran" + description: "I don't think rabbits are on their menu..." + components: + - type: Sprite + state: lustfultajaran-bunny1 + +- type: entity + parent: LPPPosterBase + id: LPPPosterTajaranBody + name: "Hot tajaran in your sector!" + description: "Deal with it already!" + components: + - type: Sprite + state: lustfultajaran-body + +- type: entity + parent: LPPPosterBase + id: LPPPosterTajaranNewYear + name: "Present for New Year" + description: "Oooh yeah babyy that's we all waiting for!" + components: + - type: Sprite + state: lustfultajaran-newyear + +- type: entity + parent: LPPPosterBase + id: LPPPosterTajaranUnderwear + name: "Use underwearmats!" + description: "Best panties, bras and stockings in all Galaxy!" + components: + - type: Sprite + state: lustfultajaran-underwear + +- type: entity + parent: LPPPosterBase + id: LPPPosterVulpBunnyUma + name: "Bunnygirl Vulp" + description: "Some poster with... Sticky white thing on it... Oh, nevermind, it's just a glue." + components: + - type: Sprite + state: lustfulvulp-bunnyuma \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-bikini.png b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-bikini.png new file mode 100644 index 00000000000..0cea7b80221 Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-bikini.png differ diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-body.png b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-body.png new file mode 100644 index 00000000000..16bb181276f Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-body.png differ diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-bunny1.png b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-bunny1.png new file mode 100644 index 00000000000..1d06d2238b1 Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-bunny1.png differ diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-bunny2.png b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-bunny2.png new file mode 100644 index 00000000000..e53ced363f6 Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-bunny2.png differ diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-hellowin.png b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-hellowin.png new file mode 100644 index 00000000000..7c64485f659 Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-hellowin.png differ diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-newyear.png b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-newyear.png new file mode 100644 index 00000000000..d0438f32b54 Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-newyear.png differ diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-underwear.png b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-underwear.png new file mode 100644 index 00000000000..70a232bcd52 Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfultajaran-underwear.png differ diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-basin.png b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-basin.png new file mode 100644 index 00000000000..1580d57a085 Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-basin.png differ diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-beach.png b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-beach.png new file mode 100644 index 00000000000..0718a5351d6 Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-beach.png differ diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-bunnyuma.png b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-bunnyuma.png new file mode 100644 index 00000000000..f0ccebfc77d Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-bunnyuma.png differ diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-press.png b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-press.png new file mode 100644 index 00000000000..66185d6b277 Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-press.png differ diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-uma.png b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-uma.png new file mode 100644 index 00000000000..9498dc07692 Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-uma.png differ diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-vulp.png b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-vulp.png new file mode 100644 index 00000000000..c1b412ded60 Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/lustfulvulp-vulp.png differ diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/meta.json index 74706afdab5..5bb112feb6c 100644 --- a/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Structures/Wallmounts/posters.rsi/meta.json @@ -18,6 +18,45 @@ }, { "name": "timetea" + }, + { + "name": "lustfultajaran-bikini" + }, + { + "name": "lustfultajaran-body" + }, + { + "name": "lustfultajaran-bunny1" + }, + { + "name": "lustfultajaran-bunny2" + }, + { + "name": "lustfultajaran-hellowin" + }, + { + "name": "lustfultajaran-newyear" + }, + { + "name": "lustfultajaran-underwear" + }, + { + "name": "lustfulvulp-basin" + }, + { + "name": "lustfulvulp-beach" + }, + { + "name": "lustfulvulp-bunnyuma" + }, + { + "name": "lustfulvulp-press" + }, + { + "name": "lustfulvulp-uma" + }, + { + "name": "lustfulvulp-vulp" } ] } diff --git a/Tools/ss14_ru/requirements.txt b/Tools/ss14_ru/requirements.txt index bb76cba1b5e..0159b0778c8 100644 Binary files a/Tools/ss14_ru/requirements.txt and b/Tools/ss14_ru/requirements.txt differ diff --git a/Tools/ss14_ru/translation.bat b/Tools/ss14_ru/translation.bat index 452ecd858cf..39d69119822 100644 --- a/Tools/ss14_ru/translation.bat +++ b/Tools/ss14_ru/translation.bat @@ -1,7 +1,9 @@ @echo off -call pip install -r requirements.txt +call pip install -r requirements.txt --no-warn-script-location call python ./yamlextractor.py call python ./keyfinder.py call python ./clean_ftl.py call python ./1.py + +PAUSE \ No newline at end of file diff --git a/Tools/ss14_ru/translation.sh b/Tools/ss14_ru/translation.sh index d51768b3da0..e06681bb123 100644 --- a/Tools/ss14_ru/translation.sh +++ b/Tools/ss14_ru/translation.sh @@ -5,7 +5,7 @@ if [ "$(dirname $0)" != "." ]; then cd "$(dirname $0)" fi -pip install -r requirements.txt +pip install -r requirements.txt --no-warn-script-location python3 ./yamlextractor.py python3 ./keyfinder.py python3 ./clean_ftl.py