From d9a8fae8691f689b9750fa51ac9ad16a9343bc10 Mon Sep 17 00:00:00 2001 From: pheenty Date: Sat, 5 Oct 2024 01:22:59 +0700 Subject: [PATCH 1/4] =?UTF-8?q?=D1=87=D1=83=D1=82=D1=8C-=D1=87=D1=83=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Stories/Entities/Clothing/Head/hoods.yml | 6 ++++-- .../Stories/Entities/Clothing/Neck/cloaks.yml | 12 +++++++----- .../Entities/Clothing/OuterClothing/coats.yml | 5 +++-- .../Entities/Clothing/OuterClothing/vests.yml | 13 ++++++++++--- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Stories/Entities/Clothing/Head/hoods.yml index 9def13a694..7743aaaf5d 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/Head/hoods.yml @@ -33,7 +33,8 @@ - HeadTop - HeadSide - type: TemperatureProtection - coefficient: 0.005 + CoolingCooficient: 0.005 + HeatingCoefficient: 0.005 - type: PressureProtection highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 @@ -66,7 +67,8 @@ - HeadTop - HeadSide - type: TemperatureProtection - coefficient: 0.005 + CoolingCooficient: 0.005 + HeatingCoefficient: 0.005 - type: PressureProtection highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml index f392702d76..97329ad060 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml @@ -2,10 +2,11 @@ parent: ClothingNeckBase id: ClothingNeckCloakSith name: плащ инквизитора - description: Невероятное произведение искусства объединяющие в себе прочность и легкость. Заряжен неведомой энергией. + description: Невероятное произведение искусства, объединяющее в себе прочность и легкость. Заряжен неведомой энергией. components: - type: TemperatureProtection - coefficient: 0.001 + CoolingCooficient: 0.001 + HeatingCoefficient: 0.001 - type: PressureProtection highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 @@ -43,10 +44,11 @@ parent: ClothingNeckBase id: ClothingNeckCloakKylo name: плащ кайло рена - description: Невероятное произведение искусства объединяющие в себе прочность и легкость. + description: Невероятное произведение искусства, объединяющее в себе прочность и легкость. components: - type: TemperatureProtection - coefficient: 0.001 + CoolingCooficient: 0.001 + HeatingCoefficient: 0.001 - type: PressureProtection highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 @@ -79,7 +81,7 @@ parent: ClothingNeckBase id: ClothingNeckCloakExe name: плащ хранителя - description: Похоже тут выгравировано R u s t e d T i m. Что же это может значить? + description: Похоже, тут выгравировано R u s t e d T i m. Что же это может значить? components: - type: Tag tags: diff --git a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml index 6d5e93b63e..fc77b4b9d8 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml @@ -2,7 +2,7 @@ parent: ClothingOuterStorageBase id: ClothingOuterCoatJedi name: накидка джедая - description: Длинный вид одежды, который свободно лежит на плечах, охватывая шею, но не имеет капюшона. + description: Длинный вид одежды, который свободно лежит на плечах, охватывая шею. components: - type: Tag tags: @@ -10,7 +10,8 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodJedihood - type: TemperatureProtection - coefficient: 0.001 + CoolingCooficient: 0.001 + HeatingCoefficient: 0.001 - type: ClothingSpeedModifier walkModifier: 1 sprintModifier: 1.04 diff --git a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml index e4dbecd1d1..1a0de6ccb2 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml @@ -2,13 +2,14 @@ parent: ClothingOuterArmorBasic id: ClothingOuterVestJediNt name: утепленный бронежилет стража клинка - description: Потому что, кто-то сказал, что бронежилеты могут быть утепленны. Ваш щит уже утеплен! + description: Потому что кто-то сказал, что бронежилеты могут быть утеплены. Ваш щит уже утеплен! components: - type: Tag tags: - ForceRecallEquipment - type: TemperatureProtection - coefficient: 0.001 + CoolingCooficient: 0.001 + HeatingCoefficient: 0.001 - type: Sprite sprite: Stories/Clothing/OuterClothing/Vests/jedi_nt.rsi - type: Clothing @@ -29,8 +30,14 @@ parent: ClothingOuterArmorBasic id: ClothingOuterVestArmorExe name: бронежилет хранителя - description: Тонкий бронежилет типа I, обеспечивающий достойную защиту от большинства видов повреждений. + description: Элегантный бронежилет, оберегающий хранителя от большинства видов повреждений и перепадов температур. components: + - type: Tag + tags: + - ForceRecallEquipment + - type: TemperatureProtection + CoolingCooficient: 0.001 + HeatingCoefficient: 0.001 - type: Sprite sprite: Stories/Clothing/OuterClothing/Vests/exe_armor.rsi - type: Clothing From ecb27ba32bce95c1456bdbbca798bc2fcede7f16 Mon Sep 17 00:00:00 2001 From: pheenty Date: Sat, 5 Oct 2024 01:28:22 +0700 Subject: [PATCH 2/4] =?UTF-8?q?=D0=B4=D0=B2=D0=B5=20=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D1=8F=D1=82=D1=8B=D0=B5,=20=D1=88=D0=B5=D1=81=D1=82=D1=8C=20?= =?UTF-8?q?=D0=BA=D0=B0=D0=B2=D1=8B=D1=87=D0=B5=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml | 2 +- .../Prototypes/Stories/Entities/Clothing/Neck/mantles.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml index 97329ad060..bbe18ef4e3 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml @@ -81,7 +81,7 @@ parent: ClothingNeckBase id: ClothingNeckCloakExe name: плащ хранителя - description: Похоже, тут выгравировано R u s t e d T i m. Что же это может значить? + description: Похоже, тут выгравировано "R u s t e d T i m". Что же это может значить? components: - type: Tag tags: diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Stories/Entities/Clothing/Neck/mantles.yml index d1e0b255a3..05c905e2f2 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/Neck/mantles.yml @@ -2,7 +2,7 @@ parent: ClothingNeckBase id: ClothingNeckMantleJediNomad name: мантия путника - description: Похоже тут выгравировано o k h r i m m. Что же это может значить? + description: Похоже, тут выгравировано "o k h r i m m". Что же это может значить? components: - type: Tag tags: @@ -16,7 +16,7 @@ parent: ClothingNeckBase id: ClothingNeckMantleJediNt name: мантия стража клинка - description: Похоже тут выгравировано W o o b y. Что же это может значить? + description: Похоже, тут выгравировано "W o o b y". Что же это может значить? components: - type: Tag tags: From 209b28c74ef8053c08f977f6d98f6bd3d04c8782 Mon Sep 17 00:00:00 2001 From: pheenty Date: Sat, 5 Oct 2024 01:45:51 +0700 Subject: [PATCH 3/4] =?UTF-8?q?=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=BA?= =?UTF-8?q?=D0=B0,=20=D0=B8=D0=B7-=D0=B7=D0=B0=20=D0=BA=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=BE=D0=B9=20=D0=BD=D0=B8=D1=87=D0=B5=D0=B3=D0=BE=20?= =?UTF-8?q?=D0=BD=D0=B5=20=D1=81=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=BB?= =?UTF-8?q?=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Stories/Entities/Clothing/Head/hoods.yml | 4 ++-- .../Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml | 4 ++-- .../Stories/Entities/Clothing/OuterClothing/coats.yml | 2 +- .../Stories/Entities/Clothing/OuterClothing/vests.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Stories/Entities/Clothing/Head/hoods.yml index 7743aaaf5d..d173619e0d 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/Head/hoods.yml @@ -33,7 +33,7 @@ - HeadTop - HeadSide - type: TemperatureProtection - CoolingCooficient: 0.005 + CoolingCoefficient: 0.005 HeatingCoefficient: 0.005 - type: PressureProtection highPressureMultiplier: 0.08 @@ -67,7 +67,7 @@ - HeadTop - HeadSide - type: TemperatureProtection - CoolingCooficient: 0.005 + CoolingCoefficient: 0.005 HeatingCoefficient: 0.005 - type: PressureProtection highPressureMultiplier: 0.08 diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml index bbe18ef4e3..e09c192508 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml @@ -5,7 +5,7 @@ description: Невероятное произведение искусства, объединяющее в себе прочность и легкость. Заряжен неведомой энергией. components: - type: TemperatureProtection - CoolingCooficient: 0.001 + CoolingCoefficient: 0.001 HeatingCoefficient: 0.001 - type: PressureProtection highPressureMultiplier: 0.02 @@ -47,7 +47,7 @@ description: Невероятное произведение искусства, объединяющее в себе прочность и легкость. components: - type: TemperatureProtection - CoolingCooficient: 0.001 + CoolingCoefficient: 0.001 HeatingCoefficient: 0.001 - type: PressureProtection highPressureMultiplier: 0.02 diff --git a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml index fc77b4b9d8..b307cb7536 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml @@ -10,7 +10,7 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodJedihood - type: TemperatureProtection - CoolingCooficient: 0.001 + CoolingCoefficient: 0.001 HeatingCoefficient: 0.001 - type: ClothingSpeedModifier walkModifier: 1 diff --git a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml index 1a0de6ccb2..a28820f2e9 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml @@ -8,7 +8,7 @@ tags: - ForceRecallEquipment - type: TemperatureProtection - CoolingCooficient: 0.001 + CoolingCoefficient: 0.001 HeatingCoefficient: 0.001 - type: Sprite sprite: Stories/Clothing/OuterClothing/Vests/jedi_nt.rsi @@ -36,7 +36,7 @@ tags: - ForceRecallEquipment - type: TemperatureProtection - CoolingCooficient: 0.001 + CoolingCoefficient: 0.001 HeatingCoefficient: 0.001 - type: Sprite sprite: Stories/Clothing/OuterClothing/Vests/exe_armor.rsi From fa854e76c0f1359fc64402bacfc537b1a19d45c7 Mon Sep 17 00:00:00 2001 From: pheenty Date: Sat, 5 Oct 2024 01:54:41 +0700 Subject: [PATCH 4/4] =?UTF-8?q?=D0=BD=D0=B0=D0=B4=D0=BE=20=D1=81=20=D0=BC?= =?UTF-8?q?=D0=B0=D0=BB=D0=B5=D0=BD=D1=8C=D0=BA=D0=BE=D0=B9=20=D0=B1=D1=83?= =?UTF-8?q?=D0=BA=D0=B2=D1=8B.=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D0=BE=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Stories/Entities/Clothing/Head/hoods.yml | 8 ++++---- .../Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml | 8 ++++---- .../Stories/Entities/Clothing/OuterClothing/coats.yml | 4 ++-- .../Stories/Entities/Clothing/OuterClothing/vests.yml | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Stories/Entities/Clothing/Head/hoods.yml index d173619e0d..7a4836124c 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/Head/hoods.yml @@ -33,8 +33,8 @@ - HeadTop - HeadSide - type: TemperatureProtection - CoolingCoefficient: 0.005 - HeatingCoefficient: 0.005 + coolingCoefficient: 0.005 + heatingCoefficient: 0.005 - type: PressureProtection highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 @@ -67,8 +67,8 @@ - HeadTop - HeadSide - type: TemperatureProtection - CoolingCoefficient: 0.005 - HeatingCoefficient: 0.005 + coolingCoefficient: 0.005 + heatingCoefficient: 0.005 - type: PressureProtection highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml index e09c192508..09cedbbb64 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml @@ -5,8 +5,8 @@ description: Невероятное произведение искусства, объединяющее в себе прочность и легкость. Заряжен неведомой энергией. components: - type: TemperatureProtection - CoolingCoefficient: 0.001 - HeatingCoefficient: 0.001 + coolingCoefficient: 0.001 + heatingCoefficient: 0.001 - type: PressureProtection highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 @@ -47,8 +47,8 @@ description: Невероятное произведение искусства, объединяющее в себе прочность и легкость. components: - type: TemperatureProtection - CoolingCoefficient: 0.001 - HeatingCoefficient: 0.001 + coolingCoefficient: 0.001 + heatingCoefficient: 0.001 - type: PressureProtection highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml index b307cb7536..36338cc325 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml @@ -10,8 +10,8 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodJedihood - type: TemperatureProtection - CoolingCoefficient: 0.001 - HeatingCoefficient: 0.001 + coolingCoefficient: 0.001 + heatingCoefficient: 0.001 - type: ClothingSpeedModifier walkModifier: 1 sprintModifier: 1.04 diff --git a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml index a28820f2e9..116eced58c 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml @@ -8,8 +8,8 @@ tags: - ForceRecallEquipment - type: TemperatureProtection - CoolingCoefficient: 0.001 - HeatingCoefficient: 0.001 + coolingCoefficient: 0.001 + heatingCoefficient: 0.001 - type: Sprite sprite: Stories/Clothing/OuterClothing/Vests/jedi_nt.rsi - type: Clothing @@ -36,8 +36,8 @@ tags: - ForceRecallEquipment - type: TemperatureProtection - CoolingCoefficient: 0.001 - HeatingCoefficient: 0.001 + coolingCoefficient: 0.001 + heatingCoefficient: 0.001 - type: Sprite sprite: Stories/Clothing/OuterClothing/Vests/exe_armor.rsi - type: Clothing