diff --git a/Resources/Locale/ru-RU/_white/recipes/furniture/comfy_chairs.ftl b/Resources/Locale/ru-RU/_white/recipes/furniture/comfy_chairs.ftl index 2c0426ca2b..49beb44a56 100644 --- a/Resources/Locale/ru-RU/_white/recipes/furniture/comfy_chairs.ftl +++ b/Resources/Locale/ru-RU/_white/recipes/furniture/comfy_chairs.ftl @@ -1,29 +1,32 @@ -ent-BlackChairComfy = черное удобное кресло +ent-ChairComfy = удобное кресло .desc = Оно выглядит удобным. +ent-BlackChairComfy = черное удобное кресло + .desc = { ent-ChairComfy.desc } + ent-BlueChairComfy = синее удобное кресло - .desc = Оно выглядит удобным. + .desc = { ent-ChairComfy.desc } ent-GreenChairComfy = зелёное удобное кресло - .desc = Оно выглядит удобным. + .desc = { ent-ChairComfy.desc } ent-OrangeChairComfy = оранжевое удобное кресло - .desc = Оно выглядит удобным. + .desc = { ent-ChairComfy.desc } ent-PinkChairComfy = розовое удобное кресло - .desc = Оно выглядит удобным. + .desc = { ent-ChairComfy.desc } ent-PurpleChairComfy = фиолетовое удобное кресло - .desc = Оно выглядит удобным. + .desc = { ent-ChairComfy.desc } ent-RedChairComfy = красное удобное кресло - .desc = Оно выглядит удобным. + .desc = { ent-ChairComfy.desc } ent-WhiteChairComfy = белое удобное кресло - .desc = Оно выглядит удобным. + .desc = { ent-ChairComfy.desc } ent-BrownChairComfy = коричневое удобное кресло - .desc = Оно выглядит удобным. + .desc = { ent-ChairComfy.desc } ent-LightBlueChairComfy = светло-синее удобное кресло - .desc = Оно выглядит удобным. + .desc = { ent-ChairComfy.desc } diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl index 5df6e46f3f..0c94ebec9a 100644 --- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl @@ -91,7 +91,7 @@ uplink-pistol-magazine-c20r-desc = Магазин с 30 патронами. Со uplink-pistol-magazine-caseless-name = Пистолетный магазин (.25 безгильзовые) uplink-pistol-magazine-caseless-desc = Пистолетный магазин на 10 патронов. Совместим с Коброй. -uplink-speedloader-magnum-name = Спидлоадер (.40 магнум) +uplink-speedloader-magnum-name = Спидлоадер (.45 магнум) uplink-speedloader-magnu-desc = Револьверный спидлоадер с 6 патронами. Совместим с Питоном. uplink-mosin-ammo-name = Коробка патронов (.30 винтовочные) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/furniture.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/furniture.yml index 12605444b0..3a161492b7 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/furniture.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/furniture.yml @@ -9,6 +9,7 @@ state: comfy-random - type: RandomSpawner prototypes: + - ComfyChair # WD - BlackComfyChair - BlueComfyChair - GreenComfyChair @@ -17,8 +18,8 @@ - PurpleComfyChair - RedComfyChair - WhiteComfyChair - - LightBlueComfyChair - - BrownComfyChair + - LightBlueComfyChair # WD + - BrownComfyChair # WD chance: 1 - type: entity @@ -40,4 +41,4 @@ - PurplePaddedStool - RedPaddedStool - WhitePaddedStool - chance: 1 \ No newline at end of file + chance: 1 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml index 34998c4c59..4928e95d56 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml @@ -77,6 +77,11 @@ amount: 2 doAfter: 1 #WD edit start + - to: chairComfy + steps: + - material: Steel + amount: 2 + doAfter: 1 - to: brownChairComfy steps: - material: Steel diff --git a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml index 99241a6c00..8030597b8d 100644 --- a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml +++ b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml @@ -131,13 +131,13 @@ - type: cargoProduct - name: ящик патронов .40 магнум - description: ящик с коробкой патронов .40 магнум - id: cargo40magnum + name: ящик патронов .45 магнум + description: ящик с коробкой патронов .45 магнум + id: cargo45magnum icon: sprite: Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi state: base-b - product: Crate40magnum + product: Crate45magnum cost: 3000 category: Security group: market diff --git a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml index 1272250a93..1a16669d25 100644 --- a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml +++ b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml @@ -100,8 +100,8 @@ - type: entity parent: CrateWeaponSecure - id: Crate40magnum - name: ящик патронов .40 магнум + id: Crate45magnum + name: ящик патронов .45 магнум components: - type: StorageFill contents: