diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 3b982d2a3b..9e2711982e 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,16 +1,4 @@ Entries: -- author: HitPanda - changes: - - message: "\u0424\u0438\u043A\u0441 \u0431\u0430\u0433\u0430, \u043F\u0440\u0438\ - \ \u043A\u043E\u0442\u043E\u0440\u043E\u043C, \u0435\u0441\u043B\u0438 \u0432\ - \u0430\u0441 \u0432 \u043D\u0430\u0440\u0443\u0447\u043D\u0438\u043A\u0430\u0445\ - \ \u043D\u0430\u0447\u043D\u0443\u0442 \u0442\u044F\u043D\u0443\u0442\u044C\ - \ \u0441 \u043A\u0440\u043E\u0432\u0430\u0442\u0438(\u0441\u0442\u0443\u043B\ - \u0430), \u0442\u043E \u0432\u044B \u043D\u0435 \u043E\u0442\u0441\u0442\u0451\ - \u0433\u0438\u0432\u0430\u0435\u0442\u0435\u0441\u044C." - type: Fix - id: 132 - time: '2023-04-09T13:44:18.0000000+00:00' - author: RavMorgan changes: - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0433\u043E\u0432\ @@ -8909,3 +8897,13 @@ id: 631 time: '2024-12-14T19:11:00.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/821 +- author: BIG_Zi_348 + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0447\u0435\u0440\u0442\ + \u0451\u0436 \u043E\u043C\u0435\u0433\u0430 \u043C\u044B\u043B\u0430 \u0432\ + \ \u043F\u0443\u043B\u043B \u043D\u0430\u0433\u0440\u0430\u0434 \u0434\u043B\ + \u044F \u044D\u043A\u0441\u043F\u0435\u0434\u0438\u0446\u0438\u0439." + type: Add + id: 632 + time: '2024-12-15T15:12:30.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/827 diff --git a/Resources/Locale/ru-RU/_white/fluff/feda_plevajecki.ftl b/Resources/Locale/ru-RU/_white/fluff/feda_plevajecki.ftl new file mode 100644 index 0000000000..84b3f07034 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/fluff/feda_plevajecki.ftl @@ -0,0 +1,2 @@ +marking-Feda_Plevajecki_Fins = Плавники +marking-Feda_Plevajecki_Fins-shark = Основной diff --git a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-107.ftl b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-107.ftl index ffa92b7ee3..b144d63947 100644 --- a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-107.ftl +++ b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-107.ftl @@ -55,7 +55,7 @@ ent-EnergyDomeWiredTest = Статический купол .suffix = НЕ СЛИВАТЬ ent-FultonBeacon = маяк Фултона .desc = Маяк для получения эвакуации по Фултону. -ent-Fulton = Фултон +ent-Fulton = фултон .desc = Используется для извлечения контейнеров, предметов или принудительной вербовки людей на вашу базу. .suffix = Полный diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl index 24b9ac312d..4e07a6758b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl @@ -4,3 +4,5 @@ ent-BlueprintFulton = чертёж фултона .desc = Чертёж со схемой фултона. Его можно поместить в автолат. ent-BlueprintSeismicCharge = чертёж сейсмического заряда .desc = Чертеж со схемой сейсмического заряда. Его можно поместить в автолат. +ent-BlueprintSoapOmega = чертёж омега мыла + .desc = Чертеж со схемой омега мыла. Его можно поместить в автолат. diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml index 77f288dfa7..4a04bb8713 100644 --- a/Resources/Prototypes/Procedural/salvage_rewards.yml +++ b/Resources/Prototypes/Procedural/salvage_rewards.yml @@ -50,8 +50,6 @@ SpaceCash500: 1.0 SpaceCash1000: 0.75 SpaceCash2500: 0.5 - # blueprints WD - BlueprintFulton: 1.0 - type: weightedRandomEntity id: SalvageRewardEpic @@ -78,3 +76,4 @@ SpaceCash10000: 0.5 # blueprints WD BlueprintSeismicCharge: 1.0 + BlueprintSoapOmega: 1.0 diff --git a/Resources/Prototypes/_White/Entities/Objects/Tools/blueprint.yml b/Resources/Prototypes/_White/Entities/Objects/Tools/blueprint.yml new file mode 100644 index 0000000000..b33271fd5d --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/Tools/blueprint.yml @@ -0,0 +1,9 @@ +- type: entity + parent: BaseBlueprint + id: BlueprintSoapOmega + name: omega soap blueprint + description: A blueprint with a schematic of an omega soap. It can be inserted into an autolathe. + components: + - type: Blueprint + providedRecipes: + - SoapOmega diff --git a/Resources/Prototypes/_White/Fluff/augustnacist1488.yml b/Resources/Prototypes/_White/Fluff/McLovin_.yml similarity index 69% rename from Resources/Prototypes/_White/Fluff/augustnacist1488.yml rename to Resources/Prototypes/_White/Fluff/McLovin_.yml index 3b3cbdeb90..5b314138eb 100644 --- a/Resources/Prototypes/_White/Fluff/augustnacist1488.yml +++ b/Resources/Prototypes/_White/Fluff/McLovin_.yml @@ -1,14 +1,14 @@ - type: entity parent: ClothingNeckBase - id: ClothingAugustNeckFluff + id: ClothingMcLovin_NeckFluff name: пустотный плащ suffix: fluff description: Плащ, который был создан на мировой кузнице Лавовых земель одним из шахтёров. components: - type: Sprite - sprite: White/Fluff/AugustNacist1488/void_cloak.rsi + sprite: White/Fluff/McLovin_/void_cloak.rsi - type: sponsorLoadout - id: NeckLoadoutAugust - entity: ClothingAugustNeckFluff + id: NeckLoadoutMcLovin_ + entity: ClothingMcLovin_NeckFluff sponsorOnly: true diff --git a/Resources/Prototypes/_White/Fluff/fluff.yml b/Resources/Prototypes/_White/Fluff/fluff.yml index 297fd4a048..0edfa0e7f2 100644 --- a/Resources/Prototypes/_White/Fluff/fluff.yml +++ b/Resources/Prototypes/_White/Fluff/fluff.yml @@ -1225,3 +1225,13 @@ sprite: White/Fluff/IMercuryI/tie.rsi - type: Clothing sprite: White/Fluff/IMercuryI/tie.rsi + +# Feda_Plevajecki +- type: marking + id: Feda_Plevajecki_Fins + bodyPart: HeadTop + markingCategory: HeadTop + sponsorOnly: true + sprites: + - sprite: White/Fluff/Feda_Plevajecki/shark.rsi + state: shark diff --git a/Resources/Prototypes/_White/Fluff/sponsor.yml b/Resources/Prototypes/_White/Fluff/sponsor.yml index 29434c128c..225c30822e 100644 --- a/Resources/Prototypes/_White/Fluff/sponsor.yml +++ b/Resources/Prototypes/_White/Fluff/sponsor.yml @@ -469,9 +469,3 @@ id: IMercuryITie entity: ClothingNeckTieIMercuryI sponsorOnly: true - -# AugustNacist1488 -- type: sponsorLoadout - id: AugustNacist1488Cloak - entity: ClothingAugustNeckFluff - sponsorOnly: true diff --git a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml index ed33fa5967..7038dd50dc 100644 --- a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml +++ b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml @@ -501,11 +501,11 @@ ghostName: BIG_Zi_348 ghostDescription: Зенит космической энергии — генезис сознания из пустоты. -#AugustNacist1488 +#McLovin_ - type: customGhost - id: augustnacist1488-ghost - ckey: AugustNacist1488 - sprite: White/Ghosts/augustnacist1488-ghost.rsi + id: McLovin_-ghost + ckey: McLovin_ + sprite: White/Ghosts/McLovin_-ghost.rsi alpha: 0.9 ghostName: Ash drake ghostDescription: Почитаемый хранитель некрополя. diff --git a/Resources/Prototypes/_White/Recipes/lathe_recipes.yml b/Resources/Prototypes/_White/Recipes/lathe_recipes.yml index af83cb814d..349aec58bc 100644 --- a/Resources/Prototypes/_White/Recipes/lathe_recipes.yml +++ b/Resources/Prototypes/_White/Recipes/lathe_recipes.yml @@ -344,3 +344,13 @@ completetime: 5 materials: Steel: 300 + +- type: latheRecipe + id: SoapOmega + result: SoapOmega + category: Tools + completetime: 10 + materials: + Plastic: 3000 + Silver: 100 + Gold: 100 diff --git a/Resources/Textures/White/Fluff/Feda_Plevajecki/shark.rsi/meta.json b/Resources/Textures/White/Fluff/Feda_Plevajecki/shark.rsi/meta.json new file mode 100644 index 0000000000..b4f32731c0 --- /dev/null +++ b/Resources/Textures/White/Fluff/Feda_Plevajecki/shark.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Dosharus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "shark", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Fluff/Feda_Plevajecki/shark.rsi/shark.png b/Resources/Textures/White/Fluff/Feda_Plevajecki/shark.rsi/shark.png new file mode 100644 index 0000000000..6be7a7e4aa Binary files /dev/null and b/Resources/Textures/White/Fluff/Feda_Plevajecki/shark.rsi/shark.png differ