Merge pull request #128 from space-syndicate/upstrean

micro-upstream #3
space-syndicate · Dec 6, 2024 · 5120fc5 · 5120fc5
2 parents 70337cf + 1eb5e55
commit 5120fc5
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 10 deletions.
diff --git 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
@@ -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

diff --git 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
@@ -74,17 +74,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!
         sizeMaps:
           32:
             sprite: Corvax/Mobs/Species/displacement.rsi
@@ -112,17 +116,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!
         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
diff --git a/Resources/Textures/Corvax/Mobs/Species/displacement.rsi/meta.json b/Resources/Textures/Corvax/Mobs/Species/displacement.rsi/meta.json
@@ -14,6 +14,10 @@
       "name": "jumpsuit",
       "directions": 4
     },
+    {
+        "name": "jumpsuit-female",
+        "directions": 4
+      },
     {
       "name": "shoes",
       "directions" : 4