Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Locale/en-US/recipes/tags.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ construction-graph-tag-green-carpet = green carpet
construction-graph-tag-orange-carpet = orange carpet
construction-graph-tag-pink-carpet = pink carpet
construction-graph-tag-purple-carpet = purple carpet
construction-graph-tag-purple-carpet-simple = purple carpet simple
construction-graph-tag-red-carpet = red carpet
construction-graph-tag-white-carpet = white carpet

Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/en-US/stack/stacks.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ stack-green-carpet-tile = green carpet tile
stack-orange-carpet-tile = orange carpet tile
stack-skyblue-carpet-tile = skyblue carpet tile
stack-purple-carpet-tile = purple carpet tile
stack-purple-carpet-simple-tile = purple carpet simple tile
stack-pink-carpet-tile = pink carpet tile
stack-cyan-carpet-tile = cyan carpet tile
stack-white-carpet-tile = white carpet tile
Expand Down
16 changes: 16 additions & 0 deletions Resources/Prototypes/Entities/Objects/Misc/carpets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,22 @@
doAfter: 0.5
removeOnInteract: true

- type: entity
parent: FloorCarpetItemRed
id: FloorCarpetSimpleItemPurple
suffix: Purple Simple
components:
- type: Sprite
state: carpet-simple-purple
- type: Item
heldPrefix: carpet-simple-purple
- type: Stack
stackType: FloorCarpetSimplePurple
- type: SpawnAfterInteract #Nuke after convert to FloorTile
prototype: CarpetSimplePurple
doAfter: 0.5
removeOnInteract: true

- type: entity
parent: FloorCarpetItemRed
id: FloorCarpetItemPink
Expand Down
30 changes: 30 additions & 0 deletions Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,36 @@
min: 1
max: 1

- type: entity
id: CarpetSimplePurple
parent: CarpetBase
suffix: Purple Simple
components:
- type: Clickable
- type: Sprite
sprite: Structures/Furniture/Carpets/purple_carpet_simple.rsi
- type: Icon
sprite: Structures/Furniture/Carpets/purple_carpet_simple.rsi
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 100
behaviors: #excess damage (nuke?). avoid computational cost of spawning entities.
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 10
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:SpawnEntitiesBehavior
spawn:
FloorCarpetSimpleItemPurple:
min: 1
max: 1

- type: entity
id: CarpetCyan
parent: CarpetBase
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@
- CarpetGreen
- CarpetOrange
- CarpetPurple
- CarpetSimplePurple
- CarpetCyan
- CarpetWhite
- CarpetSkyBlue
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/carpets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@
id: CarpetPurple
result: FloorCarpetItemPurple

- type: latheRecipe
parent: BaseCarpetRecipe
id: CarpetSimplePurple
result: FloorCarpetSimpleItemPurple

- type: latheRecipe
parent: BaseCarpetRecipe
id: CarpetCyan
Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/Stacks/Tiles/carpet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@
name: stack-purple-carpet-tile
icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-purple }
spawn: FloorCarpetItemPurple

- type: stack
parent: BaseTileStack
id: FloorCarpetSimplePurple
name: stack-purple-carpet-simple-tile
icon: { sprite: /Textures/Objects/Tiles/tile.rsi, state: carpet-simple-purple }
spawn: FloorCarpetSimpleItemPurple

- type: stack
parent: BaseTileStack
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Resources/Textures/Objects/Tiles/tile.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@
{
"name": "carpet-purple"
},
{
"name": "carpet-simple-purple"
},
{
"name": "carpet-red"
},
Expand Down
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.
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.
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,46 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "ryunexo, DiscordID: 295288397742997504",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full"
},
{
"name": "carpet_0",
"directions": 4
},
{
"name": "carpet_1",
"directions": 4
},
{
"name": "carpet_2",
"directions": 4
},
{
"name": "carpet_3",
"directions": 4
},
{
"name": "carpet_4",
"directions": 4
},
{
"name": "carpet_5",
"directions": 4
},
{
"name": "carpet_6",
"directions": 4
},
{
"name": "carpet_7",
"directions": 4
}
]
}
Loading