diff --git a/Resources/Audio/Effects/picaxe2.ogg b/Resources/Audio/Effects/picaxe2.ogg new file mode 100644 index 0000000000..e280748337 Binary files /dev/null and b/Resources/Audio/Effects/picaxe2.ogg differ diff --git a/Resources/Audio/Effects/woodhit.ogg b/Resources/Audio/Effects/woodhit.ogg new file mode 100644 index 0000000000..04ff37f3c7 Binary files /dev/null and b/Resources/Audio/Effects/woodhit.ogg differ diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml b/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml new file mode 100644 index 0000000000..9a21751026 --- /dev/null +++ b/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml @@ -0,0 +1,19 @@ +- type: entity + name: bed + id: Bed + description: This is used to lie in, sleep in or strap on. + components: + - type: Clickable + - type: InteractionOutline + - type: Collidable + - type: Sprite + sprite: Constructible/Misc/furniture.rsi + state: bed + - type: Strap + position: Down + rotation: -90 + - type: Destructible + deadThreshold: 75 + resistances: metallicResistances + placement: + mode: SnapgridCenter \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml b/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml new file mode 100644 index 0000000000..e4d81e0cef --- /dev/null +++ b/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml @@ -0,0 +1,71 @@ +- type: entity + id: BookshelfBase + name: "bookshelf" + description: Mostly filled with erotica. + abstract: true + placement: + mode: SnapgridCenter + components: + - type: Clickable + - type: InteractionOutline + - type: Sprite + sprite: Constructible/Misc/bookshelf.rsi + - type: Collidable + shapes: + - !type:PhysShapeAabb + layer: + - Opaque + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable + - type: Destructible + deadThreshold: 30 + destroySound: /Audio/Effects/woodhit.ogg + spawnOnDestroy: WoodPlank + resistances: metallicResistances + - type: Occluder + sizeX: 32 + sizeY: 32 + +- type: entity + id: Bookshelf0 + parent: BookshelfBase + components: + - type: Sprite + state: book-0 + +- type: entity + id: Bookshelf1 + parent: BookshelfBase + components: + - type: Sprite + state: book-1 + +- type: entity + id: Bookshelf2 + parent: BookshelfBase + components: + - type: Sprite + state: book-2 + +- type: entity + id: Bookshelf3 + parent: BookshelfBase + components: + - type: Sprite + state: book-3 + +- type: entity + id: Bookshelf4 + parent: BookshelfBase + components: + - type: Sprite + state: book-4 + +- type: entity + id: Bookshelf5 + parent: BookshelfBase + components: + - type: Sprite + state: book-5 diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml b/Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml new file mode 100644 index 0000000000..25e937f9b0 --- /dev/null +++ b/Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml @@ -0,0 +1,112 @@ +- type: entity + id: CarpetBase + description: + abstract: true + placement: + mode: SnapgridCenter + components: + - type: Clickable + - type: Sprite + drawdepth: FloorTiles + - type: Icon + state: full + - type: SnapGrid + offset: Center + - type: IconSmooth + key: full + base: carpet_ + +- type: entity + id: Carpet + parent: CarpetBase + name: "carpet" + description: + components: + - type: Sprite + sprite: Constructible/Carpets/red_carpet.rsi + - type: Icon + sprite: Constructible/Carpets/red_carpet.rsi + +- type: entity + id: CarpetBlack + parent: CarpetBase + name: "black carpet" + description: + components: + - type: Clickable + - type: Sprite + sprite: Constructible/Carpets/black_carpet.rsi + - type: Icon + sprite: Constructible/Carpets/black_carpet.rsi + +- type: entity + id: CarpetGay + parent: CarpetBase + name: "pink carpet" + description: + components: + - type: Clickable + - type: Sprite + sprite: Constructible/Carpets/gay_carpet.rsi + - type: Icon + sprite: Constructible/Carpets/gay_carpet.rsi + +- type: entity + id: CarpetBlue + parent: CarpetBase + name: "blue carpet" + description: + components: + - type: Clickable + - type: Sprite + sprite: Constructible/Carpets/blue_carpet.rsi + - type: Icon + sprite: Constructible/Carpets/blue_carpet.rsi + +- type: entity + id: CarpetGreen + parent: CarpetBase + name: "green carpet" + description: + components: + - type: Clickable + - type: Sprite + sprite: Constructible/Carpets/green_carpet.rsi + - type: Icon + sprite: Constructible/Carpets/green_carpet.rsi + +- type: entity + id: CarpetOrange + parent: CarpetBase + name: "orange carpet" + description: + components: + - type: Clickable + - type: Sprite + sprite: Constructible/Carpets/orange_carpet.rsi + - type: Icon + sprite: Constructible/Carpets/orange_carpet.rsi + +- type: entity + id: CarpetSBlue + parent: CarpetBase + name: "skyblue carpet" + description: + components: + - type: Clickable + - type: Sprite + sprite: Constructible/Carpets/skyblue_carpet.rsi + - type: Icon + sprite: Constructible/Carpets/skyblue_carpet.rsi + +- type: entity + id: CarpetPurple + parent: CarpetBase + name: "purple carpet" + description: + components: + - type: Clickable + - type: Sprite + sprite: Constructible/Carpets/purple_carpet.rsi + - type: Icon + sprite: Constructible/Carpets/purple_carpet.rsi diff --git a/Resources/Prototypes/Entities/Constructible/Ground/instruments.yml b/Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml similarity index 99% rename from Resources/Prototypes/Entities/Constructible/Ground/instruments.yml rename to Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml index 0692442c73..976805538a 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/instruments.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml @@ -37,7 +37,6 @@ sprite: Objects/Fun/Instruments/otherinstruments.rsi state: piano - - type: entity name: minimoog parent: BasePlaceableInstrument @@ -50,7 +49,6 @@ sprite: Objects/Fun/Instruments/otherinstruments.rsi state: minimoog - - type: entity name: church organ parent: BasePlaceableInstrument @@ -63,7 +61,6 @@ sprite: Objects/Fun/Instruments/otherinstruments.rsi state: church_organ - - type: entity name: xylophone parent: BasePlaceableInstrument @@ -76,4 +73,3 @@ - type: Sprite sprite: Objects/Fun/Instruments/otherinstruments.rsi state: xylophone - diff --git a/Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml b/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml similarity index 91% rename from Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml rename to Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml index c13cd44019..9ab11d0402 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml @@ -5,9 +5,7 @@ components: - type: Sprite sprite: Constructible/Misc/furniture.rsi - state: chair - color: "#8e9799" - + state: shuttle_chair - type: Collidable - type: Clickable - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Constructible/Ground/potted_plants.yml b/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml similarity index 98% rename from Resources/Prototypes/Entities/Constructible/Ground/potted_plants.yml rename to Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml index e771768013..198ef21fed 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/potted_plants.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml @@ -7,7 +7,6 @@ - type: Collidable - type: Sprite sprite: Constructible/Misc/potted_plants.rsi - - type: PottedPlantHide - type: Pullable @@ -19,12 +18,8 @@ components: - type: Sprite state: random - - - - type: RandomPottedPlant - - type: entity id: PottedPlantRandomPlastic parent: PottedPlantBase @@ -33,9 +28,6 @@ components: - type: Sprite state: plant-26 - - - - type: RandomPottedPlant plastic: true @@ -48,9 +40,6 @@ - type: Sprite state: plant-25 - - - - type: entity id: PottedPlantBioluminscent parent: PottedPlantBase @@ -59,9 +48,6 @@ components: - type: Sprite state: plant-09 - - - - type: PointLight radius: 2 color: "#2cb2e8" diff --git a/Resources/Prototypes/Entities/Constructible/Ground/furniture.yml b/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml similarity index 51% rename from Resources/Prototypes/Entities/Constructible/Ground/furniture.yml rename to Resources/Prototypes/Entities/Constructible/Furniture/seats.yml index 9a0afd88ec..cb05a02c43 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/furniture.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml @@ -1,16 +1,13 @@ -- type: entity - name: stool - id: Stool - description: Apply butt. +- type: entity + name: chair + id: SeatBase + description: You sit in this. Either by will or force. components: - type: Clickable - type: InteractionOutline - type: Collidable - type: Sprite sprite: Constructible/Misc/furniture.rsi - state: stool_base - color: "#8e9799" - - type: Strap position: Stand - type: Anchorable @@ -19,111 +16,67 @@ deadThreshold: 50 resistances: metallicResistances +- type: entity + name: chair + id: Chair + parent: SeatBase + description: Apply butt. + components: + - type: Rotatable + - type: Sprite + state: chair + color: "#8e9799" + +- type: entity + name: stool + id: Stool + parent: SeatBase + description: Apply butt. + components: + - type: Sprite + state: stool_base + color: "#8e9799" + - type: entity name: bar stool id: StoolBar - parent: Stool + parent: SeatBase components: - type: Sprite state: bar_stool color: "white" - - type: entity name: white office chair id: ChairOfficeLight - description: You sit in this. Either by will or force. + parent: SeatBase components: - type: Rotatable - - type: Clickable - - type: InteractionOutline - - type: Collidable - type: Sprite - sprite: Constructible/Misc/furniture.rsi state: officechair_white - - type: Strap - position: Stand - - type: Anchorable - - type: Pullable - - type: Destructible - deadThreshold: 50 - resistances: metallicResistances - - type: entity name: dark office chair id: ChairOfficeDark - parent: ChairOfficeLight + parent: SeatBase components: - type: Sprite - sprite: Constructible/Misc/furniture.rsi state: officechair_dark - - - type: entity - name: chair - id: Chair - description: You sit in this. Either by will or force. - components: - - type: Clickable - - type: InteractionOutline - - type: Collidable - - type: Sprite - sprite: Constructible/Misc/furniture.rsi - state: chair - color: "#8e9799" - - - type: Strap - position: Stand - - type: Anchorable - - type: Pullable - - type: Destructible - deadThreshold: 50 - resistances: metallicResistances - -- type: entity - parent: Chair name: comfy chair id: ComfyChair + parent: SeatBase description: It looks comfy. components: - type: Sprite - sprite: Constructible/Misc/furniture.rsi state: comfychair_preview - - - - type: entity name: wooden chair id: ChairWood - parent: Chair + parent: SeatBase components: - type: Sprite state: wooden_chair color: "white" - - - type: Anchorable - - type: Pullable - -- type: entity - name: bed - id: Bed - description: This is used to lie in, sleep in or strap on. - components: - - type: Clickable - - type: InteractionOutline - - type: Collidable - - type: Sprite - sprite: Constructible/Misc/furniture.rsi - state: bed - - - type: Strap - position: Down - rotation: -90 - - type: Destructible - deadThreshold: 75 - resistances: metallicResistances - placement: - mode: SnapgridCenter diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml b/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml new file mode 100644 index 0000000000..ab00940ea1 --- /dev/null +++ b/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml @@ -0,0 +1,49 @@ +- type: entity + id: Rack + name: "rack" + placement: + mode: SnapgridCenter + components: + - type: Clickable + - type: InteractionOutline + - type: Sprite + texture: Constructible/Misc/rack.png + - type: Collidable + shapes: + - !type:PhysShapeAabb + layer: + - Opaque + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable + - type: Destructible + deadThreshold: 30 + destroySound: /Audio/Effects/metalbreak.ogg + spawnOnDestroy: MetalSheet1 + resistances: metallicResistances + +- type: entity + id: Shelf + name: "shelf" + placement: + mode: SnapgridCenter + components: + - type: Clickable + - type: InteractionOutline + - type: Sprite + texture: Constructible/Misc/shelf.png + - type: Collidable + shapes: + - !type:PhysShapeAabb + layer: + - Opaque + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable + - type: Destructible + deadThreshold: 30 + destroySound: /Audio/Effects/metalbreak.ogg + spawnOnDestroy: MetalSheet1 + resistances: metallicResistances diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml b/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml new file mode 100644 index 0000000000..d569b81d0a --- /dev/null +++ b/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml @@ -0,0 +1,197 @@ +- type: entity + id: TableBase + name: "table" + description: A square piece of metal standing on four metal legs. + abstract: true + placement: + mode: SnapgridCenter + components: + - type: Clickable + - type: PlaceableSurface + - type: Sprite + netsync: false + drawdepth: FloorTiles + - type: Icon + state: full + - type: IconSmooth + key: state + base: state_ + - type: Collidable + shapes: + - !type:PhysShapeAabb + layer: + - VaultImpassable + - type: SnapGrid + offset: Center + - type: Climbable + +- type: entity + id: Table + parent: TableBase + name: "table" + description: A square piece of metal standing on four metal legs. + components: + - type: Sprite + sprite: Constructible/Structures/Tables/generic.rsi + - type: Icon + sprite: Constructible/Structures/Tables/generic.rsi + - type: Destructible + deadThreshold: 15 + destroySound: /Audio/Effects/metalbreak.ogg + resistances: metallicResistances + spawnOnDestroy: SteelSheet1 + +- type: entity + id: TableFrame + parent: TableBase + name: "table frame" + description: + components: + - type: Sprite + sprite: Constructible/Structures/Tables/frame.rsi + - type: Icon + sprite: Constructible/Structures/Tables/frame.rsi + - type: Destructible + deadThreshold: 1 + destroySound: /Audio/Effects/metalbreak.ogg + resistances: metallicResistances + spawnOnDestroy: SteelSheet1 + +- type: entity + id: TableBar + parent: TableBase + name: "bar table" + description: + components: + - type: Sprite + sprite: Constructible/Structures/Tables/bar.rsi + - type: Icon + sprite: Constructible/Structures/Tables/bar.rsi + - type: Destructible + deadThreshold: 1 + destroySound: /Audio/Effects/metalbreak.ogg + resistances: metallicResistances + spawnOnDestroy: SteelSheet1 + +- type: entity + id: TableMetal + parent: TableBase + name: "metal table" + description: + components: + - type: Sprite + sprite: Constructible/Structures/Tables/metal.rsi + - type: Icon + sprite: Constructible/Structures/Tables/metal.rsi + - type: Destructible + deadThreshold: 15 + destroySound: /Audio/Effects/metalbreak.ogg + resistances: metallicResistances + spawnOnDestroy: SteelSheet1 + +- type: entity + id: TableR + parent: TableBase + name: "reinforced table" + description: + components: + - type: Sprite + sprite: Constructible/Structures/Tables/reinforced.rsi + - type: Icon + sprite: Constructible/Structures/Tables/reinforced.rsi + - type: Destructible + deadThreshold: 1 + destroySound: /Audio/Effects/metalbreak.ogg + resistances: metallicResistances + spawnOnDestroy: SteelSheet1 + +- type: entity + id: TableGlass + parent: TableBase + name: "glass table" + description: + components: + - type: Sprite + sprite: Constructible/Structures/Tables/glass.rsi + - type: Icon + sprite: Constructible/Structures/Tables/glass.rsi + - type: Destructible + deadThreshold: 5 + destroySound: /Audio/Effects/glassbreak2.ogg + resistances: metallicResistances + +- type: entity + id: TableGlassR + parent: TableBase + name: "reinforced glass table" + description: + components: + - type: Sprite + sprite: Constructible/Structures/Tables/r_glass.rsi + - type: Icon + sprite: Constructible/Structures/Tables/r_glass.rsi + - type: Destructible + deadThreshold: 20 + destroySound: /Audio/Effects/glassbreak2.ogg + resistances: metallicResistances + +- type: entity + id: TableWood + parent: TableBase + name: "wood table" + description: Do not apply fire to this. Rumour says it burns easily. + components: + - type: Sprite + sprite: Constructible/Structures/Tables/wood.rsi + - type: Icon + sprite: Constructible/Structures/Tables/wood.rsi + - type: Destructible + deadThreshold: 15 + destroySound: /Audio/Effects/woodhit.ogg + resistances: metallicResistances + spawnOnDestroy: WoodPlank + +- type: entity + id: TableCarpet + parent: TableBase + name: "gambling table" + description: Play em' cowboy. + components: + - type: Sprite + sprite: Constructible/Structures/Tables/carpet.rsi + - type: Icon + sprite: Constructible/Structures/Tables/carpet.rsi + - type: Destructible + deadThreshold: 15 + destroySound: /Audio/Effects/woodhit.ogg + resistances: metallicResistances + spawnOnDestroy: WoodPlank + +- type: entity + id: TableStone + parent: TableBase + name: "stone table" + description: Literally the sturdiest thing you have ever seen. + components: + - type: Sprite + sprite: Constructible/Structures/Tables/stone.rsi + - type: Icon + sprite: Constructible/Structures/Tables/stone.rsi + - type: Destructible + deadThreshold: 50 + destroySound: /Audio/Effects/picaxe2.ogg + resistances: metallicResistances + +- type: entity + id: TableDebug + parent: TableBase + name: "debug table" + description: PUT ON THEM CODERSOCKS!! + components: + - type: Sprite + sprite: Constructible/Structures/Tables/debug.rsi + - type: Icon + sprite: Constructible/Structures/Tables/debug.rsi + - type: Destructible + deadThreshold: 1 + resistances: metallicResistances diff --git a/Resources/Prototypes/Entities/Constructible/Ground/table.yml b/Resources/Prototypes/Entities/Constructible/Ground/table.yml deleted file mode 100644 index 6933c0a044..0000000000 --- a/Resources/Prototypes/Entities/Constructible/Ground/table.yml +++ /dev/null @@ -1,60 +0,0 @@ -- type: entity - id: Table - name: "table" - description: A square piece of metal standing on four metal legs. - components: - - type: Clickable - - type: InteractionOutline - - type: PlaceableSurface - - type: Sprite - netsync: false - sprite: Constructible/Structures/Tables/generic.rsi - - type: Icon - sprite: Constructible/Structures/Tables/generic.rsi - state: plain_preview - - type: Collidable - shapes: - - !type:PhysShapeAabb - layer: - - VaultImpassable - - type: SnapGrid - offset: Center - - type: IconSmooth - key: generic - base: solid_ - - type: Climbable - - type: Destructible - deadThreshold: 50 - resistances: metallicResistances - spawnOnDestroy: SteelSheet1 - -- type: entity - id: TableWood - name: "wood table" - description: Do not apply fire to this. Rumour says it burns easily. - components: - - type: Clickable - - type: InteractionOutline - - type: PlaceableSurface - - type: Sprite - netsync: false - sprite: Constructible/Structures/Tables/wood.rsi - preview_state: icon - - type: Icon - sprite: Constructible/Structures/Tables/wood.rsi - state: icon - - type: Collidable - shapes: - - !type:PhysShapeAabb - layer: - - VaultImpassable - - type: SnapGrid - offset: Center - - type: IconSmooth - key: wood - base: wood_ - - type: Climbable - - type: Destructible - deadThreshold: 15 - resistances: metallicResistances - spawnOnDestroy: WoodPlank diff --git a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml index 6ae5007b1b..fe6d4a6e7e 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml @@ -15,7 +15,6 @@ netsync: false drawdepth: WallTops sprite: Constructible/Structures/Windows/window.rsi - - type: Collidable shapes: - !type:PhysShapeAabb @@ -26,7 +25,7 @@ - VaultImpassable - SmallImpassable - type: Destructible - deadThreshold: 100 + deadThreshold: 15 resistances: metallicResistances - type: SnapGrid offset: Center @@ -42,6 +41,22 @@ - type: Sprite drawdepth: WallTops sprite: Constructible/Structures/Windows/reinforced_window.rsi + - type: Destructible + deadThreshold: 75 + resistances: metallicResistances - type: Window base: rwindow +- type: entity + id: PhoronWindow + name: phoronwindow + parent: Window + components: + - type: Sprite + drawdepth: WallTops + sprite: Constructible/Structures/Windows/phoron_window.rsi + - type: Destructible + deadThreshold: 100 + resistances: metallicResistances + - type: Window + base: pwindow diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml new file mode 100644 index 0000000000..b680effe4d --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml @@ -0,0 +1,159 @@ +- type: entity + name: lantern + parent: BaseItem + id: BaseLamp + description: + abstract: true + components: + - type: HandheldLight + - type: Sprite + sprite: Objects/Misc/lights.rsi + - type: Item + sprite: Objects/Misc/lights.rsi + HeldPrefix: off + +- type: entity + name: lamp + id: Lamp + parent: BaseLamp + description: + components: + - type: Sprite + layers: + - state: lamp + - state: lamp_on + shader: unshaded + visible: false + - type: PointLight + enabled: false + radius: 3 + energy: 2 + - type: Appearance + visuals: + - type: FlashLightVisualizer + +- type: entity + name: banana lamp + id: LampBanana + parent: BaseLamp + description: + components: + - type: Sprite + layers: + - state: bananalamp + - state: bananalamp_on + shader: unshaded + visible: false + - type: PointLight + enabled: false + radius: 3 + energy: 2 + - type: Appearance + visuals: + - type: FlashLightVisualizer + +- type: entity + name: desk lamp + id: LampGold + parent: BaseLamp + description: + components: + - type: Sprite + layers: + - state: lampgreen + - state: lampgreen_on + shader: unshaded + visible: false + - type: PointLight + enabled: false + radius: 3 + energy: 2 + - type: Appearance + visuals: + - type: FlashLightVisualizer + +- type: entity + name: torch + id: Torch + parent: BaseLamp + description: + components: + - type: Sprite + sprite: Objects/Misc/torch.rsi + layers: + - state: torch + - state: torch_on + shader: unshaded + visible: false + - type: Item + sprite: Objects/Misc/torch.rsi + HeldPrefix: off + - type: PointLight + enabled: false + radius: 1 + energy: 4 + color: "#FFC458" + - type: LoopingSound + - type: Appearance + visuals: + - type: LanternVisualizer + +- type: entity + name: floodlight + id: Floodlight + parent: BaseLamp + description: + components: + - type: Sprite + layers: + - state: floodlight + - state: floodlight_on + shader: unshaded + visible: false + - type: Collidable + shapes: + - !type:PhysShapeAabb + layer: + - Opaque + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable + - type: PointLight + enabled: false + radius: 8 + energy: 5 + - type: Anchorable + - type: Destructible + deadThreshold: 10 + spawnOnDestroy: FloodlightBroken + destroySound: /Audio/Effects/glassbreak1.ogg + resistances: metallicResistances + - type: Appearance + visuals: + - type: FlashLightVisualizer + +- type: entity + name: broken floodlight + id: FloodlightBroken + parent: BaseItem + description: + components: + - type: Sprite + sprite: Objects/Misc/lights.rsi + state: floodlight_broken + - type: Anchorable + - type: Destructible + deadThreshold: 20 + spawnOnDestroy: SteelSheet1 + destroySound: /Audio/Effects/metalbreak.ogg + resistances: metallicResistances + - type: Collidable + shapes: + - !type:PhysShapeAabb + layer: + - Opaque + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 3de2ef26ed..368e32b604 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1,16 +1,3 @@ -- type: tile - name: floor_carpet - display_name: Carpet - texture: "carpet" - base_turfs: - - space - - plating - is_subfloor: false - can_crowbar: true - footstep_sounds: footstep_carpet - friction: 0.35 - item_drop: FloorTileItemCarpet - - type: tile name: floor_dark display_name: Dark floor @@ -135,7 +122,7 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: + footstep_sounds: friction: 0.35 item_drop: FloorTileItemShowroom diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_0.png b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_0.png new file mode 100644 index 0000000000..0dbf669528 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_0.png differ diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_1.png b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_1.png new file mode 100644 index 0000000000..0eae42bcf1 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_1.png differ diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_2.png b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_2.png new file mode 100644 index 0000000000..0dbf669528 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_2.png differ diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_3.png b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_3.png new file mode 100644 index 0000000000..0eae42bcf1 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_3.png differ diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_4.png b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_4.png new file mode 100644 index 0000000000..71fcb282f2 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_4.png differ diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_5.png b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_5.png new file mode 100644 index 0000000000..7fa51e0e9d Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_5.png differ diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_6.png b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_6.png new file mode 100644 index 0000000000..71fcb282f2 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_6.png differ diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_7.png b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_7.png new file mode 100644 index 0000000000..f56f9332cf Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/carpet_7.png differ diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/full.png b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/full.png new file mode 100644 index 0000000000..c8704c41c0 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Carpets/black_carpet.rsi/meta.json b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/meta.json new file mode 100644 index 0000000000..5490ce510e --- /dev/null +++ b/Resources/Textures/Constructible/Carpets/black_carpet.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "carpet_0", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_1", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_2", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_3", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_4", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_5", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_6", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_7", + "select": [], + "flags": {}, + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_0.png b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_0.png new file mode 100644 index 0000000000..464feb67cf Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_0.png differ diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_1.png b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_1.png new file mode 100644 index 0000000000..af1d4cf09e Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_1.png differ diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_2.png b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_2.png new file mode 100644 index 0000000000..464feb67cf Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_2.png differ diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_3.png b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_3.png new file mode 100644 index 0000000000..af1d4cf09e Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_3.png differ diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_4.png b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_4.png new file mode 100644 index 0000000000..962ab6e17c Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_4.png differ diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_5.png b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_5.png new file mode 100644 index 0000000000..31ca15238e Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_5.png differ diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_6.png b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_6.png new file mode 100644 index 0000000000..962ab6e17c Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_6.png differ diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_7.png b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_7.png new file mode 100644 index 0000000000..962f2ca677 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/carpet_7.png differ diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/full.png b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/full.png new file mode 100644 index 0000000000..f2c21ce00c Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/meta.json b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/meta.json new file mode 100644 index 0000000000..5490ce510e --- /dev/null +++ b/Resources/Textures/Constructible/Carpets/blue_carpet.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "carpet_0", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_1", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_2", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_3", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_4", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_5", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_6", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_7", + "select": [], + "flags": {}, + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_0.png b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_0.png new file mode 100644 index 0000000000..1ad7b29c08 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_0.png differ diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_1.png b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_1.png new file mode 100644 index 0000000000..fb9158ea8e Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_1.png differ diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_2.png b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_2.png new file mode 100644 index 0000000000..1ad7b29c08 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_2.png differ diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_3.png b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_3.png new file mode 100644 index 0000000000..fb9158ea8e Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_3.png differ diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_4.png b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_4.png new file mode 100644 index 0000000000..7d6cfe21c7 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_4.png differ diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_5.png b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_5.png new file mode 100644 index 0000000000..8b765214dd Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_5.png differ diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_6.png b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_6.png new file mode 100644 index 0000000000..7d6cfe21c7 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_6.png differ diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_7.png b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_7.png new file mode 100644 index 0000000000..a20236a6a3 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/carpet_7.png differ diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/full.png b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/full.png new file mode 100644 index 0000000000..c69c133a8e Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/meta.json b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/meta.json new file mode 100644 index 0000000000..5490ce510e --- /dev/null +++ b/Resources/Textures/Constructible/Carpets/gay_carpet.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "carpet_0", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_1", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_2", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_3", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_4", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_5", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_6", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_7", + "select": [], + "flags": {}, + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_0.png b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_0.png new file mode 100644 index 0000000000..6b5121e816 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_0.png differ diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_1.png b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_1.png new file mode 100644 index 0000000000..4a7c022461 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_1.png differ diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_2.png b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_2.png new file mode 100644 index 0000000000..6b5121e816 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_2.png differ diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_3.png b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_3.png new file mode 100644 index 0000000000..4a7c022461 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_3.png differ diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_4.png b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_4.png new file mode 100644 index 0000000000..d1f3d7c223 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_4.png differ diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_5.png b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_5.png new file mode 100644 index 0000000000..cf7035ce3f Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_5.png differ diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_6.png b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_6.png new file mode 100644 index 0000000000..d1f3d7c223 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_6.png differ diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_7.png b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_7.png new file mode 100644 index 0000000000..ddde0ed604 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/carpet_7.png differ diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/full.png b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/full.png new file mode 100644 index 0000000000..858308d425 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Carpets/green_carpet.rsi/meta.json b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/meta.json new file mode 100644 index 0000000000..5490ce510e --- /dev/null +++ b/Resources/Textures/Constructible/Carpets/green_carpet.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "carpet_0", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_1", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_2", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_3", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_4", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_5", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_6", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_7", + "select": [], + "flags": {}, + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_0.png b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_0.png new file mode 100644 index 0000000000..5425585302 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_0.png differ diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_1.png b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_1.png new file mode 100644 index 0000000000..250f4e854b Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_1.png differ diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_2.png b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_2.png new file mode 100644 index 0000000000..5425585302 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_2.png differ diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_3.png b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_3.png new file mode 100644 index 0000000000..250f4e854b Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_3.png differ diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_4.png b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_4.png new file mode 100644 index 0000000000..cfd75e3a00 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_4.png differ diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_5.png b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_5.png new file mode 100644 index 0000000000..1880532abf Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_5.png differ diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_6.png b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_6.png new file mode 100644 index 0000000000..cfd75e3a00 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_6.png differ diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_7.png b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_7.png new file mode 100644 index 0000000000..fa83ed5be9 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/carpet_7.png differ diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/full.png b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/full.png new file mode 100644 index 0000000000..d4886e6c41 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/meta.json b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/meta.json new file mode 100644 index 0000000000..5490ce510e --- /dev/null +++ b/Resources/Textures/Constructible/Carpets/orange_carpet.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "carpet_0", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_1", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_2", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_3", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_4", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_5", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_6", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_7", + "select": [], + "flags": {}, + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_0.png b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_0.png new file mode 100644 index 0000000000..51cd80fb90 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_0.png differ diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_1.png b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_1.png new file mode 100644 index 0000000000..edf97ef536 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_1.png differ diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_2.png b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_2.png new file mode 100644 index 0000000000..51cd80fb90 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_2.png differ diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_3.png b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_3.png new file mode 100644 index 0000000000..edf97ef536 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_3.png differ diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_4.png b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_4.png new file mode 100644 index 0000000000..bf92db7e36 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_4.png differ diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_5.png b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_5.png new file mode 100644 index 0000000000..ee6b06bbf0 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_5.png differ diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_6.png b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_6.png new file mode 100644 index 0000000000..bf92db7e36 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_6.png differ diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_7.png b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_7.png new file mode 100644 index 0000000000..9084307d80 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/carpet_7.png differ diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/full.png b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/full.png new file mode 100644 index 0000000000..3e08bf7060 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/meta.json b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/meta.json new file mode 100644 index 0000000000..5490ce510e --- /dev/null +++ b/Resources/Textures/Constructible/Carpets/purple_carpet.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "carpet_0", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_1", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_2", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_3", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_4", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_5", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_6", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_7", + "select": [], + "flags": {}, + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_0.png b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_0.png new file mode 100644 index 0000000000..85161d0a62 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_0.png differ diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_1.png b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_1.png new file mode 100644 index 0000000000..65d70246ae Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_1.png differ diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_2.png b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_2.png new file mode 100644 index 0000000000..85161d0a62 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_2.png differ diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_3.png b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_3.png new file mode 100644 index 0000000000..65d70246ae Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_3.png differ diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_4.png b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_4.png new file mode 100644 index 0000000000..6b559395e7 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_4.png differ diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_5.png b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_5.png new file mode 100644 index 0000000000..1d240c1821 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_5.png differ diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_6.png b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_6.png new file mode 100644 index 0000000000..6b559395e7 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_6.png differ diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_7.png b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_7.png new file mode 100644 index 0000000000..d6d6e4033d Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/carpet_7.png differ diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/full.png b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/full.png new file mode 100644 index 0000000000..2e15f0cc82 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Carpets/red_carpet.rsi/meta.json b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/meta.json new file mode 100644 index 0000000000..5490ce510e --- /dev/null +++ b/Resources/Textures/Constructible/Carpets/red_carpet.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "carpet_0", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_1", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_2", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_3", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_4", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_5", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_6", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_7", + "select": [], + "flags": {}, + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_0.png b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_0.png new file mode 100644 index 0000000000..25b013acf6 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_0.png differ diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_1.png b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_1.png new file mode 100644 index 0000000000..4233522e36 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_1.png differ diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_2.png b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_2.png new file mode 100644 index 0000000000..25b013acf6 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_2.png differ diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_3.png b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_3.png new file mode 100644 index 0000000000..4233522e36 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_3.png differ diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_4.png b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_4.png new file mode 100644 index 0000000000..10e4fa2310 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_4.png differ diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_5.png b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_5.png new file mode 100644 index 0000000000..5ee1617972 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_5.png differ diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_6.png b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_6.png new file mode 100644 index 0000000000..10e4fa2310 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_6.png differ diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_7.png b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_7.png new file mode 100644 index 0000000000..b97f0a0a60 Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/carpet_7.png differ diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/full.png b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/full.png new file mode 100644 index 0000000000..e240c93fbd Binary files /dev/null and b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/meta.json b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/meta.json new file mode 100644 index 0000000000..5490ce510e --- /dev/null +++ b/Resources/Textures/Constructible/Carpets/skyblue_carpet.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full", + "select": [], + "flags": {}, + "directions": 1 + }, + { + "name": "carpet_0", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_1", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_2", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_3", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_4", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_5", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_6", + "select": [], + "flags": {}, + "directions": 4 + }, + { + "name": "carpet_7", + "select": [], + "flags": {}, + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-0.png b/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-0.png new file mode 100644 index 0000000000..25c64415d8 Binary files /dev/null and b/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-0.png differ diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-1.png b/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-1.png new file mode 100644 index 0000000000..547f0a33ef Binary files /dev/null and b/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-1.png differ diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-2.png b/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-2.png new file mode 100644 index 0000000000..b03303172b Binary files /dev/null and b/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-2.png differ diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-3.png b/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-3.png new file mode 100644 index 0000000000..f1b4c87cd1 Binary files /dev/null and b/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-3.png differ diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-4.png b/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-4.png new file mode 100644 index 0000000000..1a49a13989 Binary files /dev/null and b/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-4.png differ diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-5.png b/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-5.png new file mode 100644 index 0000000000..3607c11a0d Binary files /dev/null and b/Resources/Textures/Constructible/Misc/bookshelf.rsi/book-5.png differ diff --git a/Resources/Textures/Constructible/Misc/bookshelf.rsi/meta.json b/Resources/Textures/Constructible/Misc/bookshelf.rsi/meta.json new file mode 100644 index 0000000000..45314d7ee0 --- /dev/null +++ b/Resources/Textures/Constructible/Misc/bookshelf.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32, + "license":"CC-BY-SA-3.0", + "copyright":"Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f777c8ddf7a529b002df17909566d5d93b8ad201", + }, + "states": [ + { + "name": "book-0", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "book-1", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "book-2", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "book-3", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "book-4", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "book-5", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/blank.png b/Resources/Textures/Constructible/Misc/furniture.rsi/blank.png deleted file mode 100644 index 6e3cb09bcf..0000000000 Binary files a/Resources/Textures/Constructible/Misc/furniture.rsi/blank.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Misc/furniture.rsi/meta.json b/Resources/Textures/Constructible/Misc/furniture.rsi/meta.json index d9fff5ca68..f39c72dfd3 100644 --- a/Resources/Textures/Constructible/Misc/furniture.rsi/meta.json +++ b/Resources/Textures/Constructible/Misc/furniture.rsi/meta.json @@ -77,15 +77,6 @@ ] ] }, - { - "name": "blank", - "directions": 1, - "delays": [ - [ - 1 - ] - ] - }, { "name": "chair", "directions": 4, diff --git a/Resources/Textures/Constructible/Misc/rack.png b/Resources/Textures/Constructible/Misc/rack.png new file mode 100644 index 0000000000..e52e97148e Binary files /dev/null and b/Resources/Textures/Constructible/Misc/rack.png differ diff --git a/Resources/Textures/Constructible/Misc/shelf.png b/Resources/Textures/Constructible/Misc/shelf.png new file mode 100644 index 0000000000..5404fb8e9d Binary files /dev/null and b/Resources/Textures/Constructible/Misc/shelf.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/full.png b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/full.png new file mode 100644 index 0000000000..b48e8c584d Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/meta.json b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/meta.json new file mode 100644 index 0000000000..f1072bd655 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/meta.json @@ -0,0 +1,164 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", + "states": [ + { + "name": "full", + "directions": 1, + "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/Constructible/Structures/Tables/bar.rsi/state_0.png b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_0.png new file mode 100644 index 0000000000..5f16e1db43 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_0.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_1.png b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_1.png new file mode 100644 index 0000000000..5e910180b7 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_1.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_2.png b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_2.png new file mode 100644 index 0000000000..5f16e1db43 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_2.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_3.png b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_3.png new file mode 100644 index 0000000000..935fddc5aa Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_3.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_4.png b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_4.png new file mode 100644 index 0000000000..9b2bd59d6e Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_4.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_5.png b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_5.png new file mode 100644 index 0000000000..948e0b6f9e Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_5.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_6.png b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_6.png new file mode 100644 index 0000000000..10b077dd7f Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_6.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_7.png b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_7.png new file mode 100644 index 0000000000..c46b548aa3 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/bar.rsi/state_7.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/full.png b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/full.png new file mode 100644 index 0000000000..1b774e0575 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/meta.json b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/meta.json new file mode 100644 index 0000000000..f1072bd655 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/meta.json @@ -0,0 +1,164 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", + "states": [ + { + "name": "full", + "directions": 1, + "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/Constructible/Structures/Tables/carpet.rsi/state_0.png b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_0.png new file mode 100644 index 0000000000..cf5f11fd37 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_0.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_1.png b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_1.png new file mode 100644 index 0000000000..6c73fc4338 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_1.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_2.png b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_2.png new file mode 100644 index 0000000000..cf5f11fd37 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_2.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_3.png b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_3.png new file mode 100644 index 0000000000..6c73fc4338 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_3.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_4.png b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_4.png new file mode 100644 index 0000000000..6fdab3eca4 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_4.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_5.png b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_5.png new file mode 100644 index 0000000000..2494a9b04a Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_5.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_6.png b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_6.png new file mode 100644 index 0000000000..6fdab3eca4 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_6.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_7.png b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_7.png new file mode 100644 index 0000000000..8f535b4a1e Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/carpet.rsi/state_7.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/full.png b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/full.png new file mode 100644 index 0000000000..65e089c8ea Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/meta.json b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/meta.json new file mode 100644 index 0000000000..f1072bd655 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/meta.json @@ -0,0 +1,164 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", + "states": [ + { + "name": "full", + "directions": 1, + "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/Constructible/Structures/Tables/debug.rsi/state_0.png b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_0.png new file mode 100644 index 0000000000..7acdbd23eb Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_0.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_1.png b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_1.png new file mode 100644 index 0000000000..ff81adbb8b Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_1.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_2.png b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_2.png new file mode 100644 index 0000000000..f39202b33c Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_2.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_3.png b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_3.png new file mode 100644 index 0000000000..3e9d9dc6c8 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_3.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_4.png b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_4.png new file mode 100644 index 0000000000..69fd5b6bcb Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_4.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_5.png b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_5.png new file mode 100644 index 0000000000..ac061b353d Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_5.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_6.png b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_6.png new file mode 100644 index 0000000000..3171a2f58f Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_6.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_7.png b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_7.png new file mode 100644 index 0000000000..9e4de1e76e Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/debug.rsi/state_7.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/full.png b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/full.png new file mode 100644 index 0000000000..2af9b7ff1b Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/meta.json b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/meta.json new file mode 100644 index 0000000000..f1072bd655 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/meta.json @@ -0,0 +1,164 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", + "states": [ + { + "name": "full", + "directions": 1, + "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/Constructible/Structures/Tables/frame.rsi/state_0.png b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_0.png new file mode 100644 index 0000000000..2ba1f779a2 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_0.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_1.png b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_1.png new file mode 100644 index 0000000000..27684dc258 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_1.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_2.png b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_2.png new file mode 100644 index 0000000000..2ba1f779a2 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_2.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_3.png b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_3.png new file mode 100644 index 0000000000..27684dc258 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_3.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_4.png b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_4.png new file mode 100644 index 0000000000..f2df00c177 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_4.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_5.png b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_5.png new file mode 100644 index 0000000000..682b8d26e1 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_5.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_6.png b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_6.png new file mode 100644 index 0000000000..f2df00c177 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_6.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_7.png b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_7.png new file mode 100644 index 0000000000..20926e2c5a Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/frame.rsi/state_7.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/plain_preview.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/plain_preview.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/meta.json b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/meta.json index d38885742a..f1072bd655 100644 --- a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/meta.json +++ b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/meta.json @@ -8,16 +8,16 @@ "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", "states": [ { - "name": "plain_preview", + "name": "full", "directions": 1, "delays": [ [ - 1.0 + 1 ] ] }, { - "name": "solid_0", + "name": "state_0", "directions": 4, "delays": [ [ @@ -35,7 +35,7 @@ ] }, { - "name": "solid_1", + "name": "state_1", "directions": 4, "delays": [ [ @@ -53,7 +53,7 @@ ] }, { - "name": "solid_2", + "name": "state_2", "directions": 4, "delays": [ [ @@ -71,7 +71,7 @@ ] }, { - "name": "solid_3", + "name": "state_3", "directions": 4, "delays": [ [ @@ -89,7 +89,7 @@ ] }, { - "name": "solid_4", + "name": "state_4", "directions": 4, "delays": [ [ @@ -107,7 +107,7 @@ ] }, { - "name": "solid_5", + "name": "state_5", "directions": 4, "delays": [ [ @@ -125,7 +125,7 @@ ] }, { - "name": "solid_6", + "name": "state_6", "directions": 4, "delays": [ [ @@ -143,7 +143,7 @@ ] }, { - "name": "solid_7", + "name": "state_7", "directions": 4, "delays": [ [ diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_0.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_0.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_0.png diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_1.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_1.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_1.png diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_2.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_2.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_2.png diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_3.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_3.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_3.png diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_4.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_4.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_4.png diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_5.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_5.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_5.png diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_6.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_6.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_6.png diff --git a/Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_7.png b/Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/generic.rsi/solid_7.png rename to Resources/Textures/Constructible/Structures/Tables/generic.rsi/state_7.png diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/full.png b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/full.png new file mode 100644 index 0000000000..b1a6f7af56 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/meta.json b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/meta.json new file mode 100644 index 0000000000..f1072bd655 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/meta.json @@ -0,0 +1,164 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", + "states": [ + { + "name": "full", + "directions": 1, + "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/Constructible/Structures/Tables/glass.rsi/state_0.png b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_0.png new file mode 100644 index 0000000000..c56fc692ef Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_0.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_1.png b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_1.png new file mode 100644 index 0000000000..def9941b86 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_1.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_2.png b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_2.png new file mode 100644 index 0000000000..c56fc692ef Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_2.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_3.png b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_3.png new file mode 100644 index 0000000000..def9941b86 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_3.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_4.png b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_4.png new file mode 100644 index 0000000000..9bdc4d9edd Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_4.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_5.png b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_5.png new file mode 100644 index 0000000000..99eefcc2f9 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_5.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_6.png b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_6.png new file mode 100644 index 0000000000..9bdc4d9edd Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_6.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_7.png b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_7.png new file mode 100644 index 0000000000..9fe2dddd3f Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/glass.rsi/state_7.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/full.png b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/full.png new file mode 100644 index 0000000000..788ab0449f Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/meta.json b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/meta.json new file mode 100644 index 0000000000..f1072bd655 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/meta.json @@ -0,0 +1,164 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", + "states": [ + { + "name": "full", + "directions": 1, + "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/Constructible/Structures/Tables/metal.rsi/state_0.png b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_0.png new file mode 100644 index 0000000000..1ce13cbd08 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_0.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_1.png b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_1.png new file mode 100644 index 0000000000..874901ded5 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_1.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_2.png b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_2.png new file mode 100644 index 0000000000..1ce13cbd08 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_2.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_3.png b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_3.png new file mode 100644 index 0000000000..874901ded5 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_3.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_4.png b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_4.png new file mode 100644 index 0000000000..68a4eedeb2 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_4.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_5.png b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_5.png new file mode 100644 index 0000000000..bc7553d53f Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_5.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_6.png b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_6.png new file mode 100644 index 0000000000..68a4eedeb2 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_6.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_7.png b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_7.png new file mode 100644 index 0000000000..210e315508 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/metal.rsi/state_7.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/full.png b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/full.png new file mode 100644 index 0000000000..be30ee84c5 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/meta.json b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/meta.json new file mode 100644 index 0000000000..f1072bd655 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/meta.json @@ -0,0 +1,164 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", + "states": [ + { + "name": "full", + "directions": 1, + "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/Constructible/Structures/Tables/r_glass.rsi/state_0.png b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_0.png new file mode 100644 index 0000000000..862aff9338 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_0.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_1.png b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_1.png new file mode 100644 index 0000000000..8b97929d64 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_1.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_2.png b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_2.png new file mode 100644 index 0000000000..862aff9338 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_2.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_3.png b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_3.png new file mode 100644 index 0000000000..8b97929d64 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_3.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_4.png b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_4.png new file mode 100644 index 0000000000..57fdbb30d7 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_4.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_5.png b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_5.png new file mode 100644 index 0000000000..b3231dc972 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_5.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_6.png b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_6.png new file mode 100644 index 0000000000..57fdbb30d7 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_6.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_7.png b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_7.png new file mode 100644 index 0000000000..495a1103fb Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/r_glass.rsi/state_7.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/full.png b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/full.png new file mode 100644 index 0000000000..27476ab819 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/meta.json b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/meta.json new file mode 100644 index 0000000000..f1072bd655 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/meta.json @@ -0,0 +1,164 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", + "states": [ + { + "name": "full", + "directions": 1, + "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/Constructible/Structures/Tables/reinforced.rsi/state_0.png b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_0.png new file mode 100644 index 0000000000..c0aba081f5 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_0.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_1.png b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_1.png new file mode 100644 index 0000000000..71c3977bce Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_1.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_2.png b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_2.png new file mode 100644 index 0000000000..c0aba081f5 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_2.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_3.png b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_3.png new file mode 100644 index 0000000000..71c3977bce Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_3.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_4.png b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_4.png new file mode 100644 index 0000000000..1fb8889f58 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_4.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_5.png b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_5.png new file mode 100644 index 0000000000..776c50ed64 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_5.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_6.png b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_6.png new file mode 100644 index 0000000000..1fb8889f58 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_6.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_7.png b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_7.png new file mode 100644 index 0000000000..f50c327058 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/reinforced.rsi/state_7.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/full.png b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/full.png new file mode 100644 index 0000000000..ac7e8a0379 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/meta.json b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/meta.json new file mode 100644 index 0000000000..f1072bd655 --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/meta.json @@ -0,0 +1,164 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", + "states": [ + { + "name": "full", + "directions": 1, + "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/Constructible/Structures/Tables/stone.rsi/state_0.png b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_0.png new file mode 100644 index 0000000000..6f975e63bd Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_0.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_1.png b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_1.png new file mode 100644 index 0000000000..ea4b17ad7a Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_1.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_2.png b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_2.png new file mode 100644 index 0000000000..6f975e63bd Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_2.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_3.png b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_3.png new file mode 100644 index 0000000000..ea4b17ad7a Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_3.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_4.png b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_4.png new file mode 100644 index 0000000000..7dc649af14 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_4.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_5.png b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_5.png new file mode 100644 index 0000000000..e1a11a3196 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_5.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_6.png b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_6.png new file mode 100644 index 0000000000..7dc649af14 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_6.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_7.png b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_7.png new file mode 100644 index 0000000000..f3b0342048 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/stone.rsi/state_7.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/icon.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/full.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/icon.png rename to Resources/Textures/Constructible/Structures/Tables/wood.rsi/full.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/meta.json b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/meta.json index b102c12206..f1072bd655 100644 --- a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/meta.json +++ b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/meta.json @@ -8,7 +8,7 @@ "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", "states": [ { - "name": "icon", + "name": "full", "directions": 1, "delays": [ [ @@ -17,7 +17,7 @@ ] }, { - "name": "wood_0", + "name": "state_0", "directions": 4, "delays": [ [ @@ -35,7 +35,7 @@ ] }, { - "name": "wood_1", + "name": "state_1", "directions": 4, "delays": [ [ @@ -53,7 +53,7 @@ ] }, { - "name": "wood_2", + "name": "state_2", "directions": 4, "delays": [ [ @@ -71,7 +71,7 @@ ] }, { - "name": "wood_3", + "name": "state_3", "directions": 4, "delays": [ [ @@ -89,7 +89,7 @@ ] }, { - "name": "wood_4", + "name": "state_4", "directions": 4, "delays": [ [ @@ -107,7 +107,7 @@ ] }, { - "name": "wood_5", + "name": "state_5", "directions": 4, "delays": [ [ @@ -125,7 +125,7 @@ ] }, { - "name": "wood_6", + "name": "state_6", "directions": 4, "delays": [ [ @@ -143,7 +143,7 @@ ] }, { - "name": "wood_7", + "name": "state_7", "directions": 4, "delays": [ [ diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_0.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_0.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_0.png rename to Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_0.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_1.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_1.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_1.png rename to Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_1.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_2.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_2.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_2.png rename to Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_2.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_3.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_3.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_3.png rename to Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_3.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_4.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_4.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_4.png rename to Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_4.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_5.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_5.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_5.png rename to Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_5.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_6.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_6.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_6.png rename to Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_6.png diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_7.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_7.png similarity index 100% rename from Resources/Textures/Constructible/Structures/Tables/wood.rsi/wood_7.png rename to Resources/Textures/Constructible/Structures/Tables/wood.rsi/state_7.png diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/full.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/full.png new file mode 100644 index 0000000000..ead82446a8 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/full.png differ diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/meta.json b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/meta.json new file mode 100644 index 0000000000..61f56e509f --- /dev/null +++ b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/meta.json @@ -0,0 +1,164 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken and modified from https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/icons/obj/structures/windows.dmi", + "states": [ + { + "name": "full", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "pwindow0", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "pwindow1", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "pwindow2", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "pwindow3", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "pwindow4", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "pwindow5", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "pwindow6", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "pwindow7", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow0.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow0.png new file mode 100644 index 0000000000..a587292bd1 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow0.png differ diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow1.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow1.png new file mode 100644 index 0000000000..f8b0fa0ff5 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow1.png differ diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow2.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow2.png new file mode 100644 index 0000000000..a587292bd1 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow2.png differ diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow3.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow3.png new file mode 100644 index 0000000000..f8b0fa0ff5 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow3.png differ diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow4.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow4.png new file mode 100644 index 0000000000..a6938da9d2 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow4.png differ diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow5.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow5.png new file mode 100644 index 0000000000..ef4325d6bf Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow5.png differ diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow6.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow6.png new file mode 100644 index 0000000000..a6938da9d2 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow6.png differ diff --git a/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow7.png b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow7.png new file mode 100644 index 0000000000..4e754d7d97 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Windows/phoron_window.rsi/pwindow7.png differ diff --git a/Resources/Textures/Constructible/Tiles/carpet.png b/Resources/Textures/Constructible/Tiles/carpet.png deleted file mode 100644 index e6f73cc5c7..0000000000 Binary files a/Resources/Textures/Constructible/Tiles/carpet.png and /dev/null differ diff --git a/Resources/Textures/Effects/atmospherics.rsi/phoron.png b/Resources/Textures/Effects/atmospherics.rsi/phoron.png index f4c568e322..bf43a48196 100644 Binary files a/Resources/Textures/Effects/atmospherics.rsi/phoron.png and b/Resources/Textures/Effects/atmospherics.rsi/phoron.png differ diff --git a/Resources/Textures/Objects/Misc/lights.rsi/bananalamp.png b/Resources/Textures/Objects/Misc/lights.rsi/bananalamp.png new file mode 100644 index 0000000000..c8131b017b Binary files /dev/null and b/Resources/Textures/Objects/Misc/lights.rsi/bananalamp.png differ diff --git a/Resources/Textures/Objects/Misc/lights.rsi/bananalamp_on.png b/Resources/Textures/Objects/Misc/lights.rsi/bananalamp_on.png new file mode 100644 index 0000000000..4a8a26dadd Binary files /dev/null and b/Resources/Textures/Objects/Misc/lights.rsi/bananalamp_on.png differ diff --git a/Resources/Textures/Objects/Misc/lights.rsi/floodlight.png b/Resources/Textures/Objects/Misc/lights.rsi/floodlight.png new file mode 100644 index 0000000000..6841c443c8 Binary files /dev/null and b/Resources/Textures/Objects/Misc/lights.rsi/floodlight.png differ diff --git a/Resources/Textures/Objects/Misc/lights.rsi/floodlight_broken.png b/Resources/Textures/Objects/Misc/lights.rsi/floodlight_broken.png new file mode 100644 index 0000000000..d6399dfcd3 Binary files /dev/null and b/Resources/Textures/Objects/Misc/lights.rsi/floodlight_broken.png differ diff --git a/Resources/Textures/Objects/Misc/lights.rsi/floodlight_burned.png b/Resources/Textures/Objects/Misc/lights.rsi/floodlight_burned.png new file mode 100644 index 0000000000..8158212e22 Binary files /dev/null and b/Resources/Textures/Objects/Misc/lights.rsi/floodlight_burned.png differ diff --git a/Resources/Textures/Objects/Misc/lights.rsi/floodlight_on.png b/Resources/Textures/Objects/Misc/lights.rsi/floodlight_on.png new file mode 100644 index 0000000000..6868f886a3 Binary files /dev/null and b/Resources/Textures/Objects/Misc/lights.rsi/floodlight_on.png differ diff --git a/Resources/Textures/Objects/Misc/lights.rsi/lamp.png b/Resources/Textures/Objects/Misc/lights.rsi/lamp.png new file mode 100644 index 0000000000..d62d35cfd3 Binary files /dev/null and b/Resources/Textures/Objects/Misc/lights.rsi/lamp.png differ diff --git a/Resources/Textures/Objects/Misc/lights.rsi/lamp_on.png b/Resources/Textures/Objects/Misc/lights.rsi/lamp_on.png new file mode 100644 index 0000000000..3bb975b37e Binary files /dev/null and b/Resources/Textures/Objects/Misc/lights.rsi/lamp_on.png differ diff --git a/Resources/Textures/Objects/Misc/lights.rsi/lampgreen.png b/Resources/Textures/Objects/Misc/lights.rsi/lampgreen.png new file mode 100644 index 0000000000..49aa52bc4c Binary files /dev/null and b/Resources/Textures/Objects/Misc/lights.rsi/lampgreen.png differ diff --git a/Resources/Textures/Objects/Misc/lights.rsi/lampgreen_on.png b/Resources/Textures/Objects/Misc/lights.rsi/lampgreen_on.png new file mode 100644 index 0000000000..c65cca042e Binary files /dev/null and b/Resources/Textures/Objects/Misc/lights.rsi/lampgreen_on.png differ diff --git a/Resources/Textures/Objects/Misc/lights.rsi/meta.json b/Resources/Textures/Objects/Misc/lights.rsi/meta.json new file mode 100644 index 0000000000..d956793e53 --- /dev/null +++ b/Resources/Textures/Objects/Misc/lights.rsi/meta.json @@ -0,0 +1,99 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bananalamp", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "bananalamp_on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "floodlight", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "floodlight_on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "floodlight_burned", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "floodlight_broken", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "lamp", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "lamp_on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "lampgreen", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "lampgreen_on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerbronze.png b/Resources/Textures/Objects/Misc/markers.rsi/markerbronze.png new file mode 100644 index 0000000000..f6dbcc26a1 Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerbronze.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerbronze_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerbronze_on.png new file mode 100644 index 0000000000..823e5fc2ff Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerbronze_on.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerburgundy.png b/Resources/Textures/Objects/Misc/markers.rsi/markerburgundy.png new file mode 100644 index 0000000000..88839df85e Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerburgundy.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerburgundy_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerburgundy_on.png new file mode 100644 index 0000000000..f3ade0c23d Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerburgundy_on.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markercerulean.png b/Resources/Textures/Objects/Misc/markers.rsi/markercerulean.png new file mode 100644 index 0000000000..43cd9c5076 Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markercerulean.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markercerulean_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markercerulean_on.png new file mode 100644 index 0000000000..fb34f6d548 Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markercerulean_on.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia.png b/Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia.png new file mode 100644 index 0000000000..87f7d646ba Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia_on.png new file mode 100644 index 0000000000..b33ee445d9 Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia_on.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerindigo.png b/Resources/Textures/Objects/Misc/markers.rsi/markerindigo.png new file mode 100644 index 0000000000..c4608e83b9 Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerindigo.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerindigo_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerindigo_on.png new file mode 100644 index 0000000000..753a520fb2 Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerindigo_on.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerjade.png b/Resources/Textures/Objects/Misc/markers.rsi/markerjade.png new file mode 100644 index 0000000000..7c2c6a4694 Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerjade.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerjade_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerjade_on.png new file mode 100644 index 0000000000..00eced565b Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerjade_on.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerlime.png b/Resources/Textures/Objects/Misc/markers.rsi/markerlime.png new file mode 100644 index 0000000000..72d924784e Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerlime.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerlime_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerlime_on.png new file mode 100644 index 0000000000..1e2219aa95 Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerlime_on.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerolive.png b/Resources/Textures/Objects/Misc/markers.rsi/markerolive.png new file mode 100644 index 0000000000..6d9f927061 Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerolive.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerolive_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerolive_on.png new file mode 100644 index 0000000000..311c890077 Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerolive_on.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerpurple.png b/Resources/Textures/Objects/Misc/markers.rsi/markerpurple.png new file mode 100644 index 0000000000..22a043d551 Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerpurple.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerpurple_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerpurple_on.png new file mode 100644 index 0000000000..941495519d Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerpurple_on.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerrandom.png b/Resources/Textures/Objects/Misc/markers.rsi/markerrandom.png new file mode 100644 index 0000000000..d773558b39 Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerrandom.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerteal.png b/Resources/Textures/Objects/Misc/markers.rsi/markerteal.png new file mode 100644 index 0000000000..1603665d5a Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerteal.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerteal_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerteal_on.png new file mode 100644 index 0000000000..4c60059e52 Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerteal_on.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerviolet.png b/Resources/Textures/Objects/Misc/markers.rsi/markerviolet.png new file mode 100644 index 0000000000..1a467d5f0e Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerviolet.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerviolet_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerviolet_on.png new file mode 100644 index 0000000000..39bab3f1f6 Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markerviolet_on.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markeryellow.png b/Resources/Textures/Objects/Misc/markers.rsi/markeryellow.png new file mode 100644 index 0000000000..a465d88e4f Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markeryellow.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markeryellow_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markeryellow_on.png new file mode 100644 index 0000000000..b173cc6f4e Binary files /dev/null and b/Resources/Textures/Objects/Misc/markers.rsi/markeryellow_on.png differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/meta.json b/Resources/Textures/Objects/Misc/markers.rsi/meta.json new file mode 100644 index 0000000000..43f08e0452 --- /dev/null +++ b/Resources/Textures/Objects/Misc/markers.rsi/meta.json @@ -0,0 +1,234 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "markerbronze", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerbronze-on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerburgundy", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerburgundy-on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markercerulean", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markercerulean-on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerfuchsia", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerfuchsia-on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerindigo", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerindigo-on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerjade", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerjade-on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerlime", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerlime-on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerolive", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerolive-on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerpurple", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerpurple-on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerrandom", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerteal", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerteal-on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerviolet", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markerviolet-on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markeryellow", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "markeryellow-on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Misc/torch.rsi/meta.json b/Resources/Textures/Objects/Misc/torch.rsi/meta.json new file mode 100644 index 0000000000..1ef7db6594 --- /dev/null +++ b/Resources/Textures/Objects/Misc/torch.rsi/meta.json @@ -0,0 +1,140 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "", + "states": + [ + { + "name": "off-inhand-left", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "off-inhand-right", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "on-inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "on-inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "torch", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "torch_empty", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "torch_on", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Misc/torch.rsi/off-inhand-left.png b/Resources/Textures/Objects/Misc/torch.rsi/off-inhand-left.png new file mode 100644 index 0000000000..81048fc33f Binary files /dev/null and b/Resources/Textures/Objects/Misc/torch.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/torch.rsi/off-inhand-right.png b/Resources/Textures/Objects/Misc/torch.rsi/off-inhand-right.png new file mode 100644 index 0000000000..d8a3016072 Binary files /dev/null and b/Resources/Textures/Objects/Misc/torch.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/torch.rsi/on-inhand-left.png b/Resources/Textures/Objects/Misc/torch.rsi/on-inhand-left.png new file mode 100644 index 0000000000..882a7668e5 Binary files /dev/null and b/Resources/Textures/Objects/Misc/torch.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/torch.rsi/on-inhand-right.png b/Resources/Textures/Objects/Misc/torch.rsi/on-inhand-right.png new file mode 100644 index 0000000000..c53f54968f Binary files /dev/null and b/Resources/Textures/Objects/Misc/torch.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/torch.rsi/torch.png b/Resources/Textures/Objects/Misc/torch.rsi/torch.png new file mode 100644 index 0000000000..f6ddf2b28d Binary files /dev/null and b/Resources/Textures/Objects/Misc/torch.rsi/torch.png differ diff --git a/Resources/Textures/Objects/Misc/torch.rsi/torch_empty.png b/Resources/Textures/Objects/Misc/torch.rsi/torch_empty.png new file mode 100644 index 0000000000..9eae7b804f Binary files /dev/null and b/Resources/Textures/Objects/Misc/torch.rsi/torch_empty.png differ diff --git a/Resources/Textures/Objects/Misc/torch.rsi/torch_on.png b/Resources/Textures/Objects/Misc/torch.rsi/torch_on.png new file mode 100644 index 0000000000..bd3f5581d6 Binary files /dev/null and b/Resources/Textures/Objects/Misc/torch.rsi/torch_on.png differ