diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index 826c46ff55f..68c81006fc6 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -9142,3 +9142,12 @@ id: 638 time: '2024-12-30T00:24:39.0000000+00:00' url: https://github.com/space-sunrise/space-station-14/pull/975 +- author: VigersRay + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u043E\u0432\ + \u044B\u0435 \u043E\u043D\u044F\u043C\u0438 \u0441\u043A\u0438\u043D\u0447\u0438\ + \u043A\u0438 \u0434\u043B\u044F \u043F\u0440\u0438\u0437\u0440\u0430\u043A\u043E\ + \u0432." + type: Add + id: 639 + time: '2024-12-30T04:52:03.673298+00:00' diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/ghost/ghost-themes.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/ghost/ghost-themes.ftl index 6cc8903ba9c..b1b0a81f724 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/ghost/ghost-themes.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/ghost/ghost-themes.ftl @@ -17,10 +17,25 @@ ghost-theme-pink = Розовый ghost-theme-cat = Кот Неверы ghost-theme-purple = Фиолетовый ghost-theme-red = Красный +ghost-theme-blue-archive-hibiki = Hibiki +ghost-theme-blue-archive-rio = Rio +ghost-theme-blue-archive-yuuka = Yuuka +ghost-theme-blue-archive-girl1 = Girl +ghost-theme-blue-archive-girl2 = Girl +ghost-theme-blue-archive-girl3 = Girl +ghost-theme-blue-archive-girl4 = Girl +ghost-theme-blue-archive-girl5 = Girl +ghost-theme-blue-archive-girl6 = Girl +ghost-theme-blue-archive-girl7 = Girl +ghost-theme-blue-archive-girl8 = Girl +ghost-theme-blue-archive-girl9 = Girl +ghost-theme-blue-archive-girl10 = Girl +ghost-theme-blue-archive-girl11 = Girl +ghost-theme-blue-archive-girl12 = Girl +ghost-theme-blue-archive-girl13 = Girl +ghost-theme-blue-archive-girl14 = Girl +ghost-theme-blue-archive-girl15 = Girl ghost-theme-wizden-block = Wizden Block -ghost-theme-asuka = Asuka ghost-theme-vigers-ray = VigersRay -ghost-theme-hibiki = Hibiki -ghost-theme-rio = Rio -ghost-theme-yuuka = Yuuka - +ghost-theme-asuka = Asuka +ghost-theme-randy = Randy diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_themes.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_themes.yml index 7311499224c..ccf2b19014a 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_themes.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_themes.yml @@ -168,21 +168,134 @@ - type: ghostTheme id: Hibiki - name: ghost-theme-hibiki + name: ghost-theme-blue-archive-hibiki sprite: sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi state: hibiki - type: ghostTheme - id: Rio - name: ghost-theme-rio + id: BlueArchiveRio + name: ghost-theme-blue-archive-rio sprite: sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi state: rio - type: ghostTheme - id: Yuuka - name: ghost-theme-yuuka + id: BlueArchiveYuuka + name: ghost-theme-blue-archive-yuuka sprite: sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi state: yuuka + +- type: ghostTheme + id: BlueArchiveGirl1 + name: ghost-theme-blue-archive-girl1 + sprite: + sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi + state: girl1 + +- type: ghostTheme + id: BlueArchiveGirl2 + name: ghost-theme-blue-archive-girl2 + sprite: + sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi + state: girl2 + +- type: ghostTheme + id: BlueArchiveGirl3 + name: ghost-theme-blue-archive-girl3 + sprite: + sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi + state: girl3 + +- type: ghostTheme + id: BlueArchiveGirl4 + name: ghost-theme-blue-archive-girl4 + sprite: + sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi + state: girl4 + +- type: ghostTheme + id: BlueArchiveGirl5 + name: ghost-theme-blue-archive-girl5 + sprite: + sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi + state: girl5 + +- type: ghostTheme + id: BlueArchiveGirl6 + name: ghost-theme-blue-archive-girl6 + sprite: + sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi + state: girl6 + +- type: ghostTheme + id: BlueArchiveGirl7 + name: ghost-theme-blue-archive-girl7 + sprite: + sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi + state: girl7 + +- type: ghostTheme + id: BlueArchiveGirl8 + name: ghost-theme-blue-archive-girl8 + sprite: + sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi + state: girl8 + +- type: ghostTheme + id: BlueArchiveGirl9 + name: ghost-theme-blue-archive-girl9 + sprite: + sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi + state: girl9 + +- type: ghostTheme + id: BlueArchiveGirl10 + name: ghost-theme-blue-archive-girl10 + sprite: + sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi + state: girl10 + +- type: ghostTheme + id: BlueArchiveGirl11 + name: ghost-theme-blue-archive-girl11 + sprite: + sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi + state: girl11 + +- type: ghostTheme + id: BlueArchiveGirl12 + name: ghost-theme-blue-archive-girl12 + sprite: + sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi + state: girl12 + +- type: ghostTheme + id: BlueArchiveGirl13 + name: ghost-theme-blue-archive-girl13 + sprite: + sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi + state: girl13 + +- type: ghostTheme + id: BlueArchiveGirl14 + name: ghost-theme-blue-archive-girl14 + sprite: + sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi + state: girl14 + +- type: ghostTheme + id: BlueArchiveGirl15 + name: ghost-theme-blue-archive-girl15 + sprite: + sprite: _Sunrise/Mobs/Ghosts/blue_archive.rsi + state: girl15 + +- type: ghostTheme + id: Randy + scale: 0.15, 0.15 + name: ghost-theme-asuka + sprite: + sprite: _Sunrise/Mobs/Ghosts/randy.rsi + state: icon diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl0.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl0.png new file mode 100644 index 00000000000..af735a85c47 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl0.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl1.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl1.png new file mode 100644 index 00000000000..1cfb9e99ce0 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl1.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl10.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl10.png new file mode 100644 index 00000000000..6d059b698db Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl10.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl11.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl11.png new file mode 100644 index 00000000000..c722494d0cb Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl11.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl12.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl12.png new file mode 100644 index 00000000000..a4df29b1a1a Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl12.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl13.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl13.png new file mode 100644 index 00000000000..e3946eb91ab Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl13.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl14.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl14.png new file mode 100644 index 00000000000..1b07b7d2ef0 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl14.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl15.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl15.png new file mode 100644 index 00000000000..23c857c5633 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl15.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl2.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl2.png new file mode 100644 index 00000000000..166145f1fa0 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl2.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl3.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl3.png new file mode 100644 index 00000000000..134cb44d9b0 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl3.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl4.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl4.png new file mode 100644 index 00000000000..b897dde32af Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl4.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl5.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl5.png new file mode 100644 index 00000000000..a6286f4bf0f Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl5.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl6.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl6.png new file mode 100644 index 00000000000..0a9067fbfa2 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl6.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl7.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl7.png new file mode 100644 index 00000000000..2131c4abbd1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl7.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl8.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl8.png new file mode 100644 index 00000000000..b8e28679b7b Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl8.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl9.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl9.png new file mode 100644 index 00000000000..7a3e2be5a92 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/girl9.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/hibiki.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/hibiki.png index 32567403eef..4b523e69b3e 100644 Binary files a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/hibiki.png and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/hibiki.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/meta.json b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/meta.json index 7b8eb6cb130..124a0b06012 100644 --- a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/meta.json @@ -1,10 +1,10 @@ { "version": 1, "license": "", - "copyright": "", + "copyright": "Я не знаю кто автор, эти спрайты у меня на компе лежат года 3, если знаете автора - укажите", "size": { - "x": 52, - "y": 52 + "x": 56, + "y": 56 }, "states": [ { @@ -15,6 +15,51 @@ }, { "name": "yuuka" + }, + { + "name": "girl1" + }, + { + "name": "girl2" + }, + { + "name": "girl3" + }, + { + "name": "girl4" + }, + { + "name": "girl5" + }, + { + "name": "girl6" + }, + { + "name": "girl7" + }, + { + "name": "girl8" + }, + { + "name": "girl9" + }, + { + "name": "girl10" + }, + { + "name": "girl11" + }, + { + "name": "girl12" + }, + { + "name": "girl13" + }, + { + "name": "girl14" + }, + { + "name": "girl15" } ] } diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/rio.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/rio.png index 67dafd6f969..57a1dc9b6d0 100644 Binary files a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/rio.png and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/rio.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/yuuka.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/yuuka.png index 27519ec2d34..aeefaad142c 100644 Binary files a/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/yuuka.png and b/Resources/Textures/_Sunrise/Mobs/Ghosts/blue_archive.rsi/yuuka.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/randy.rsi/icon.png b/Resources/Textures/_Sunrise/Mobs/Ghosts/randy.rsi/icon.png new file mode 100644 index 00000000000..8f786a19622 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Ghosts/randy.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Ghosts/randy.rsi/meta.json b/Resources/Textures/_Sunrise/Mobs/Ghosts/randy.rsi/meta.json new file mode 100644 index 00000000000..ad7d82511ff --- /dev/null +++ b/Resources/Textures/_Sunrise/Mobs/Ghosts/randy.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "", + "copyright": "", + "size": { + "x": 580, + "y": 620 + }, + "metaAtlas": false, + "states": [ + { + "name": "icon" + } + ] +}