From 8986c272a7e6005a9730d58b3802674a541d08b5 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Thu, 5 Dec 2024 21:41:23 +0100 Subject: [PATCH 1/2] update server configs (#2799) --- Resources/ConfigPresets/Corvax/athara.toml | 4 ++-- Resources/ConfigPresets/Corvax/main.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/ConfigPresets/Corvax/athara.toml b/Resources/ConfigPresets/Corvax/athara.toml index 836b8501ae9..63589eaa6e6 100644 --- a/Resources/ConfigPresets/Corvax/athara.toml +++ b/Resources/ConfigPresets/Corvax/athara.toml @@ -1,6 +1,6 @@ [game] -hostname = "🛰️ Corvax — Атара 🌌 [TTS]" -desc = "Корвакс — первый русскоязычный проект в Space Station 14.\nНа этом сервере средние требования к RP.\n[Имеется интеграция TTS (Text-To-Speech)]" +hostname = "🛰️ Corvax — Атара 🌌⚡ [TTS][NEXT]" +desc = "Корвакс — первый русскоязычный проект в Space Station 14.\n⚡На этом сервере используется сборка Corvax Next. Больше контента, возможностей и взаимодействия!\nНа этом сервере средние требования к RP.\n[Имеется интеграция TTS (Text-To-Speech)]" map_pool = "CorvaxDefaultMapPool" maxplayers = 150 soft_max_players = 70 diff --git a/Resources/ConfigPresets/Corvax/main.toml b/Resources/ConfigPresets/Corvax/main.toml index 4b91f6fbc92..4d59c9df834 100644 --- a/Resources/ConfigPresets/Corvax/main.toml +++ b/Resources/ConfigPresets/Corvax/main.toml @@ -1,6 +1,6 @@ [game] -hostname = "🛰️ Corvax — Мейн 🚀 [TTS]" -desc = "Корвакс — первый русскоязычный проект в Space Station 14.\nНа этом сервере пониженные требования к RP.\nИмеется интеграция TTS (Text-To-Speech)." +hostname = "🛰️ Corvax — Мейн 🚀⚡ [TTS][NEXT]" +desc = "Корвакс — первый русскоязычный проект в Space Station 14.\n⚡На этом сервере используется сборка Corvax Next. Больше контента, возможностей и взаимодействия!\nНа этом сервере пониженные требования к RP.\nИмеется интеграция TTS (Text-To-Speech)." map_pool = "CorvaxDefaultMapPool" maxplayers = 190 soft_max_players = 105 From cf698b2cd8d797e7fe5ccba4da7ba63975075aee Mon Sep 17 00:00:00 2001 From: Litogin <139079015+Litogin@users.noreply.github.com> Date: Fri, 6 Dec 2024 02:10:01 +0300 Subject: [PATCH 2/2] Fix displacements map for female vulp and reptilian (#2832) Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> --- .../Entities/Mobs/Species/vulpkanin.yml | 26 ++++++++++++++++-- .../Entities/Mobs/Species/reptilian.yml | 21 ++++++++++---- .../displacement.rsi/jumpsuit-female.png | Bin 0 -> 468 bytes .../Mobs/Species/displacement.rsi/meta.json | 4 +++ 4 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 Resources/Textures/Corvax/Mobs/Species/displacement.rsi/jumpsuit-female.png diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Species/vulpkanin.yml index cf247699f67..7dbefcd3dba 100644 --- a/Resources/Prototypes/Corvax/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Species/vulpkanin.yml @@ -31,13 +31,24 @@ requiredLegs: 2 - type: Inventory speciesId: reptilian # whyyy + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Corvax/Mobs/Species/displacement.rsi + state: jumpsuit-female + shoes: + sizeMaps: + 32: + sprite: Corvax/Mobs/Species/displacement.rsi + state: shoes displacements: jumpsuit: sizeMaps: 32: sprite: Corvax/Mobs/Species/displacement.rsi state: jumpsuit - shoes: # DM only for colored shoes! + shoes: sizeMaps: 32: sprite: Corvax/Mobs/Species/displacement.rsi @@ -84,13 +95,24 @@ species: Vulpkanin - type: Inventory speciesId: reptilian + femaleDisplacements: + jumpsuit: + sizeMaps: + 32: + sprite: Corvax/Mobs/Species/displacement.rsi + state: jumpsuit-female + shoes: + sizeMaps: + 32: + sprite: Corvax/Mobs/Species/displacement.rsi + state: shoes displacements: jumpsuit: sizeMaps: 32: sprite: Corvax/Mobs/Species/displacement.rsi state: jumpsuit - shoes: # DM only for colored shoes! + shoes: sizeMaps: 32: sprite: Corvax/Mobs/Species/displacement.rsi diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index 37750afa4dc..0743d8ab8b7 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -74,22 +74,26 @@ jumpsuit: sizeMaps: 32: - sprite: Mobs/Species/Human/displacement.rsi + sprite: Corvax/Mobs/Species/displacement.rsi # Corvax-Digitigrade state: jumpsuit-female # Corvax-Digitigrade-Start + shoes: + sizeMaps: + 32: + sprite: Corvax/Mobs/Species/displacement.rsi + state: shoes displacements: jumpsuit: sizeMaps: 32: sprite: Corvax/Mobs/Species/displacement.rsi state: jumpsuit - shoes: # DM only for colored shoes! + shoes: sizeMaps: 32: sprite: Corvax/Mobs/Species/displacement.rsi state: shoes - - # Corvax-Digitigrade-End + # Corvax-Displacements-End - type: entity parent: BaseSpeciesDummy @@ -109,16 +113,21 @@ jumpsuit: sizeMaps: 32: - sprite: Mobs/Species/Human/displacement.rsi + sprite: Corvax/Mobs/Species/displacement.rsi # Corvax-Digitigrade state: jumpsuit-female # Corvax-Digitigrade-Start + shoes: + sizeMaps: + 32: + sprite: Corvax/Mobs/Species/displacement.rsi + state: shoes displacements: jumpsuit: sizeMaps: 32: sprite: Corvax/Mobs/Species/displacement.rsi state: jumpsuit - shoes: # DM only for colored shoes! + shoes: sizeMaps: 32: sprite: Corvax/Mobs/Species/displacement.rsi diff --git a/Resources/Textures/Corvax/Mobs/Species/displacement.rsi/jumpsuit-female.png b/Resources/Textures/Corvax/Mobs/Species/displacement.rsi/jumpsuit-female.png new file mode 100644 index 0000000000000000000000000000000000000000..c75c83ce3e80c47d60395342d63d81e8c20221ed GIT binary patch literal 468 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z`#fD7Ln`LH zo%Jy9kO5E2`PB8cDW(0r3coM9wXAjS%`B4L>)+KCaA5iB$4h)0nv;JvTMIci{9e*1 zcwg4+3*RpD6ozO9X~_d(2i({;ux^;hXgc@uooNOlt5>;g>G&Ub`DbK<-02-+A5B?q zFx@!8u#LgYXu-12)_%?H=NZ;AH|?*MPC0O^FT3l^W~HxMYaeMd1C_P#Xk6Zydh2^f zyeV(msfM-U_G=%nH%sU}t$Q{@G~Tp9x1pCOfm@)ddn2FQo7ThE8IY{cVax%!X!cp2 z7aL94a{hDaeeufajC=iZt?xB~1nz{zQX8(yuVniZ40rdkTMW!~Q~yL?j4~E^+bA-- zGwJr@V>iX(lMa*w2Nl$