]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Solo bench (#24203)
authorNim <128169402+Nimfar11@users.noreply.github.com>
Tue, 23 Jan 2024 22:15:48 +0000 (00:15 +0200)
committerGitHub <noreply@github.com>
Tue, 23 Jan 2024 22:15:48 +0000 (17:15 -0500)
* solo bench

* price

* fix

* comfy

* 111

* clear

Resources/Prototypes/Entities/Structures/Furniture/bench.yml [new file with mode: 0644]
Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
Resources/Prototypes/Recipes/Construction/furniture.yml
Resources/Textures/Structures/Furniture/Bench/comf_bench.rsi/bench_solo_base.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Bench/comf_bench.rsi/bench_solo_cover.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Bench/comf_bench.rsi/full.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Bench/comf_bench.rsi/meta.json [new file with mode: 0644]

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/bench.yml b/Resources/Prototypes/Entities/Structures/Furniture/bench.yml
new file mode 100644 (file)
index 0000000..76bebd6
--- /dev/null
@@ -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
index fe8a17bfb8fbbe96b66a4a0e55e94a9ab908074b..9089de34e81743e39516330775cb57a514882e97 100644 (file)
             - material: Steel
               amount: 2
               doAfter: 1
+        - to: redComfBench
+          steps:
+            - material: Steel
+              amount: 2
+              doAfter: 1
+            - material: Cloth
+              amount: 1
 
     - node: chair
       entity: Chair
             - 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
index 6e14834ff2a6d96d3c0808403270bffd89b7cd18..efe85a8546ad7fa877273efc9ae0a9517bbbc720 100644 (file)
   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 (file)
index 0000000..aefa484
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 (file)
index 0000000..33b294f
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 (file)
index 0000000..0fb2903
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 (file)
index 0000000..6bd529c
--- /dev/null
@@ -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
+    }
+  ]
+}