Skip to content

Commit

Permalink
Dark chair and curtains (try 2) (#439)
Browse files Browse the repository at this point in the history
* add-dark-chair

* fixes

just fix

* fix + curtains

* FUCK MERGE CONFLICTS pt.1

* Revert "FUCK MERGE CONFLICTS pt.1"

This reverts commit 31a669d.

* fix

* fix?

* fuck

* nonono

fuck

* pizdec

* Update curtains.yml

* peh

* bruh

---------

Co-authored-by: Kirillcas <[email protected]>
  • Loading branch information
bazelik-null and Kirillcas authored Jan 31, 2024
1 parent 5ff1144 commit 4928694
Show file tree
Hide file tree
Showing 13 changed files with 168 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,8 @@ ent-HospitalCurtains = шторы
ent-HospitalCurtainsOpen = { ent-HospitalCurtains }
.suffix = Открытый
.desc = { ent-HospitalCurtains.desc }
ent-DarkCurtains = тёмные шторы
.desc = Содержат менее 1% ртути, а ещё тёмные.
ent-DarkCurtainsOpen = { ent-DarkCurtains }
.suffix = Открытый
.desc = { ent-DarkCurtains.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ ent-ChairFoldingSpawnFolded = { ent-ChairFolding }
.desc = { ent-ChairFolding.desc }
ent-SteelBench = стальная скамейка
.desc = Длинная скамья, созданная для метро. Реально стандартный дизайн.
ent-ComfyDarkChair = чёрное кресло
.desc = Довольное удобное кресло тёмного цвета.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
- type: entity
id: DarkCurtains
parent: HospitalCurtains
suffix: Open
components:
- type: Sprite
snapCardinals: true
sprite: Backmen/Structures/Decoration/curtains.rsi
layers:
- state: closed
map: ["enum.DoorVisualLayers.Base"]
- type: Construction
graph: Curtains
node: CurtainsDark

- type: entity
id: DarkCurtainsOpen
parent: HospitalCurtainsOpen
suffix: Open
components:
- type: Door
state: open
- type: Construction
graph: Curtains
node: СurtainsOpenDark
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: entity
name: comfy dark chair
id: ComfyDarkChair
parent: ComfyChair
description: Quite a comfortable dark chair.
components:
- type: Sprite
sprite: Backmen/Structures/Furniture/chairs.rsi
state: dark-comfy
- type: Construction
graph: Seat
node: chairDarkComfy
34 changes: 34 additions & 0 deletions Resources/Prototypes/Backmen/Recipes/Construction/furniture.yml
Original file line number Diff line number Diff line change
Expand Up @@ -354,3 +354,37 @@
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked

- type: construction
name: comfy dark chair
id: ChairDarkComfy
graph: Seat
startNode: start
targetNode: chairDarkComfy
category: construction-category-furniture
description: Quite a comfortable dark chair.
icon:
sprite: Backmen/Structures/Furniture/chairs.rsi
state: dark-comfy
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked

- type: construction
id: CurtainsDark
name: dark curtains
description: Contains less than 1% mercury and dark.
graph: Curtains
startNode: start
targetNode: CurtainsDark
category: construction-category-furniture
icon:
sprite: Backmen/Structures/Decoration/curtains.rsi
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@
- material: Cloth
amount: 2
doAfter: 1
- to: CurtainsDark
completed:
- !type:SnapToGrid { }
steps:
- material: Cloth
amount: 2
doAfter: 1

- node: Curtains
entity: HospitalCurtains
edges:
Expand All @@ -35,3 +43,26 @@
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsDark
entity: DarkCurtains
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialCloth1
amount: 2
steps:
- tool: Cutting
doAfter: 1
- node: СurtainsOpenDark
entity: DarkCurtainsOpen
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialCloth1
amount: 2
steps:
- tool: Cutting
doAfter: 1

Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,13 @@
doAfter: 1
- material: Cloth
amount: 1
# backmen-start
- to: chairDarkComfy
steps:
- material: Steel
amount: 2
doAfter: 1
# backmen-end

- node: chair
entity: Chair
Expand Down Expand Up @@ -219,3 +226,17 @@
doAfter: 1
- tool: Screwing
doAfter: 1

# backmen-start
- node: chairDarkComfy
entity: ComfyDarkChair
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 2
steps:
- tool: Screwing
doAfter: 1
# backmen-end
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "by KTDR-null (ktdr_ban)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "open",
"directions": 1
},
{
"name": "closed",
"directions": 1
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "by EDMI",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "dark-comfy",
"directions": 4
},
{
"name": "dark-comfy-overlay",
"directions": 4
}
]
}

0 comments on commit 4928694

Please sign in to comment.