Merge branch 'Corvax-Frontier:master' into Coliseum

Corvax-Frontier · Nov 29, 2024 · 4eb4b8f · 4eb4b8f
2 parents eb7560f + 5380da1
commit 4eb4b8f
Show file tree

Hide file tree

Showing 40 changed files with 34,550 additions and 75,183 deletions.
diff --git a/Resources/Locale/ru-RU/corvax/prototypes/entities/objects/decoration/flora.ftl b/Resources/Locale/ru-RU/corvax/prototypes/entities/objects/decoration/flora.ftl
@@ -0,0 +1,4 @@
+ent-NewYearTree0 = большая ель
+    .desc = Ель, излучающая волшебную ауру.
+ent-NewYearTree1 = новогодняя ёлка
+    .desc = Ты был хорошим мальчиком?
diff --git a/Resources/Locale/ru-RU/corvax/prototypes/entities/objects/decoration/garlands.ftl b/Resources/Locale/ru-RU/corvax/prototypes/entities/objects/decoration/garlands.ftl
@@ -0,0 +1,6 @@
+ent-GarlandsOff = гирлянды
+    .desc = Неработающие висюльки. Может они включатся когда что-то произойдет?
+    .suffix = Выключены
+ent-Garlands = { ent-GarlandsOff }
+    .desc = Красивое... Смотря на это, вы чувствуете, как наполняетесь новогодним духом.
+    .suffix = Включены
diff --git a/Resources/Locale/ru-RU/corvax/prototypes/entities/objects/decoration/presents.ftl b/Resources/Locale/ru-RU/corvax/prototypes/entities/objects/decoration/presents.ftl
@@ -0,0 +1,11 @@
+ent-BasePresentBox = декоративный подарок
+    .desc = Красивая обёртка, разочаровывающая пустота внутри.
+ent-BigPresentBox = { ent-BasePresentBox }
+    .desc = { ent-BasePresentBox.desc }
+    .suffix = Большой
+ent-MediumPresentBox = { ent-BasePresentBox }
+    .desc = { ent-BasePresentBox.desc }
+    .suffix = Средний
+ent-SmallPresentBox = { ent-BasePresentBox }
+    .desc = { ent-BasePresentBox.desc }
+    .suffix = Маленький
diff --git a/Resources/Maps/Corvax/Outpost/corvaxFrontier.yml b/Resources/Maps/Corvax/Outpost/corvaxFrontier.yml
diff --git a/Resources/Maps/Corvax/Shuttles/Civilian/Atlas.yml b/Resources/Maps/Corvax/Shuttles/Civilian/Atlas.yml
diff --git a/Resources/Maps/Corvax/Shuttles/Expedition/Sierra.yml b/Resources/Maps/Corvax/Shuttles/Expedition/Sierra.yml
diff --git a/.../Maps/Corvax/Shuttles/Civilian/Aurora.yml → ...aps/Corvax/Shuttles/Expedition/venera.yml b/.../Maps/Corvax/Shuttles/Civilian/Aurora.yml → ...aps/Corvax/Shuttles/Expedition/venera.yml