From 9ef8dfd684d62af0e5c50049e9ea1ad4831b9c37 Mon Sep 17 00:00:00 2001 From: Farrellka <104170263+Farrellka-dev@users.noreply.github.com> Date: Sun, 3 Nov 2024 00:05:50 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B1?= =?UTF-8?q?=D0=B0=D0=B3=D0=BE=D0=B2=20(#318)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Фиксы багов * Фикс фиксов * Фикс тестов --- Resources/Locale/ru-RU/traits/traits.ftl | 2 +- .../Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml | 1 + Resources/Prototypes/Entities/Structures/Windows/shuttle.yml | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/traits/traits.ftl b/Resources/Locale/ru-RU/traits/traits.ftl index 4efc692b311..e3815ced874 100644 --- a/Resources/Locale/ru-RU/traits/traits.ftl +++ b/Resources/Locale/ru-RU/traits/traits.ftl @@ -61,7 +61,7 @@ trait-description-ForeignerLight = Чтобы помочь вам преодолеть это препятствие, у вас есть переводчик, который поможет вам говорить на основном языке этой станции. trait-name-Foreigner = Унесённый ядерным взрывом trait-description-Foreigner = - По той или иной причине вы не говорите на основном языке станции. + По той или иной причине вы не говорите на любом языке станции. Вместо этого вам выдан переводчик, которым можете пользоваться только вы. trait-name-Saturnine = Мрачный trait-description-Saturnine = Вы от природы суровы и угрюмый человек. Ваше настроение постоянно ухудшается. diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml index 2267ad85dd6..24e0449e1ea 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml @@ -72,6 +72,7 @@ id: SyndicateListenerGear equipment: jumpsuit: ClothingUniformJumpsuitPyjamaSyndicateBlack + back: ClothingBackpackSyndicate head: ClothingHeadPyjamaSyndicateBlack ears: ClothingHeadsetAltSyndicateListening gloves: ClothingHandsGlovesCombat diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml index b1850d6e8fc..877699f032b 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml @@ -39,6 +39,9 @@ - type: IconSmooth base: swindow - type: Appearance + - type: Construction + graph: Window + node: shuttleWindow - type: DamageVisuals thresholds: [4, 8, 12] damageDivisor: 28 @@ -46,7 +49,7 @@ damageOverlay: sprite: Structures/Windows/cracks.rsi - type: StaticPrice - price: 75 + price: 100 - type: entity parent: ShuttleWindow From b0205b3f36c72376086cf7dd95a3cb4d4774178c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CLost-Paradise-Bot=E2=80=9D?= <172407741+Lost-Paradise-Bot@users.noreply.github.com> Date: Sat, 2 Nov 2024 21:06:54 +0000 Subject: [PATCH 2/4] Automatic changelog update --- Resources/Changelog/ChangelogLPP.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index 3c27751ea68..1a858d5b08f 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -2611,3 +2611,27 @@ id: 141 time: '2024-11-02T13:25:44.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/316 +- author: Farrellka + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u044E\u043A\ + \u0437\u0430\u043A\u0438 \u0441\u0438\u043D\u0434\u0438\u043A\u0430\u0442\u0430\ + \ \u0434\u043B\u044F \u0430\u0433\u0435\u043D\u0442\u043E\u0432 \u043F\u0440\ + \u043E\u0441\u043B\u0443\u0448\u043A\u0438!" + type: Add + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u043E \u043E\u043F\u0438\u0441\ + \u0430\u043D\u0438\u0435 \u0442\u0440\u0435\u0439\u0442\u0430 \u0443\u043D\u0435\ + \u0441\u0451\u043D\u043D\u043E\u0433\u043E \u044F\u0434\u0435\u0440\u043D\u044B\ + \u043C \u0432\u0437\u0440\u044B\u0432\u043E\u043C!" + type: Tweak + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0434\u0435\u043C\ + \u043E\u043D\u0442\u0430\u0436 \u043E\u043A\u043D\u0430 \u0448\u0430\u0442\u0442\ + \u043B\u0430! \u0414\u0435\u043C\u043E\u043D\u0442\u0430\u0436 \u0443\u0441\u043B\ + \u043E\u0436\u043D\u0451\u043D, \u0430 \u043F\u043E\u0441\u043B\u0435 \u0434\ + \u0435\u043C\u043E\u043D\u0442\u0430\u0436\u0430 \u0432\u044B\u043F\u0430\u0434\ + \u0430\u044E\u0442 \u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\ + \u0443\u044E\u0449\u0438\u0435 \u0441\u0442\u0440\u043E\u0439\u043C\u0430\u0442\ + \u0435\u0440\u0438\u0430\u043B\u044B." + type: Fix + id: 142 + time: '2024-11-02T21:05:50.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/318 From 2ff2b0d33dbe466daf33e5be562427bb76b2ef02 Mon Sep 17 00:00:00 2001 From: PowerKAT1 <53919050+PowerKAT1@users.noreply.github.com> Date: Sun, 3 Nov 2024 00:44:05 +0300 Subject: [PATCH 3/4] =?UTF-8?q?M41-A=20=D0=A4=D0=B8=D0=BA=D1=81=20(#317)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * m41-A Фикс Патронов * m41-A Фикс Патронов * m41-A Фикс Патронов * m41-A Фикс Патронов --- .../guns/ammunition/magazines/M41-A_mag.ftl | 20 +- .../objects/weapons/guns/rifles/M41-A.ftl | 4 +- .../Guns/Ammunition/Magazines/M41-A_mag.yml | 180 +++++++++--------- .../Objects/Weapons/Guns/Rifles/M41-A.yml | 92 ++++----- 4 files changed, 148 insertions(+), 148 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazines/M41-A_mag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazines/M41-A_mag.ftl index 49a5d32b0f8..1a5e35fc248 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazines/M41-A_mag.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazines/M41-A_mag.ftl @@ -1,10 +1,10 @@ -ent-LPPBaseMagazineRifleM41A = Магазин для M41-A (.20 винтовочные) - .desc = { ent-BaseItem.desc } -ent-LPPBaseMagazineRifleM41AFull = Магазин для M41-A (.20 винтовочные Боевые) - .desc = { ent-LPPBaseMagazineRifleM41A.desc } -ent-LPPBaseMagazineRifleM41APractice = Магазин для M41-A (.20 винтовочные Учебные) - .desc = { ent-LPPBaseMagazineRifleM41A.desc } -ent-LPPBaseMagazineRifleM41ARubber = Магазин для M41-A (.20 винтовочные Резиновые) - .desc = { ent-LPPBaseMagazineRifleM41A.desc } -ent-LPPBaseMagazineRifleM41AUranium = Магазин для M41-A (.20 винтовочные Урановые) - .desc = { ent-LPPBaseMagazineRifleM41A.desc } +ent-LPPBaseMagazineRifleM41A = Магазин для M41-A (.30 винтовочные) + .desc = { ent-BaseItem.desc } +ent-LPPBaseMagazineRifleM41AFull = Магазин для M41-A (.30 винтовочные Боевые) + .desc = { ent-LPPBaseMagazineRifleM41A.desc } +ent-LPPBaseMagazineRifleM41APractice = Магазин для M41-A (.30 винтовочные Учебные) + .desc = { ent-LPPBaseMagazineRifleM41A.desc } +ent-LPPBaseMagazineRifleM41ARubber = Магазин для M41-A (.30 винтовочные Резиновые) + .desc = { ent-LPPBaseMagazineRifleM41A.desc } +ent-LPPBaseMagazineRifleM41AUranium = Магазин для M41-A (.30 винтовочные Урановые) + .desc = { ent-LPPBaseMagazineRifleM41A.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/rifles/M41-A.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/rifles/M41-A.ftl index 99ef022398f..31cd5bbc407 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/rifles/M41-A.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/rifles/M41-A.ftl @@ -1,2 +1,2 @@ -ent-LPPWeaponRifleM41 = М41-А - .desc = Старая винтовка, использовавшаяся во времена колониальной экспансии. Использует винтовочные патроны 20-го калибра. +ent-LPPWeaponRifleM41 = М41-А + .desc = Старая винтовка, использовавшаяся во времена колониальной экспансии. Использует винтовочные патроны 30-го калибра. diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/M41-A_mag.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/M41-A_mag.yml index e322a59355c..9ef76425b9e 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/M41-A_mag.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/M41-A_mag.yml @@ -1,90 +1,90 @@ -- type: entity - id: LPPBaseMagazineRifleM41A - name: "magazine M41-A (.20 rifle)" - parent: BaseItem - abstract: true - components: - - type: Tag - tags: - - MagazineRifleM41A - - type: Item - size: Small - - type: BallisticAmmoProvider - mayTransfer: true - whitelist: - tags: - - CartridgeRifle - capacity: 99 - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: Sprite - sprite: _LostParadise/Objects/Weapons/Guns/Ammunition/Magazine/M41-A_mag.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 5 - zeroVisible: false - - type: Appearance - -# Magazines -- type: entity - id: LPPBaseMagazineRifleM41AFull - name: "magazine M41-A (.20 rifle)" - parent: LPPBaseMagazineRifleM41A - components: - - type: BallisticAmmoProvider - proto: CartridgeRifle - - type: Sprite - layers: - - state: red - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - -- type: entity - id: LPPBaseMagazineRifleM41APractice - name: "magazine M41-A (.20 rifle practice)" - parent: LPPBaseMagazineRifleM41A - components: - - type: BallisticAmmoProvider - proto: CartridgeRiflePractice - - type: Sprite - layers: - - state: practice - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - -- type: entity - id: LPPBaseMagazineRifleM41ARubber - name: "magazine M41-A (.20 rifle rubber)" - parent: LPPBaseMagazineRifleM41A - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleRubber - - type: Sprite - layers: - - state: rubber - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - -- type: entity - id: LPPBaseMagazineRifleM41AUranium - name: "magazine (.20 rifle uranium)" - parent: LPPBaseMagazineRifleM41A - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleUranium - - type: Sprite - layers: - - state: uranium - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] +- type: entity + id: LPPBaseMagazineRifleM41A + name: "magazine M41-A (.30 rifle)" + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - MagazineRifleM41A + - type: Item + size: Small + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - CartridgeRifle + capacity: 99 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Guns/Ammunition/Magazine/M41-A_mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Appearance + +# Magazines +- type: entity + id: LPPBaseMagazineRifleM41AFull + name: "magazine M41-A (.30 rifle)" + parent: LPPBaseMagazineRifleM41A + components: + - type: BallisticAmmoProvider + proto: CartridgeRifle + - type: Sprite + layers: + - state: red + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: LPPBaseMagazineRifleM41APractice + name: "magazine M41-A (.30 rifle practice)" + parent: LPPBaseMagazineRifleM41A + components: + - type: BallisticAmmoProvider + proto: CartridgeRiflePractice + - type: Sprite + layers: + - state: practice + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: LPPBaseMagazineRifleM41ARubber + name: "magazine M41-A (.30 rifle rubber)" + parent: LPPBaseMagazineRifleM41A + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + + +- type: entity + id: LPPBaseMagazineRifleM41AUranium + name: "magazine (.30 rifle uranium)" + parent: LPPBaseMagazineRifleM41A + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleUranium + - type: Sprite + layers: + - state: uranium + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Rifles/M41-A.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Rifles/M41-A.yml index 9e22855f388..5ae493fc9f7 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Rifles/M41-A.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Rifles/M41-A.yml @@ -1,47 +1,47 @@ -- type: entity - name: M41-A - parent: BaseWeaponRifle - id: LPPWeaponRifleM41 - description: An old rifle used during the colonial expansion. Uses .20 rifle ammo. - components: - - type: Sprite - sprite: _LostParadise/Objects/Weapons/Guns/Rifles/M41-A.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Gun - fireRate: 7 - soundGunshot: - path: /Audio/_LostParadise/Weapons/Guns/Gunshots/M41-A.ogg - - type: ChamberMagazineAmmoProvider - soundRack: - path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: LPPBaseMagazineRifleM41AFull - insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - priority: 2 - whitelist: - tags: - - MagazineRifleM41A - gun_chamber: - name: Chamber - startingItem: CartridgeLightRifle - priority: 1 - whitelist: - tags: - - CartridgeLightRifle - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true +- type: entity + name: M41-A + parent: BaseWeaponRifle + id: LPPWeaponRifleM41 + description: An old rifle used during the colonial expansion. Uses .30 rifle ammo. + components: + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Guns/Rifles/M41-A.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Gun + fireRate: 7 + soundGunshot: + path: /Audio/_LostParadise/Weapons/Guns/Gunshots/M41-A.ogg + - type: ChamberMagazineAmmoProvider + soundRack: + path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: LPPBaseMagazineRifleM41AFull + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineRifleM41A + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifle + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true - type: Appearance \ No newline at end of file From eaf311461dcdeee56d1e1b6d7ee7d440e5e14f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CLost-Paradise-Bot=E2=80=9D?= <172407741+Lost-Paradise-Bot@users.noreply.github.com> Date: Sat, 2 Nov 2024 21:45:11 +0000 Subject: [PATCH 4/4] Automatic changelog update --- Resources/Changelog/ChangelogLPP.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index 1a858d5b08f..4dce67721bf 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -2635,3 +2635,13 @@ id: 142 time: '2024-11-02T21:05:50.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/318 +- author: PowerKAT1 + changes: + - message: "\u041E\u0442\u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\ + \u0430\u043D \u043F\u0435\u0440\u0435\u0432\u043E\u0434 \u043E\u043F\u0438\u0441\ + \u0430\u043D\u0438\u044F \u043E\u0431\u043E\u0438\u043C \u0438 \u0441\u0430\u043C\ + \u043E\u0433\u043E M41-A" + type: Fix + id: 143 + time: '2024-11-02T21:44:06.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/317