Colourful curtains (#25684)

* curwa

* fix

* huh

* revert huh

* add fancy white

* resprite hospital

* add suffix

(cherry picked from commit 66cf642e5632dd960a0af56b526020ec1b025c24)
This commit is contained in:
Ed
2024-03-01 01:25:41 +03:00
committed by Debug
parent ba36e5195f
commit bbb4fe256c
35 changed files with 919 additions and 19 deletions

View File

@@ -1,16 +1,13 @@
- type: entity
id: HospitalCurtains
id: BaseCurtains
parent: BaseStructure
name: curtains
description: Contains less than 1% mercury.
description: Hides what others shouldn't see.
abstract: true
placement:
mode: SnapgridCenter
components:
- type: Occluder
- type: Sprite
snapCardinals: true
sprite: Structures/Decoration/curtains.rsi
layers:
- state: closed
map: ["enum.DoorVisualLayers.Base"]
- type: AnimationPlayer
- type: Fixtures
fixtures:
@@ -39,10 +36,7 @@
- type: Appearance
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Wood
- type: Construction
graph: Curtains
node: Curtains
damageModifierSet: Wood
- type: Destructible
thresholds:
- trigger:
@@ -56,20 +50,304 @@
MaterialCloth1:
min: 1
max: 2
placement:
mode: SnapgridCenter
- type: entity
id: HospitalCurtains
parent: BaseCurtains
suffix: Hospital
description: Contains less than 1% mercury.
components:
- type: Sprite
snapCardinals: true
sprite: Structures/Decoration/Curtains/hospital.rsi
layers:
- state: closed
map: ["enum.DoorVisualLayers.Base"]
- type: Construction
graph: Curtains
node: Curtains
- type: entity
id: HospitalCurtainsOpen
parent: HospitalCurtains
suffix: Open
suffix: Open, Hospital
components:
- type: Door
state: Open
- type: Occluder
enabled: false
- type: Physics
canCollide: false
- type: Construction
graph: Curtains
node: CurtainsOpen
- type: Physics
canCollide: false
- type: entity
id: CurtainsBlack
parent: BaseCurtains
suffix: Fancy black
components:
- type: Sprite
snapCardinals: true
sprite: Structures/Decoration/Curtains/black.rsi
layers:
- state: closed
map: ["enum.DoorVisualLayers.Base"]
- type: Construction
graph: Curtains
node: CurtainsBlack
- type: entity
id: CurtainsBlackOpen
parent: CurtainsBlack
suffix: Open, Fancy black
components:
- type: Door
state: Open
- type: Occluder
enabled: false
- type: Construction
graph: Curtains
node: CurtainsBlackOpen
- type: Physics
canCollide: false
- type: entity
id: CurtainsBlue
parent: BaseCurtains
suffix: Fancy blue
components:
- type: Sprite
snapCardinals: true
sprite: Structures/Decoration/Curtains/blue.rsi
layers:
- state: closed
map: ["enum.DoorVisualLayers.Base"]
- type: Construction
graph: Curtains
node: CurtainsBlue
- type: entity
id: CurtainsBlueOpen
parent: CurtainsBlue
suffix: Open, Fancy blue
components:
- type: Door
state: Open
- type: Occluder
enabled: false
- type: Construction
graph: Curtains
node: CurtainsBlueOpen
- type: Physics
canCollide: false
- type: entity
id: CurtainsCyan
parent: BaseCurtains
suffix: Fancy cyan
components:
- type: Sprite
snapCardinals: true
sprite: Structures/Decoration/Curtains/cyan.rsi
layers:
- state: closed
map: ["enum.DoorVisualLayers.Base"]
- type: Construction
graph: Curtains
node: CurtainsCyan
- type: entity
id: CurtainsCyanOpen
parent: CurtainsCyan
suffix: Open, Fancy cyan
components:
- type: Door
state: Open
- type: Occluder
enabled: false
- type: Construction
graph: Curtains
node: CurtainsCyanOpen
- type: Physics
canCollide: false
- type: entity
id: CurtainsGreen
parent: BaseCurtains
suffix: Fancy green
components:
- type: Sprite
snapCardinals: true
sprite: Structures/Decoration/Curtains/green.rsi
layers:
- state: closed
map: ["enum.DoorVisualLayers.Base"]
- type: Construction
graph: Curtains
node: CurtainsGreen
- type: entity
id: CurtainsGreenOpen
parent: CurtainsGreen
suffix: Open, Fancy green
components:
- type: Door
state: Open
- type: Occluder
enabled: false
- type: Construction
graph: Curtains
node: CurtainsGreenOpen
- type: Physics
canCollide: false
- type: entity
id: CurtainsOrange
parent: BaseCurtains
suffix: Fancy orange
components:
- type: Sprite
snapCardinals: true
sprite: Structures/Decoration/Curtains/orange.rsi
layers:
- state: closed
map: ["enum.DoorVisualLayers.Base"]
- type: Construction
graph: Curtains
node: CurtainsOrange
- type: entity
id: CurtainsOrangeOpen
parent: CurtainsOrange
suffix: Open, Fancy orange
components:
- type: Door
state: Open
- type: Occluder
enabled: false
- type: Construction
graph: Curtains
node: CurtainsOrangeOpen
- type: Physics
canCollide: false
- type: entity
id: CurtainsPink
parent: BaseCurtains
suffix: Fancy pink
components:
- type: Sprite
snapCardinals: true
sprite: Structures/Decoration/Curtains/pink.rsi
layers:
- state: closed
map: ["enum.DoorVisualLayers.Base"]
- type: Construction
graph: Curtains
node: CurtainsPink
- type: entity
id: CurtainsPinkOpen
parent: CurtainsPink
suffix: Open, Fancy pink
components:
- type: Door
state: Open
- type: Occluder
enabled: false
- type: Construction
graph: Curtains
node: CurtainsPinkOpen
- type: Physics
canCollide: false
- type: entity
id: CurtainsPurple
parent: BaseCurtains
suffix: Fancy purple
components:
- type: Sprite
snapCardinals: true
sprite: Structures/Decoration/Curtains/purple.rsi
layers:
- state: closed
map: ["enum.DoorVisualLayers.Base"]
- type: Construction
graph: Curtains
node: CurtainsPurple
- type: entity
id: CurtainsPurpleOpen
parent: CurtainsPurple
suffix: Open, Fancy purple
components:
- type: Door
state: Open
- type: Occluder
enabled: false
- type: Construction
graph: Curtains
node: CurtainsPurpleOpen
- type: Physics
canCollide: false
- type: entity
id: CurtainsRed
parent: BaseCurtains
suffix: Fancy red
components:
- type: Sprite
snapCardinals: true
sprite: Structures/Decoration/Curtains/red.rsi
layers:
- state: closed
map: ["enum.DoorVisualLayers.Base"]
- type: Construction
graph: Curtains
node: CurtainsRed
- type: entity
id: CurtainsRedOpen
parent: CurtainsRed
suffix: Open, Fancy red
components:
- type: Door
state: Open
- type: Occluder
enabled: false
- type: Construction
graph: Curtains
node: CurtainsRedOpen
- type: Physics
canCollide: false
- type: entity
id: CurtainsWhite
parent: BaseCurtains
suffix: Fancy white
components:
- type: Sprite
snapCardinals: true
sprite: Structures/Decoration/Curtains/white.rsi
layers:
- state: closed
map: ["enum.DoorVisualLayers.Base"]
- type: Construction
graph: Curtains
node: CurtainsWhite
- type: entity
id: CurtainsWhiteOpen
parent: CurtainsWhite
suffix: Open, Fancy white
components:
- type: Door
state: Open
- type: Occluder
enabled: false
- type: Construction
graph: Curtains
node: CurtainsWhiteOpen
- type: Physics
canCollide: false

View File

@@ -13,6 +13,97 @@
- material: Cloth
amount: 2
doAfter: 1
- to: CurtainsBlack
completed:
- !type:SnapToGrid { }
steps:
- tag: CarpetBlack
doAfter: 1
name: black carpet
icon:
sprite: Objects/Tiles/tile.rsi
state: carpet-black
- to: CurtainsBlue
completed:
- !type:SnapToGrid { }
steps:
- tag: CarpetBlue
doAfter: 1
name: blue carpet
icon:
sprite: Objects/Tiles/tile.rsi
state: carpet-blue
- to: CurtainsCyan
completed:
- !type:SnapToGrid { }
steps:
- tag: CarpetCyan
doAfter: 1
name: cyan carpet
icon:
sprite: Objects/Tiles/tile.rsi
state: carpet-cyan
- to: CurtainsGreen
completed:
- !type:SnapToGrid { }
steps:
- tag: CarpetGreen
doAfter: 1
name: green carpet
icon:
sprite: Objects/Tiles/tile.rsi
state: carpet-green
- to: CurtainsOrange
completed:
- !type:SnapToGrid { }
steps:
- tag: CarpetOrange
doAfter: 1
name: orange carpet
icon:
sprite: Objects/Tiles/tile.rsi
state: carpet-orange
- to: CurtainsPink
completed:
- !type:SnapToGrid { }
steps:
- tag: CarpetPink
doAfter: 1
name: pink carpet
icon:
sprite: Objects/Tiles/tile.rsi
state: carpet-pink
- to: CurtainsPurple
completed:
- !type:SnapToGrid { }
steps:
- tag: CarpetPurple
doAfter: 1
name: purple carpet
icon:
sprite: Objects/Tiles/tile.rsi
state: carpet-purple
- to: CurtainsRed
completed:
- !type:SnapToGrid { }
steps:
- tag: CarpetRed
doAfter: 1
name: red carpet
icon:
sprite: Objects/Tiles/tile.rsi
state: carpet-red
- to: CurtainsWhite
completed:
- !type:SnapToGrid { }
steps:
- tag: CarpetWhite
doAfter: 1
name: white carpet
icon:
sprite: Objects/Tiles/tile.rsi
state: carpet-white
- node: Curtains
entity: HospitalCurtains
edges:
@@ -35,3 +126,210 @@
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsBlack
entity: CurtainsBlack
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemBlack
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsBlackOpen
entity: CurtainsBlackOpen
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemBlack
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsBlue
entity: CurtainsBlue
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemBlue
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsBlueOpen
entity: CurtainsBlueOpen
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemBlue
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsCyan
entity: CurtainsCyan
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemCyan
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsCyanOpen
entity: CurtainsCyanOpen
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemCyan
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsGreen
entity: CurtainsGreen
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemGreen
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsGreenOpen
entity: CurtainsGreenOpen
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemGreen
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsOrange
entity: CurtainsOrange
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemOrange
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsOrangeOpen
entity: CurtainsOrangeOpen
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemOrange
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsPink
entity: CurtainsPink
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemPink
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsPinkOpen
entity: CurtainsPinkOpen
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemPink
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsPurple
entity: CurtainsPurple
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemPurple
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsPurpleOpen
entity: CurtainsPurpleOpen
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemPurple
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsRed
entity: CurtainsRed
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemRed
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsRedOpen
entity: CurtainsRedOpen
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemRed
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsWhite
entity: CurtainsWhite
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemWhite
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: CurtainsWhiteOpen
entity: CurtainsWhiteOpen
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemWhite
amount: 1
steps:
- tool: Cutting
doAfter: 1

View File

@@ -676,7 +676,160 @@
targetNode: Curtains
category: construction-category-furniture
icon:
sprite: Structures/Decoration/curtains.rsi
sprite: Structures/Decoration/Curtains/hospital.rsi
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
id: CurtainsBlack
name: black curtains
description: Hides what others shouldn't see.
graph: Curtains
startNode: start
targetNode: CurtainsBlack
category: construction-category-furniture
icon:
sprite: Structures/Decoration/Curtains/black.rsi
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
id: CurtainsBlue
name: blue curtains
description: Hides what others shouldn't see.
graph: Curtains
startNode: start
targetNode: CurtainsBlue
category: construction-category-furniture
icon:
sprite: Structures/Decoration/Curtains/blue.rsi
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
id: CurtainsCyan
name: cyan curtains
description: Hides what others shouldn't see.
graph: Curtains
startNode: start
targetNode: CurtainsCyan
category: construction-category-furniture
icon:
sprite: Structures/Decoration/Curtains/cyan.rsi
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
id: CurtainsGreen
name: green curtains
description: Hides what others shouldn't see.
graph: Curtains
startNode: start
targetNode: CurtainsGreen
category: construction-category-furniture
icon:
sprite: Structures/Decoration/Curtains/green.rsi
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
id: CurtainsOrange
name: orange curtains
description: Hides what others shouldn't see.
graph: Curtains
startNode: start
targetNode: CurtainsOrange
category: construction-category-furniture
icon:
sprite: Structures/Decoration/Curtains/orange.rsi
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
id: CurtainsPink
name: pink curtains
description: Hides what others shouldn't see.
graph: Curtains
startNode: start
targetNode: CurtainsPink
category: construction-category-furniture
icon:
sprite: Structures/Decoration/Curtains/pink.rsi
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
id: CurtainsPurple
name: purple curtains
description: Hides what others shouldn't see.
graph: Curtains
startNode: start
targetNode: CurtainsPurple
category: construction-category-furniture
icon:
sprite: Structures/Decoration/Curtains/purple.rsi
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
id: CurtainsRed
name: red curtains
description: Hides what others shouldn't see.
graph: Curtains
startNode: start
targetNode: CurtainsRed
category: construction-category-furniture
icon:
sprite: Structures/Decoration/Curtains/red.rsi
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
id: CurtainsWhite
name: white curtains
description: Hides what others shouldn't see.
graph: Curtains
startNode: start
targetNode: CurtainsWhite
category: construction-category-furniture
icon:
sprite: Structures/Decoration/Curtains/white.rsi
state: closed
objectType: Structure
placementMode: SnapgridCenter

Binary file not shown.

After

Width:  |  Height:  |  Size: 367 B

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/951c7976bf6cda431aed8a1b22a8624ff7dfd8e2",
"copyright": "Created by TheShuEd (github) for Space Station14",
"size": {
"x": 32,
"y": 32

Binary file not shown.

After

Width:  |  Height:  |  Size: 487 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 495 B

View File

@@ -0,0 +1,19 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by TheShuEd (github) for Space Station14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "open",
"directions": 1
},
{
"name": "closed",
"directions": 1
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 620 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 499 B

View File

@@ -0,0 +1,19 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by TheShuEd (github) for Space Station14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "open",
"directions": 1
},
{
"name": "closed",
"directions": 1
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 577 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 448 B

View File

@@ -0,0 +1,19 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by TheShuEd (github) for Space Station14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "open",
"directions": 1
},
{
"name": "closed",
"directions": 1
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 574 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 358 B

View File

@@ -0,0 +1,19 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by TheShuEd (github) for Space Station14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "open",
"directions": 1
},
{
"name": "closed",
"directions": 1
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 485 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 506 B

View File

@@ -0,0 +1,19 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by TheShuEd (github) for Space Station14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "open",
"directions": 1
},
{
"name": "closed",
"directions": 1
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 646 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 543 B

View File

@@ -0,0 +1,19 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by TheShuEd (github) for Space Station14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "open",
"directions": 1
},
{
"name": "closed",
"directions": 1
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 599 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 425 B

View File

@@ -0,0 +1,19 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by TheShuEd (github) for Space Station14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "open",
"directions": 1
},
{
"name": "closed",
"directions": 1
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 538 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 444 B

View File

@@ -0,0 +1,19 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by TheShuEd (github) for Space Station14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "open",
"directions": 1
},
{
"name": "closed",
"directions": 1
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 558 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 523 B

View File

@@ -0,0 +1,19 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by TheShuEd (github) for Space Station14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "open",
"directions": 1
},
{
"name": "closed",
"directions": 1
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 586 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 378 B