Merge branch 'master' into new_year_food

AdventureTimeSS14 · Dec 11, 2023 · 25eaeaf · 25eaeaf
2 parents 337a1d9 + 8f75754
commit 25eaeaf
Show file tree

Hide file tree

Showing 46 changed files with 2,165 additions and 80 deletions.
diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -748,10 +748,28 @@ Entries:
   id: 55628 #костыль отображения в Обновлениях
   time: '2023-12-10T04:20:00.0000000+00:00'
 
+- author: Aserovich
+  changes:
+  - {message: Бур нельзя ложить в карман, type: Fix}
+  - {message: Белье сумеречников больше не одевается выше одежды, type: Fix}
+  - {message: Сумеречники не могут выбирать прически, type: Fix}
+  - {message: Угловые окна начали сливатся со стенами, type: Fix}
+  - {message: Добавил плюшевого сумеречника и включил его в список игрушек набора игрушек, type: Add}
+  - {message: Добавил одежду от Тимрики, type: Add}
+  - {message: Добавил в шкаф ГСБ плату для управления СБ шаттлом, type: Add}
+  id: 55629 #костыль отображения в Обновлениях
+  time: '2023-12-10T04:20:00.0000000+00:00'
+
+- author: Шрёдингер
+  changes:
+  - {message: Добален принтер форм, type: Add}
+  id: 55630 #костыль отображения в Обновлениях
+  time: '2023-12-11T04:20:00.0000000+00:00'
+
 - author: Петр Игнатьевич
   changes:
   - {message: Добавлены новогодние закуски и блюда и рецепты для их приготовления, type: Add}
   - {message: Добавлен НовогодоМат, type: Add}
   - {message: В торговые автоматы добавлены праздничные напитки и наборы сладостей, type: Add}
-  id: 55629 #костыль отображения в Обновлениях
+  id: 55631 #костыль отображения в Обновлениях
   time: '2023-12-11T07:20:00.0000000+00:00'
diff --git a/Resources/Locale/ru-RU/ADT/paper/doc-printer.ftl b/Resources/Locale/ru-RU/ADT/paper/doc-printer.ftl
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml
@@ -518,7 +518,7 @@
 - type: entity
   parent: ClothingUniformBase
   id: ADTClothingUniformJumpsuitBlackShirt
-  name: black shirt 
+  name: black shirt
   description: An usual black shirt. Made by company "Modeling Agency Dar-Vaxed".
   components:
   - type: Sprite
@@ -533,7 +533,7 @@
   description: An usual blue shirt with brown pants. Made by company "Modeling Agency Dar-Vaxed".
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpsuit/blue_shirt.rsi 
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/blue_shirt.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpsuit/blue_shirt.rsi #спрайты от prazat911
 
@@ -544,7 +544,7 @@
   description: For those, who don't like bright colors.
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpsuit/gothic_attire.rsi 
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/gothic_attire.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpsuit/gothic_attire.rsi #спрайты от dion_clawed
 
@@ -566,7 +566,7 @@
   description: I don't know how he got there...
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpsuit/fancy_shirt.rsi 
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/fancy_shirt.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpsuit/fancy_shirt.rsi #спрайты от prazat911
 
@@ -588,7 +588,7 @@
   description: An ideal variant for those, who wants to look serious, but still lively as a cricket. Made by company "Modeling Agency Dar-Vaxed".
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpsuit/hawaiian_shirt.rsi 
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/hawaiian_shirt.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpsuit/hawaiian_shirt.rsi #спрайты от prazat911
 
@@ -599,7 +599,7 @@
   description: A carefully groomed suit. Maybe it had bright brown colours, until they came out. Made by company "Modeling Agency Dar-Vaxed".
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Uniforms/Jumpsuit/old_brown_shirt.rsi 
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/old_brown_shirt.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpsuit/old_brown_shirt.rsi #спрайты от prazat911
 
@@ -857,7 +857,7 @@
     sprite: ADT/Clothing/Uniforms/Jumpsuit/newmekkauniform.rsi
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpsuit/newmekkauniform.rsi
-  - type: Armor 
+  - type: Armor
     modifiers:
       coefficients:
         Blunt: 0.8
@@ -908,7 +908,7 @@
 #New Year
 - type: entity
   parent: ClothingUniformBase
-  id: ADTClothingUniformJumpsuitSweaterHolidayBeige 
+  id: ADTClothingUniformJumpsuitSweaterHolidayBeige
   name: beige sweater
   description: A real star of the show is wearing this sweater.
   suffix: New Year
@@ -1048,4 +1048,17 @@
   - type: Sprite
     sprite: ADT/Clothing/Uniforms/Jumpsuit/New-Year/shirt_snowman.rsi
   - type: Clothing
-    sprite: ADT/Clothing/Uniforms/Jumpsuit/New-Year/shirt_snowman.rsi #спрайты от prazat911
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/New-Year/shirt_snowman.rsi #спрайты от prazat911
+
+#Одежда от Тимрики
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ADTClothingUniformCasimaCorsete
+  name: камиза с корсетом #Именная одежда Pangaari
+  description: Этот образ кажется вам очередным урывком прошлого. Выглядит просто, но от чего-то загадочно.
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/casima_corsete.rsi #спрайты от тимрики
+  - type: Clothing
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/casima_corsete.rsi #спрайты от тимрики