diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index cd7f0d5f35..420d472d62 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -53,6 +53,25 @@ - type: Construction graph: TileSteel node: steeltile + +- type: entity + name: steel tile + parent: FloorTileItemBase + id: FloorTileItemMetalDiamond + components: + - type: Sprite + state: metaldiamond + - type: Item + HeldPrefix: steel + - type: FloorTile + outputs: + - plating + - FloorMetalDiamond + - type: Stack + stackType: FloorTileMetalDiamond +# - type: Construction +# graph: TileSteel +# node: steeltile - type: entity name: wood floor @@ -386,6 +405,22 @@ - FloorArcadeBlue - type: Stack stackType: FloorTileStackArcadeBlue + +- type: entity + name: blue arcade floor + parent: FloorTileItemBase + id: FloorTileItemArcadeBlue2 + components: + - type: Sprite + state: arcadeblue2 + - type: Item + HeldPrefix: generic + - type: FloorTile + outputs: + - plating + - FloorArcadeBlue2 + - type: Stack + stackType: FloorTileStackArcadeBlue2 - type: entity name: red arcade floor @@ -418,6 +453,70 @@ - FloorEighties - type: Stack stackType: FloorTileStackEighties + +- type: entity + name: clown carpet floor + parent: FloorTileItemBase + id: FloorTileItemCarpetClown + components: + - type: Sprite + state: carpetclown + - type: Item + HeldPrefix: generic + - type: FloorTile + outputs: + - plating + - FloorCarpetClown + - type: Stack + stackType: FloorTileStackCarpetClown + +- type: entity + name: office carpet floor + parent: FloorTileItemBase + id: FloorTileItemCarpetOffice + components: + - type: Sprite + state: carpetoffice + - type: Item + HeldPrefix: generic + - type: FloorTile + outputs: + - plating + - FloorCarpetOffice + - type: Stack + stackType: FloorTileStackCarpetOffice + +- type: entity + name: boxing ring floor + parent: FloorTileItemBase + id: FloorTileItemBoxing + components: + - type: Sprite + state: boxing + - type: Item + HeldPrefix: generic + - type: FloorTile + outputs: + - plating + - FloorBoxing + - type: Stack + stackType: FloorTileStackBoxing + +- type: entity + name: gym floor + parent: FloorTileItemBase + id: FloorTileItemGym + components: + - type: Sprite + state: gym + - type: Item + HeldPrefix: generic + - type: FloorTile + outputs: + - plating + - FloorGym + - type: Stack + stackType: FloorTileStackGym # Shuttles - type: entity diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index a8d3a6c117..39f2d98431 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -2,6 +2,11 @@ id: FloorTileSteel name: steel tile spawn: FloorTileItemSteel + +- type: stack + id: FloorTileMetalDiamond + name: steel tile + spawn: FloorTileItemMetalDiamond - type: stack id: FloorTileWood @@ -102,6 +107,11 @@ id: FloorTileStackArcadeBlue name: blue arcade tile spawn: FloorTileItemArcadeBlue + +- type: stack + id: FloorTileStackArcadeBlue2 + name: blue arcade tile + spawn: FloorTileItemArcadeBlue2 - type: stack id: FloorTileStackArcadeRed @@ -147,6 +157,26 @@ id: FloorCarpetPink name: pink carpet tile spawn: FloorCarpetItemPink + +- type: stack + id: FloorTileStackCarpetClown + name: clown carpet tile + spawn: FloorTileItemCarpetClown + +- type: stack + id: FloorTileStackCarpetOffice + name: office carpet tile + spawn: FloorTileItemCarpetOffice + +- type: stack + id: FloorTileStackBoxing + name: boxing ring tile + spawn: FloorTileItemBoxing + +- type: stack + id: FloorTileStackGym + name: gym floor tile + spawn: FloorTileItemGym - type: stack id: FloorTileElevatorShaft diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 9841145209..b80c7b715c 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -14,6 +14,21 @@ item_drop: FloorTileItemSteel thermalConductivity: 0.04 heatCapacity: 10000 + +- type: tile + id: FloorMetalDiamond + name: diamond plate floor + texture: "metaldiamond" + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.30 + item_drop: FloorTileItemMetalDiamond + thermalConductivity: 0.04 + heatCapacity: 10000 - type: tile id: floor_wood @@ -325,6 +340,21 @@ thermalConductivity: 0.04 heatCapacity: 10000 +- type: tile + id: FloorArcadeBlue2 + name: blue arcade floor + texture: arcadeblue2 + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.40 + item_drop: FloorTileItemArcadeBlue2 + thermalConductivity: 0.04 + heatCapacity: 10000 + - type: tile id: FloorArcadeRed name: red arcade floor @@ -354,6 +384,70 @@ item_drop: FloorTileItemEighties thermalConductivity: 0.04 heatCapacity: 10000 + +- type: tile + id: FloorCarpetClown + name: clown carpet floor + texture: carpetclown + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.40 + item_drop: FloorTileItemCarpetClown + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorCarpetOffice + name: office carpet floor + texture: carpetoffice + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.40 + item_drop: FloorTileItemCarpetOffice + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorBoxing + name: boxing ring floor + texture: boxing + variants: 4 + placementVariants: [0, 1, 2, 3] + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.40 + item_drop: FloorTileItemBoxing + thermalConductivity: 0.04 + heatCapacity: 10000 + +- type: tile + id: FloorGym + name: gym floor + texture: gym + variants: 4 + placementVariants: [0, 1, 2, 3] + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.40 + item_drop: FloorTileItemGym + thermalConductivity: 0.04 + heatCapacity: 10000 # Shuttle - type: tile diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/arcadeblue2.png b/Resources/Textures/Objects/Tiles/tile.rsi/arcadeblue2.png new file mode 100644 index 0000000000..d5a924315a Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/arcadeblue2.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/boxing.png b/Resources/Textures/Objects/Tiles/tile.rsi/boxing.png new file mode 100644 index 0000000000..87ec779dce Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/boxing.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/carpetclown.png b/Resources/Textures/Objects/Tiles/tile.rsi/carpetclown.png new file mode 100644 index 0000000000..44b9c748c0 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/carpetclown.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/carpetoffice.png b/Resources/Textures/Objects/Tiles/tile.rsi/carpetoffice.png new file mode 100644 index 0000000000..54df794f6b Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/carpetoffice.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/gym.png b/Resources/Textures/Objects/Tiles/tile.rsi/gym.png new file mode 100644 index 0000000000..a8e96f17e8 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/gym.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index 45e8ab4d88..5e76d93009 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -109,6 +109,9 @@ { "name": "arcadeblue" }, + { + "name": "arcadeblue2" + }, { "name": "arcadered" }, @@ -130,6 +133,21 @@ { "name": "shuttlered" }, + { + "name": "carpetclown" + }, + { + "name": "carpetoffice" + }, + { + "name": "boxing" + }, + { + "name": "gym" + }, + { + "name": "metaldiamond" + }, { "name": "bcircuit-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/metaldiamond.png b/Resources/Textures/Objects/Tiles/tile.rsi/metaldiamond.png new file mode 100644 index 0000000000..f7cfde6a33 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/metaldiamond.png differ diff --git a/Resources/Textures/Tiles/arcadeblue2.png b/Resources/Textures/Tiles/arcadeblue2.png new file mode 100644 index 0000000000..013af9f36f Binary files /dev/null and b/Resources/Textures/Tiles/arcadeblue2.png differ diff --git a/Resources/Textures/Tiles/boxing.png b/Resources/Textures/Tiles/boxing.png new file mode 100644 index 0000000000..c3c414a5b6 Binary files /dev/null and b/Resources/Textures/Tiles/boxing.png differ diff --git a/Resources/Textures/Tiles/carpetclown.png b/Resources/Textures/Tiles/carpetclown.png new file mode 100644 index 0000000000..03dd2be40b Binary files /dev/null and b/Resources/Textures/Tiles/carpetclown.png differ diff --git a/Resources/Textures/Tiles/carpetoffice.png b/Resources/Textures/Tiles/carpetoffice.png new file mode 100644 index 0000000000..8b142f1d1a Binary files /dev/null and b/Resources/Textures/Tiles/carpetoffice.png differ diff --git a/Resources/Textures/Tiles/copyright.txt b/Resources/Textures/Tiles/copyright.txt index 002ee174ba..bf3af7bd22 100644 --- a/Resources/Textures/Tiles/copyright.txt +++ b/Resources/Textures/Tiles/copyright.txt @@ -15,3 +15,5 @@ shuttleblue, orange, purple, red and white taken from ParadiseSS13 at https://gi deprecated.png made by 20kdc, licensed under SS14's MIT license - don't remove it, it's useful to make sure that maps with old tiles get noticed. +arcadeblue2, boxing, carpetclown, carpetoffice, and gym taken from Goon at commit https://github.com/goonstation/goonstation/commit/c4d549f9259728427c6003da0aa2d95aaafff805 + diff --git a/Resources/Textures/Tiles/gym.png b/Resources/Textures/Tiles/gym.png new file mode 100644 index 0000000000..f2dae4db4b Binary files /dev/null and b/Resources/Textures/Tiles/gym.png differ diff --git a/Resources/Textures/Tiles/metaldiamond.png b/Resources/Textures/Tiles/metaldiamond.png new file mode 100644 index 0000000000..ed48f2ef36 Binary files /dev/null and b/Resources/Textures/Tiles/metaldiamond.png differ