From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Tue, 23 Jan 2024 22:15:48 +0000 (+0200) Subject: Solo bench (#24203) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=016d35645f840bf76511734d4081e7b2b61c5624;p=space-station-14.git Solo bench (#24203) * solo bench * price * fix * comfy * 111 * clear --- diff --git a/Resources/Prototypes/Entities/Structures/Furniture/bench.yml b/Resources/Prototypes/Entities/Structures/Furniture/bench.yml new file mode 100644 index 0000000000..76bebd6166 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Furniture/bench.yml @@ -0,0 +1,51 @@ +- type: entity + name: comfortable bench + id: BenchComfy + parent: SeatBase + description: A bench with an extremely comfortable backrest. + components: + - type: Transform + anchored: true + - type: Rotatable + - type: Sprite + sprite: Structures/Furniture/Bench/comf_bench.rsi + layers: + - state: bench_solo_base + color: "#767e82" + - state: bench_solo_cover + - type: Physics + bodyType: Static + - type: StaticPrice + price: 15 + +- type: entity + id: BenchColorfulComfy + suffix: Solo. Colorful + parent: BenchComfy + description: A bench with an extremely comfortable backrest. + components: + - type: Sprite + layers: + - state: bench_solo_base + color: "#767e82" + - state: bench_solo_cover + map: [ "enum.DamageStateVisualLayers.Base" ] + - type: RandomSprite + available: + - enum.DamageStateVisualLayers.Base: + bench_solo_cover: Rainbow + +- type: entity + id: BenchRedComfy + suffix: Solo. Red + parent: BenchComfy + components: + - type: Sprite + layers: + - state: bench_solo_base + color: "#767e82" + - state: bench_solo_cover + color: "#8c4141" + - type: Construction + graph: Seat + node: redComfBench diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml index fe8a17bfb8..9089de34e8 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml @@ -63,6 +63,13 @@ - material: Steel amount: 2 doAfter: 1 + - to: redComfBench + steps: + - material: Steel + amount: 2 + doAfter: 1 + - material: Cloth + amount: 1 - node: chair entity: Chair @@ -196,3 +203,19 @@ - tool: Screwing doAfter: 1 + - node: redComfBench + entity: BenchRedComfy + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 1 + steps: + - tool: Cutting + doAfter: 1 + - tool: Screwing + doAfter: 1 diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml index 6e14834ff2..efe85a8546 100644 --- a/Resources/Prototypes/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/Recipes/Construction/furniture.yml @@ -203,6 +203,23 @@ conditions: - !type:TileNotBlocked +- type: construction + name: comfortable red bench + id: RedComfBench + graph: Seat + startNode: start + targetNode: redComfBench + category: construction-category-furniture + description: A bench with an extremely comfortable backrest. + icon: + sprite: Structures/Furniture/Bench/comf_bench.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + #tables - type: construction name: steel table diff --git a/Resources/Textures/Structures/Furniture/Bench/comf_bench.rsi/bench_solo_base.png b/Resources/Textures/Structures/Furniture/Bench/comf_bench.rsi/bench_solo_base.png new file mode 100644 index 0000000000..aefa48458e Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Bench/comf_bench.rsi/bench_solo_base.png differ diff --git a/Resources/Textures/Structures/Furniture/Bench/comf_bench.rsi/bench_solo_cover.png b/Resources/Textures/Structures/Furniture/Bench/comf_bench.rsi/bench_solo_cover.png new file mode 100644 index 0000000000..33b294f0ec Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Bench/comf_bench.rsi/bench_solo_cover.png differ diff --git a/Resources/Textures/Structures/Furniture/Bench/comf_bench.rsi/full.png b/Resources/Textures/Structures/Furniture/Bench/comf_bench.rsi/full.png new file mode 100644 index 0000000000..0fb29037fa Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Bench/comf_bench.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Bench/comf_bench.rsi/meta.json b/Resources/Textures/Structures/Furniture/Bench/comf_bench.rsi/meta.json new file mode 100644 index 0000000000..6bd529cb14 --- /dev/null +++ b/Resources/Textures/Structures/Furniture/Bench/comf_bench.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TG at commit https://github.com/tgstation/tgstation/commit/45b5bc20fbc0bdeb04e169f7aaa7ea8e14b4990b#diff-5d71c782b900bc77b4d1c5798be8d3e3c67dbc5ef5b3203c4995f01df471a633", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full", + "directions": 4 + }, + { + "name": "bench_solo_base", + "directions": 4 + }, + { + "name": "bench_solo_cover", + "directions": 4 + } + ] +}