From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 26 Feb 2024 23:11:20 +0000 (+0300) Subject: Fancy table (#25562) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=84cbcb93cacf339510d9190ad18e377c892df3b3;p=space-station-14.git Fancy table (#25562) * blue * others * add white table * add crafting carpets * finish carpets * tags * crafting * pip * finish --- diff --git a/Resources/Prototypes/Entities/Objects/Misc/carpets.yml b/Resources/Prototypes/Entities/Objects/Misc/carpets.yml index b3d53f6e1d..ed4014f374 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/carpets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/carpets.yml @@ -1,8 +1,9 @@ # TODO once tiles can be smoothed and carpets ported over to that, add them to the FloorTile outputs - type: entity - name: red carpet + name: carpet parent: FloorTileItemBase id: FloorCarpetItemRed + suffix: Red components: - type: Sprite state: carpet-red @@ -13,11 +14,19 @@ - Plating - type: Stack stackType: FloorCarpetRed + - type: Tag + tags: + - CarpetRed + - type: SpawnAfterInteract #Nuke after convert to FloorTile + prototype: Carpet + doAfter: 0.5 + removeOnInteract: true - type: entity - name: black carpet + name: carpet parent: FloorTileItemBase id: FloorCarpetItemBlack + suffix: Black components: - type: Sprite state: carpet-black @@ -28,11 +37,19 @@ - Plating - type: Stack stackType: FloorCarpetBlack + - type: Tag + tags: + - CarpetBlack + - type: SpawnAfterInteract #Nuke after convert to FloorTile + prototype: CarpetBlack + doAfter: 0.5 + removeOnInteract: true - type: entity - name: blue carpet + name: carpet parent: FloorTileItemBase id: FloorCarpetItemBlue + suffix: Blue components: - type: Sprite state: carpet-blue @@ -43,11 +60,19 @@ - Plating - type: Stack stackType: FloorCarpetBlue + - type: Tag + tags: + - CarpetBlue + - type: SpawnAfterInteract #Nuke after convert to FloorTile + prototype: CarpetBlue + doAfter: 0.5 + removeOnInteract: true - type: entity - name: green carpet + name: carpet parent: FloorTileItemBase id: FloorCarpetItemGreen + suffix: Green components: - type: Sprite state: carpet-green @@ -58,11 +83,19 @@ - Plating - type: Stack stackType: FloorCarpetGreen + - type: Tag + tags: + - CarpetGreen + - type: SpawnAfterInteract #Nuke after convert to FloorTile + prototype: CarpetGreen + doAfter: 0.5 + removeOnInteract: true - type: entity - name: orange carpet + name: carpet parent: FloorTileItemBase id: FloorCarpetItemOrange + suffix: Orange components: - type: Sprite state: carpet-orange @@ -73,11 +106,19 @@ - Plating - type: Stack stackType: FloorCarpetOrange + - type: Tag + tags: + - CarpetOrange + - type: SpawnAfterInteract #Nuke after convert to FloorTile + prototype: CarpetOrange + doAfter: 0.5 + removeOnInteract: true - type: entity - name: sky blue carpet + name: carpet parent: FloorTileItemBase id: FloorCarpetItemSkyBlue + suffix: Sky Blue components: - type: Sprite state: carpet-skyblue @@ -88,11 +129,16 @@ - Plating - type: Stack stackType: FloorCarpetSkyBlue + - type: SpawnAfterInteract #Nuke after convert to FloorTile + prototype: CarpetSBlue + doAfter: 0.5 + removeOnInteract: true - type: entity - name: purple carpet + name: carpet parent: FloorTileItemBase id: FloorCarpetItemPurple + suffix: Purple components: - type: Sprite state: carpet-purple @@ -103,11 +149,19 @@ - Plating - type: Stack stackType: FloorCarpetPurple + - type: Tag + tags: + - CarpetPurple + - type: SpawnAfterInteract #Nuke after convert to FloorTile + prototype: CarpetPurple + doAfter: 0.5 + removeOnInteract: true - type: entity - name: pink carpet + name: carpet parent: FloorTileItemBase id: FloorCarpetItemPink + suffix: Pink components: - type: Sprite state: carpet-pink @@ -118,3 +172,56 @@ - Plating - type: Stack stackType: FloorCarpetPink + - type: Tag + tags: + - CarpetPink + - type: SpawnAfterInteract #Nuke after convert to FloorTile + prototype: CarpetPink + doAfter: 0.5 + removeOnInteract: true + +- type: entity + name: carpet + parent: FloorTileItemBase + id: FloorCarpetItemCyan + suffix: Cyan + components: + - type: Sprite + state: carpet-cyan + - type: Item + heldPrefix: carpet-cyan + - type: FloorTile + outputs: + - Plating + - type: Stack + stackType: FloorCarpetCyan + - type: Tag + tags: + - CarpetCyan + - type: SpawnAfterInteract #Nuke after convert to FloorTile + prototype: CarpetCyan + doAfter: 0.5 + removeOnInteract: true + +- type: entity + name: carpet + parent: FloorTileItemBase + id: FloorCarpetItemWhite + suffix: White + components: + - type: Sprite + state: carpet-white + - type: Item + heldPrefix: carpet-white + - type: FloorTile + outputs: + - Plating + - type: Stack + stackType: FloorCarpetWhite + - type: Tag + tags: + - CarpetWhite + - type: SpawnAfterInteract #Nuke after convert to FloorTile + prototype: CarpetWhite + doAfter: 0.5 + removeOnInteract: true diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml index 63d950969d..584c3b57b2 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml @@ -548,6 +548,162 @@ footstepSoundCollection: collection: FootstepCarpet +# Fancy tables + +- type: entity + id: TableFancyBase + abstract: true + parent: TableBase + name: fancy table + description: Expensive and rich. + components: + - type: Damageable + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 25 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank: + min: 1 + max: 1 + MaterialCloth1: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Tag + tags: + - Wooden + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepCarpet + +- type: entity + id: TableFancyBlue + parent: TableFancyBase + suffix: Blue + components: + - type: Sprite + sprite: Structures/Furniture/Tables/Fancy/blue.rsi + - type: Icon + sprite: Structures/Furniture/Tables/Fancy/blue.rsi + - type: Construction + graph: Table + node: TableFancyBlue + +- type: entity + id: TableFancyCyan + parent: TableFancyBase + suffix: Cyan + components: + - type: Sprite + sprite: Structures/Furniture/Tables/Fancy/cyan.rsi + - type: Icon + sprite: Structures/Furniture/Tables/Fancy/cyan.rsi + - type: Construction + graph: Table + node: TableFancyCyan + +- type: entity + id: TableFancyBlack + parent: TableFancyBase + suffix: Black + components: + - type: Sprite + sprite: Structures/Furniture/Tables/Fancy/black.rsi + - type: Icon + sprite: Structures/Furniture/Tables/Fancy/black.rsi + - type: Construction + graph: Table + node: TableFancyBlack + +- type: entity + id: TableFancyRed + parent: TableFancyBase + suffix: Red + components: + - type: Sprite + sprite: Structures/Furniture/Tables/Fancy/red.rsi + - type: Icon + sprite: Structures/Furniture/Tables/Fancy/red.rsi + - type: Construction + graph: Table + node: TableFancyRed + +- type: entity + id: TableFancyPurple + parent: TableFancyBase + suffix: Purple + components: + - type: Sprite + sprite: Structures/Furniture/Tables/Fancy/purple.rsi + - type: Icon + sprite: Structures/Furniture/Tables/Fancy/purple.rsi + - type: Construction + graph: Table + node: TableFancyPurple + +- type: entity + id: TableFancyPink + parent: TableFancyBase + suffix: Pink + components: + - type: Sprite + sprite: Structures/Furniture/Tables/Fancy/pink.rsi + - type: Icon + sprite: Structures/Furniture/Tables/Fancy/pink.rsi + - type: Construction + graph: Table + node: TableFancyPink + +- type: entity + id: TableFancyGreen + parent: TableFancyBase + suffix: Green + components: + - type: Sprite + sprite: Structures/Furniture/Tables/Fancy/green.rsi + - type: Icon + sprite: Structures/Furniture/Tables/Fancy/green.rsi + - type: Construction + graph: Table + node: TableFancyGreen + +- type: entity + id: TableFancyOrange + parent: TableFancyBase + suffix: Orange + components: + - type: Sprite + sprite: Structures/Furniture/Tables/Fancy/orange.rsi + - type: Icon + sprite: Structures/Furniture/Tables/Fancy/orange.rsi + - type: Construction + graph: Table + node: TableFancyOrange + +- type: entity + id: TableFancyWhite + parent: TableFancyBase + suffix: White + components: + - type: Sprite + sprite: Structures/Furniture/Tables/Fancy/white.rsi + - type: Icon + sprite: Structures/Furniture/Tables/Fancy/white.rsi + - type: Construction + graph: Table + node: TableFancyWhite + +#Debug + - type: entity id: TableDebug parent: TableBase diff --git a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml index fa6a00623b..e6b0476618 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml @@ -2,6 +2,7 @@ - type: entity id: CarpetBase parent: BaseStructure + name: carpet description: "Fancy walking surface." abstract: true components: @@ -27,93 +28,311 @@ behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] + - type: Butcherable + butcheringType: Knife + butcherDelay: 2 + spawned: + - id: MaterialCloth1 + amount: 1 - type: entity id: Carpet parent: CarpetBase - name: "red carpet" + suffix: Red components: - type: Sprite sprite: Structures/Furniture/Carpets/red_carpet.rsi - type: Icon sprite: Structures/Furniture/Carpets/red_carpet.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: + FloorCarpetItemRed: + min: 1 + max: 1 - type: entity id: CarpetBlack parent: CarpetBase - name: "black carpet" + suffix: Black components: - type: Clickable - type: Sprite sprite: Structures/Furniture/Carpets/black_carpet.rsi - type: Icon sprite: Structures/Furniture/Carpets/black_carpet.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: + FloorCarpetItemBlack: + min: 1 + max: 1 - type: entity id: CarpetPink parent: CarpetBase - name: "pink carpet" + suffix: Pink components: - type: Clickable - type: Sprite sprite: Structures/Furniture/Carpets/pink_carpet.rsi - type: Icon sprite: Structures/Furniture/Carpets/pink_carpet.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: + FloorCarpetItemPink: + min: 1 + max: 1 - type: entity id: CarpetBlue parent: CarpetBase - name: "blue carpet" + suffix: Blue components: - type: Clickable - type: Sprite sprite: Structures/Furniture/Carpets/blue_carpet.rsi - type: Icon sprite: Structures/Furniture/Carpets/blue_carpet.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: + FloorCarpetItemBlue: + min: 1 + max: 1 - type: entity id: CarpetGreen parent: CarpetBase - name: "green carpet" + suffix: Green components: - type: Clickable - type: Sprite sprite: Structures/Furniture/Carpets/green_carpet.rsi - type: Icon sprite: Structures/Furniture/Carpets/green_carpet.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: + FloorCarpetItemGreen: + min: 1 + max: 1 - type: entity id: CarpetOrange parent: CarpetBase - name: "orange carpet" + suffix: Orange components: - type: Clickable - type: Sprite sprite: Structures/Furniture/Carpets/orange_carpet.rsi - type: Icon sprite: Structures/Furniture/Carpets/orange_carpet.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: + FloorCarpetItemOrange: + min: 1 + max: 1 - type: entity id: CarpetSBlue parent: CarpetBase - name: "skyblue carpet" + suffix: Sky Blue components: - type: Clickable - type: Sprite sprite: Structures/Furniture/Carpets/skyblue_carpet.rsi - type: Icon sprite: Structures/Furniture/Carpets/skyblue_carpet.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: + FloorCarpetItemSkyBlue: + min: 1 + max: 1 - type: entity id: CarpetPurple parent: CarpetBase - name: "purple carpet" + suffix: Purple components: - type: Clickable - type: Sprite sprite: Structures/Furniture/Carpets/purple_carpet.rsi - type: Icon sprite: Structures/Furniture/Carpets/purple_carpet.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: + FloorCarpetItemPurple: + min: 1 + max: 1 + +- type: entity + id: CarpetCyan + parent: CarpetBase + suffix: Cyan + components: + - type: Clickable + - type: Sprite + sprite: Structures/Furniture/Carpets/cyan_carpet.rsi + - type: Icon + sprite: Structures/Furniture/Carpets/cyan_carpet.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: + FloorCarpetItemCyan: + min: 1 + max: 1 + +- type: entity + id: CarpetWhite + parent: CarpetBase + suffix: White + components: + - type: Clickable + - type: Sprite + sprite: Structures/Furniture/Carpets/white_carpet.rsi + - type: Icon + sprite: Structures/Furniture/Carpets/white_carpet.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: + FloorCarpetItemWhite: + min: 1 + max: 1 # TODO nuke this once tiles support rotating sprites - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 260ae5153b..72c5720013 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1003,6 +1003,16 @@ - ClothingNeckScarfStripedOrange - ClothingNeckScarfStripedBlack - ClothingNeckScarfStripedPurple + # Carpets + - Carpet + - CarpetBlack + - CarpetPink + - CarpetBlue + - CarpetGreen + - CarpetOrange + - CarpetPurple + - CarpetCyan + - CarpetWhite - type: EmagLatheRecipes emagStaticRecipes: - ClothingHeadHatCentcomcap diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml index dc2a253ec2..87384e8168 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml @@ -193,6 +193,78 @@ - material: Cloth amount: 1 doAfter: 1 + + - to: TableFancyBlack + steps: + - tag: CarpetBlack + name: black carpet + icon: + sprite: Objects/Tiles/tile.rsi + state: carpet-black + + - to: TableFancyBlue + steps: + - tag: CarpetBlue + name: blue carpet + icon: + sprite: Objects/Tiles/tile.rsi + state: carpet-blue + + - to: TableFancyCyan + steps: + - tag: CarpetCyan + name: cyan carpet + icon: + sprite: Objects/Tiles/tile.rsi + state: carpet-cyan + + - to: TableFancyGreen + steps: + - tag: CarpetGreen + name: green carpet + icon: + sprite: Objects/Tiles/tile.rsi + state: carpet-green + + - to: TableFancyOrange + steps: + - tag: CarpetOrange + name: orange carpet + icon: + sprite: Objects/Tiles/tile.rsi + state: carpet-orange + + - to: TableFancyPurple + steps: + - tag: CarpetPurple + name: purple carpet + icon: + sprite: Objects/Tiles/tile.rsi + state: carpet-purple + + - to: TableFancyPink + steps: + - tag: CarpetPink + name: pink carpet + icon: + sprite: Objects/Tiles/tile.rsi + state: carpet-pink + + - to: TableFancyRed + steps: + - tag: CarpetRed + name: red carpet + icon: + sprite: Objects/Tiles/tile.rsi + state: carpet-red + + - to: TableFancyWhite + steps: + - tag: CarpetWhite + name: white carpet + icon: + sprite: Objects/Tiles/tile.rsi + state: carpet-white - node: TableCarpet entity: TableCarpet @@ -205,6 +277,114 @@ steps: - tool: Prying doAfter: 1 + + - node: TableFancyBlack + entity: TableFancyBlack + edges: + - to: TableWood + completed: + - !type:SpawnPrototype + prototype: FloorCarpetItemBlack + amount: 1 + steps: + - tool: Prying + doAfter: 1 + + - node: TableFancyBlue + entity: TableFancyBlue + edges: + - to: TableWood + completed: + - !type:SpawnPrototype + prototype: FloorCarpetItemBlue + amount: 1 + steps: + - tool: Prying + doAfter: 1 + + - node: TableFancyCyan + entity: TableFancyCyan + edges: + - to: TableWood + completed: + - !type:SpawnPrototype + prototype: FloorCarpetItemCyan + amount: 1 + steps: + - tool: Prying + doAfter: 1 + + - node: TableFancyGreen + entity: TableFancyGreen + edges: + - to: TableWood + completed: + - !type:SpawnPrototype + prototype: FloorCarpetItemGreen + amount: 1 + steps: + - tool: Prying + doAfter: 1 + + - node: TableFancyOrange + entity: TableFancyOrange + edges: + - to: TableWood + completed: + - !type:SpawnPrototype + prototype: FloorCarpetItemOrange + amount: 1 + steps: + - tool: Prying + doAfter: 1 + + - node: TableFancyPurple + entity: TableFancyPurple + edges: + - to: TableWood + completed: + - !type:SpawnPrototype + prototype: FloorCarpetItemPurple + amount: 1 + steps: + - tool: Prying + doAfter: 1 + + - node: TableFancyPink + entity: TableFancyPink + edges: + - to: TableWood + completed: + - !type:SpawnPrototype + prototype: FloorCarpetItemPink + amount: 1 + steps: + - tool: Prying + doAfter: 1 + + - node: TableFancyRed + entity: TableFancyRed + edges: + - to: TableWood + completed: + - !type:SpawnPrototype + prototype: FloorCarpetItemRed + amount: 1 + steps: + - tool: Prying + doAfter: 1 + + - node: TableFancyWhite + entity: TableFancyWhite + edges: + - to: TableWood + completed: + - !type:SpawnPrototype + prototype: FloorCarpetItemWhite + amount: 1 + steps: + - tool: Prying + doAfter: 1 - node: CounterMetal entity: TableCounterMetal diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml index 19558c461b..a08b3cc24d 100644 --- a/Resources/Prototypes/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/Recipes/Construction/furniture.yml @@ -357,6 +357,159 @@ conditions: - !type:TileNotBlocked +- type: construction + name: fancy black table + id: TableFancyBlack + graph: Table + startNode: start + targetNode: TableFancyBlack + category: construction-category-furniture + description: A table covered with a beautiful cloth. + icon: + sprite: Structures/Furniture/Tables/Fancy/black.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: fancy blue table + id: TableFancyBlue + graph: Table + startNode: start + targetNode: TableFancyBlue + category: construction-category-furniture + description: A table covered with a beautiful cloth. + icon: + sprite: Structures/Furniture/Tables/Fancy/blue.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: fancy cyan table + id: TableFancyCyan + graph: Table + startNode: start + targetNode: TableFancyCyan + category: construction-category-furniture + description: A table covered with a beautiful cloth. + icon: + sprite: Structures/Furniture/Tables/Fancy/cyan.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: fancy green table + id: TableFancyGreen + graph: Table + startNode: start + targetNode: TableFancyGreen + category: construction-category-furniture + description: A table covered with a beautiful cloth. + icon: + sprite: Structures/Furniture/Tables/Fancy/green.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: fancy orange table + id: TableFancyOrange + graph: Table + startNode: start + targetNode: TableFancyOrange + category: construction-category-furniture + description: A table covered with a beautiful cloth. + icon: + sprite: Structures/Furniture/Tables/Fancy/orange.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: fancy purple table + id: TableFancyPurple + graph: Table + startNode: start + targetNode: TableFancyPurple + category: construction-category-furniture + description: A table covered with a beautiful cloth. + icon: + sprite: Structures/Furniture/Tables/Fancy/purple.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: fancy pink table + id: TableFancyPink + graph: Table + startNode: start + targetNode: TableFancyPink + category: construction-category-furniture + description: A table covered with a beautiful cloth. + icon: + sprite: Structures/Furniture/Tables/Fancy/pink.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: fancy red table + id: TableFancyRed + graph: Table + startNode: start + targetNode: TableFancyRed + category: construction-category-furniture + description: A table covered with a beautiful cloth. + icon: + sprite: Structures/Furniture/Tables/Fancy/red.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: fancy white table + id: TableFancyWhite + graph: Table + startNode: start + targetNode: TableFancyWhite + category: construction-category-furniture + description: A table covered with a beautiful cloth. + icon: + sprite: Structures/Furniture/Tables/Fancy/white.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + - type: construction name: metal counter id: TableCounterMetal diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 69f5226fc2..6517cfd5a6 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -1157,3 +1157,66 @@ completetime: 2 materials: Cloth: 200 + +- type: latheRecipe + id: Carpet + result: FloorCarpetItemRed + completetime: 1 + materials: + Cloth: 100 + +- type: latheRecipe + id: CarpetBlack + result: FloorCarpetItemBlack + completetime: 1 + materials: + Cloth: 100 + +- type: latheRecipe + id: CarpetPink + result: FloorCarpetItemPink + completetime: 1 + materials: + Cloth: 100 + +- type: latheRecipe + id: CarpetBlue + result: FloorCarpetItemBlue + completetime: 1 + materials: + Cloth: 100 + +- type: latheRecipe + id: CarpetGreen + result: FloorCarpetItemGreen + completetime: 1 + materials: + Cloth: 100 + +- type: latheRecipe + id: CarpetOrange + result: FloorCarpetItemOrange + completetime: 1 + materials: + Cloth: 100 + +- type: latheRecipe + id: CarpetPurple + result: FloorCarpetItemPurple + completetime: 1 + materials: + Cloth: 100 + +- type: latheRecipe + id: CarpetCyan + result: FloorCarpetItemCyan + completetime: 1 + materials: + Cloth: 100 + +- type: latheRecipe + id: CarpetWhite + result: FloorCarpetItemWhite + completetime: 1 + materials: + Cloth: 100 diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index 3b4efaff11..975447a138 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -243,6 +243,20 @@ maxCount: 30 itemSize: 5 +- type: stack + id: FloorCarpetCyan + name: cyan carpet tile + spawn: FloorCarpetItemCyan + maxCount: 30 + itemSize: 5 + +- type: stack + id: FloorCarpetWhite + name: white carpet tile + spawn: FloorCarpetItemWhite + maxCount: 30 + itemSize: 5 + - type: stack id: FloorTileStackCarpetClown name: clown carpet tile diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 6bcff07f4a..6e13da6a9a 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -247,6 +247,33 @@ - type: Tag id: Carpet +- type: Tag + id: CarpetBlack + +- type: Tag + id: CarpetBlue + +- type: Tag + id: CarpetCyan + +- type: Tag + id: CarpetGreen + +- type: Tag + id: CarpetOrange + +- type: Tag + id: CarpetPurple + +- type: Tag + id: CarpetPink + +- type: Tag + id: CarpetRed + +- type: Tag + id: CarpetWhite + - type: Tag id: CanPilot diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan-inhand-left.png new file mode 100644 index 0000000000..c4a019ba69 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan-inhand-right.png new file mode 100644 index 0000000000..c35dfc4ac8 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan.png b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan.png new file mode 100644 index 0000000000..45fab28992 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white-inhand-left.png new file mode 100644 index 0000000000..c570665904 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white-inhand-right.png new file mode 100644 index 0000000000..46924dc2ae Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white.png b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white.png new file mode 100644 index 0000000000..fd28316d97 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index 99b32632f1..6f4d5e8efc 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -132,6 +132,12 @@ { "name": "carpet-pink" }, + { + "name": "carpet-cyan" + }, + { + "name": "carpet-white" + }, { "name": "hydro" }, @@ -303,6 +309,22 @@ "name": "carpet-pink-inhand-right", "directions": 4 }, + { + "name": "carpet-cyan-inhand-left", + "directions": 4 + }, + { + "name": "carpet-cyan-inhand-right", + "directions": 4 + }, + { + "name": "carpet-white-inhand-left", + "directions": 4 + }, + { + "name": "carpet-white-inhand-right", + "directions": 4 + }, { "name": "grass-inhand-left", "directions": 4 diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_0.png new file mode 100644 index 0000000000..055adff7d2 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_1.png new file mode 100644 index 0000000000..355184817c Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_2.png new file mode 100644 index 0000000000..055adff7d2 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_3.png new file mode 100644 index 0000000000..355184817c Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_4.png new file mode 100644 index 0000000000..5e57970de6 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_5.png new file mode 100644 index 0000000000..645fc314eb Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_6.png new file mode 100644 index 0000000000..5e57970de6 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_7.png new file mode 100644 index 0000000000..120333ea99 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/full.png new file mode 100644 index 0000000000..a6d99c732c Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/meta.json new file mode 100644 index 0000000000..bc5c77c790 --- /dev/null +++ b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Hqlle (github)", + "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 + } + ] +} diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_0.png new file mode 100644 index 0000000000..a7f317edb2 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_1.png new file mode 100644 index 0000000000..9c98702c8c Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_2.png new file mode 100644 index 0000000000..a7f317edb2 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_3.png new file mode 100644 index 0000000000..9c98702c8c Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_4.png new file mode 100644 index 0000000000..263d1cdb3e Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_5.png new file mode 100644 index 0000000000..bb0a72771d Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_6.png new file mode 100644 index 0000000000..9103ea823b Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_7.png new file mode 100644 index 0000000000..c8ef41627a Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/full.png new file mode 100644 index 0000000000..48a8295336 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/meta.json new file mode 100644 index 0000000000..6d8edffd9f --- /dev/null +++ b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Hqlle (github)", + "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 + } + ] +} diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/full.png new file mode 100644 index 0000000000..962f141fd8 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/meta.json new file mode 100644 index 0000000000..b566b964ad --- /dev/null +++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/meta.json @@ -0,0 +1,163 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi", + "states": [ + { + "name": "full", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "state_0", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_1", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_2", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_3", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_4", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_5", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_6", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_7", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_0.png new file mode 100644 index 0000000000..56abee0f9f Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_1.png new file mode 100644 index 0000000000..3b62e9fa90 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_2.png new file mode 100644 index 0000000000..56abee0f9f Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_3.png new file mode 100644 index 0000000000..1ebdf5187a Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_4.png new file mode 100644 index 0000000000..71d706c349 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_5.png new file mode 100644 index 0000000000..6fe4d19d37 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_6.png new file mode 100644 index 0000000000..61dd2f2107 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_7.png new file mode 100644 index 0000000000..c840c44487 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/full.png new file mode 100644 index 0000000000..74e4724849 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/meta.json new file mode 100644 index 0000000000..b566b964ad --- /dev/null +++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/meta.json @@ -0,0 +1,163 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi", + "states": [ + { + "name": "full", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "state_0", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_1", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_2", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_3", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_4", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_5", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_6", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_7", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_0.png new file mode 100644 index 0000000000..2463ead2ca Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_1.png new file mode 100644 index 0000000000..cfa3aad6ea Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_2.png new file mode 100644 index 0000000000..2463ead2ca Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_3.png new file mode 100644 index 0000000000..1a56027c99 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_4.png new file mode 100644 index 0000000000..63d5b3171a Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_5.png new file mode 100644 index 0000000000..6d400f6c7a Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_6.png new file mode 100644 index 0000000000..296dbf968c Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_7.png new file mode 100644 index 0000000000..c11131fcf9 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/full.png new file mode 100644 index 0000000000..683eed7e83 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/meta.json new file mode 100644 index 0000000000..b566b964ad --- /dev/null +++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/meta.json @@ -0,0 +1,163 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi", + "states": [ + { + "name": "full", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "state_0", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_1", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_2", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_3", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_4", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_5", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_6", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_7", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_0.png new file mode 100644 index 0000000000..14e394d6b8 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_1.png new file mode 100644 index 0000000000..19f7d7fdf9 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_2.png new file mode 100644 index 0000000000..14e394d6b8 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_3.png new file mode 100644 index 0000000000..72d52ee1b1 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_4.png new file mode 100644 index 0000000000..71f265825b Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_5.png new file mode 100644 index 0000000000..d62bff28a0 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_6.png new file mode 100644 index 0000000000..6bbe874988 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_7.png new file mode 100644 index 0000000000..ae7c86d08c Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/full.png new file mode 100644 index 0000000000..633afcee44 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/meta.json new file mode 100644 index 0000000000..b566b964ad --- /dev/null +++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/meta.json @@ -0,0 +1,163 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi", + "states": [ + { + "name": "full", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "state_0", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_1", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_2", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_3", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_4", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_5", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_6", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_7", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_0.png new file mode 100644 index 0000000000..cd1118ddee Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_1.png new file mode 100644 index 0000000000..959a89d656 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_2.png new file mode 100644 index 0000000000..cd1118ddee Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_3.png new file mode 100644 index 0000000000..d855fc21a0 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_4.png new file mode 100644 index 0000000000..d76f5575e2 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_5.png new file mode 100644 index 0000000000..aba7677a49 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_6.png new file mode 100644 index 0000000000..c048e1f09c Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_7.png new file mode 100644 index 0000000000..798a0f6f90 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/full.png new file mode 100644 index 0000000000..90fd5808ff Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/meta.json new file mode 100644 index 0000000000..b566b964ad --- /dev/null +++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/meta.json @@ -0,0 +1,163 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi", + "states": [ + { + "name": "full", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "state_0", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_1", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_2", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_3", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_4", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_5", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_6", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_7", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_0.png new file mode 100644 index 0000000000..791333eb11 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_1.png new file mode 100644 index 0000000000..c3e3e310ba Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_2.png new file mode 100644 index 0000000000..791333eb11 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_3.png new file mode 100644 index 0000000000..4dac655de7 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_4.png new file mode 100644 index 0000000000..69557ca373 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_5.png new file mode 100644 index 0000000000..acb0253887 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_6.png new file mode 100644 index 0000000000..94861fc166 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_7.png new file mode 100644 index 0000000000..1ee2ee1e83 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/full.png new file mode 100644 index 0000000000..447f822acd Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/meta.json new file mode 100644 index 0000000000..b566b964ad --- /dev/null +++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/meta.json @@ -0,0 +1,163 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi", + "states": [ + { + "name": "full", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "state_0", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_1", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_2", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_3", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_4", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_5", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_6", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_7", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_0.png new file mode 100644 index 0000000000..25c3d57d13 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_1.png new file mode 100644 index 0000000000..f9e61669a2 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_2.png new file mode 100644 index 0000000000..25c3d57d13 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_3.png new file mode 100644 index 0000000000..64ac2ce45b Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_4.png new file mode 100644 index 0000000000..03f5b75aed Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_5.png new file mode 100644 index 0000000000..0d23fbccbf Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_6.png new file mode 100644 index 0000000000..14c3119ce5 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_7.png new file mode 100644 index 0000000000..5f0d70d52c Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/full.png new file mode 100644 index 0000000000..c79264a951 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/meta.json new file mode 100644 index 0000000000..b566b964ad --- /dev/null +++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/meta.json @@ -0,0 +1,163 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi", + "states": [ + { + "name": "full", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "state_0", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_1", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_2", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_3", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_4", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_5", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_6", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_7", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_0.png new file mode 100644 index 0000000000..dbeb971574 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_1.png new file mode 100644 index 0000000000..dcc0a20590 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_2.png new file mode 100644 index 0000000000..dbeb971574 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_3.png new file mode 100644 index 0000000000..3949a234f5 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_4.png new file mode 100644 index 0000000000..644a3b2960 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_5.png new file mode 100644 index 0000000000..2a7770a80c Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_6.png new file mode 100644 index 0000000000..df9e48cb18 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_7.png new file mode 100644 index 0000000000..16a52aabba Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/full.png new file mode 100644 index 0000000000..73c4166f58 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/meta.json new file mode 100644 index 0000000000..b566b964ad --- /dev/null +++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/meta.json @@ -0,0 +1,163 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi", + "states": [ + { + "name": "full", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "state_0", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_1", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_2", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_3", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_4", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_5", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_6", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_7", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_0.png new file mode 100644 index 0000000000..1e5c9cfb04 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_1.png new file mode 100644 index 0000000000..3c2c1a1efb Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_2.png new file mode 100644 index 0000000000..1e5c9cfb04 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_3.png new file mode 100644 index 0000000000..16fe922635 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_4.png new file mode 100644 index 0000000000..0773e28e93 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_5.png new file mode 100644 index 0000000000..d346ccfa74 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_6.png new file mode 100644 index 0000000000..8ef92fce00 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_7.png new file mode 100644 index 0000000000..7e414b9387 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/full.png new file mode 100644 index 0000000000..98af1c85e8 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/meta.json new file mode 100644 index 0000000000..b566b964ad --- /dev/null +++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/meta.json @@ -0,0 +1,163 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi", + "states": [ + { + "name": "full", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "state_0", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_1", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_2", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_3", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_4", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_5", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_6", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_7", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_0.png new file mode 100644 index 0000000000..0b5db352b3 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_1.png new file mode 100644 index 0000000000..087458ce7e Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_2.png new file mode 100644 index 0000000000..0b5db352b3 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_3.png new file mode 100644 index 0000000000..2e7fe74a93 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_4.png new file mode 100644 index 0000000000..3cf33262b7 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_5.png new file mode 100644 index 0000000000..44b68a3192 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_6.png new file mode 100644 index 0000000000..07a53a5615 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_7.png new file mode 100644 index 0000000000..b0dd66491b Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_7.png differ