diff --git a/Resources/Locale/en-US/_CP14/stack/materials.ftl b/Resources/Locale/en-US/_CP14/stack/materials.ftl index d7bc70bcf7..d43a821bd2 100644 --- a/Resources/Locale/en-US/_CP14/stack/materials.ftl +++ b/Resources/Locale/en-US/_CP14/stack/materials.ftl @@ -1,5 +1,6 @@ cp14-stack-dirt-block = dirt blocks cp14-stack-stone-block = stone blocks +cp14-stack-marble-block = marble rocks cp14-stack-wood-planks = wooden planks cp14-stack-nails = nails cp14-stack-cloth = rolls of fabric diff --git a/Resources/Locale/en-US/_CP14/tiles/tiles.ftl b/Resources/Locale/en-US/_CP14/tiles/tiles.ftl index a0fc614de3..ec5f29f15e 100644 --- a/Resources/Locale/en-US/_CP14/tiles/tiles.ftl +++ b/Resources/Locale/en-US/_CP14/tiles/tiles.ftl @@ -10,6 +10,7 @@ cp14-tiles-sand = sand cp14-tiles-snow = snow cp14-tiles-snow-deep = deep snow cp14-tiles-snow-deep-deep = deep deep snow +cp14-tiles-marble-cave = marble floor # Produced cp14-tiles-foundation = foundation @@ -61,7 +62,7 @@ cp14-tiles-stonebricks-small-carved2 = carved brick floor cp14-tiles-stonebricks-square-carved = carved brick floor cp14-tiles-stonebricks = stonebrick floor cp14-tiles-stonebricks-weather = street stonebrick floor -cp14-tiles-stonebricks-marble = marble floor +cp14-tiles-stonebricks-marble = marble brick floor cp14-tiles-lucens-woodplanks = lucens woodplanks cp14-tiles-lucens-woodplanks-big = big lucens planks diff --git a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl index d56293fd43..6e1f9081d1 100644 --- a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl @@ -1,5 +1,6 @@ cp14-stack-dirt-block = блоки земли cp14-stack-stone-block = каменные блоки +cp14-stack-marble-block = мраморные камни cp14-stack-wood-planks = деревянные доски cp14-stack-nails = гвозди cp14-stack-cloth = рулоны ткани diff --git a/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl b/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl index c288d50f67..e3ef7e6390 100644 --- a/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl +++ b/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl @@ -10,6 +10,7 @@ cp14-tiles-sand = песок cp14-tiles-snow = снег cp14-tiles-snow-deep = глубокий снег cp14-tiles-snow-deep-deep = очень глубокий снег +cp14-tiles-marble-cave = мраморный пол # Produced cp14-tiles-foundation = фундамент @@ -61,7 +62,7 @@ cp14-tiles-stonebricks-small-carved2 = пол из резного кирпича cp14-tiles-stonebricks-square-carved = пол из резного кирпича cp14-tiles-stonebricks = каменный кирпичный пол cp14-tiles-stonebricks-weather = уличный каменный кирпичный пол -cp14-tiles-stonebricks-marble = мраморный пол +cp14-tiles-stonebricks-marble = мраморный кирпич cp14-tiles-lucens-woodplanks = люценcовые доски cp14-tiles-lucens-woodplanks-big = большие люценcовые доски diff --git a/Resources/Maps/_CP14/dev_map.yml b/Resources/Maps/_CP14/dev_map.yml index b44b1e368e..a30a0b9f24 100644 --- a/Resources/Maps/_CP14/dev_map.yml +++ b/Resources/Maps/_CP14/dev_map.yml @@ -43,9 +43,10 @@ entities: data: {} - type: CP14CloudShadows - type: MapLight - - type: LightCycle + ambientLightColor: "#DDDDDDFF" - type: SunShadow - - type: SunShadowCycle + alpha: 0.8 + direction: 1, -1.5 - type: Biome forcedMarkerLayers: [] markerLayers: [] diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml index 4827f53662..35207d6505 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml @@ -137,4 +137,18 @@ color: green - state: frame - type: CP14BiomeSpawner - biome: CP14LeafMaze \ No newline at end of file + biome: CP14LeafMaze + +- type: entity + id: CP14BiomeSpawnerMarbleCave + parent: CP14BaseBiomeSpawner + suffix: Marble cave + components: + - type: Sprite + layers: + - state: cave + - state: frame + - sprite: _CP14/Objects/Materials/marble_block.rsi + state: stone_3 + - type: CP14BiomeSpawner + biome: CP14MarbleCaves \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/rocks.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/rocks.yml new file mode 100644 index 0000000000..9088da3ae2 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/rocks.yml @@ -0,0 +1,124 @@ +- type: entity + id: CP14DirtBlock1 + parent: BaseItem + name: dirt block + description: A block of excellent black soil. + categories: [ ForkFiltered ] + components: + - type: Item + size: Normal + - type: Sprite + noRot: true + sprite: _CP14/Objects/Materials/dirt_block.rsi + layers: + - state: dirt + map: ["base"] + - type: FloorTile + placeTileSound: + collection: CP14Digging + params: + variation: 0.03 + volume: 2 + outputs: + - CP14FloorDirt + - type: Appearance + - type: Stack + stackType: CP14Dirt + count: 1 + baseLayer: base + layerStates: + - dirt + - dirt_2 + - dirt_3 + - type: Material + - type: PhysicalComposition # точно ли это нужно? + materialComposition: + CP14Dirt: 100 + - type: CP14MagicEssenceContainer + essences: + Earth: 1 + +- type: entity + id: CP14DirtBlock10 + parent: CP14DirtBlock1 + suffix: 10 + components: + - type: Stack + count: 10 + +- type: entity + id: CP14StoneBlock1 + parent: BaseItem + name: stone block + description: A block of cold stone. + categories: [ ForkFiltered ] + components: + - type: Item + size: Normal + - type: Sprite + noRot: true + sprite: _CP14/Objects/Materials/stone_block.rsi + layers: + - state: stone + map: ["base"] + - type: Appearance + - type: Stack + stackType: CP14Stone + count: 1 + baseLayer: base + layerStates: + - stone + - stone_2 + - stone_3 + - type: Material + - type: PhysicalComposition # точно ли это нужно? + materialComposition: + CP14Stone: 100 + - type: CP14MagicEssenceContainer + essences: + Earth: 1 + +- type: entity + id: CP14StoneBlock10 + parent: CP14StoneBlock1 + suffix: 10 + components: + - type: Stack + count: 10 + +- type: entity + id: CP14MarbleBlock1 + parent: BaseItem + name: marble block + description: A block of white marble. + categories: [ ForkFiltered ] + components: + - type: Item + size: Normal + - type: Sprite + noRot: true + sprite: _CP14/Objects/Materials/marble_block.rsi + layers: + - state: stone + map: ["base"] + - type: Appearance + - type: Stack + stackType: CP14MarbleStone + count: 1 + baseLayer: base + layerStates: + - stone + - stone_2 + - stone_3 + - type: Material + - type: PhysicalComposition # точно ли это нужно? + materialComposition: + CP14MarbleStone: 100 + +- type: entity + id: CP14MarbleBlock10 + parent: CP14MarbleBlock1 + suffix: 10 + components: + - type: Stack + count: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml index 615e7870e2..630016edf5 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml @@ -1,91 +1,3 @@ -- type: entity - id: CP14DirtBlock1 - parent: BaseItem - name: dirt block - description: A block of excellent black soil. - categories: [ ForkFiltered ] - components: - - type: Item - size: Normal - - type: Sprite - noRot: true - sprite: _CP14/Objects/Materials/dirt_block.rsi - layers: - - state: dirt - map: ["base"] - - type: FloorTile - placeTileSound: - collection: CP14Digging - params: - variation: 0.03 - volume: 2 - outputs: - - CP14FloorDirt - - type: Appearance - - type: Stack - stackType: CP14Dirt - count: 1 - baseLayer: base - layerStates: - - dirt - - dirt_2 - - dirt_3 - - type: Material - - type: PhysicalComposition # точно ли это нужно? - materialComposition: - CP14Dirt: 100 - - type: CP14MagicEssenceContainer - essences: - Earth: 1 - -- type: entity - id: CP14DirtBlock10 - parent: CP14DirtBlock1 - suffix: 10 - components: - - type: Stack - count: 10 - -- type: entity - id: CP14StoneBlock1 - parent: BaseItem - name: stone block - description: A block of cold stone. - categories: [ ForkFiltered ] - components: - - type: Item - size: Normal - - type: Sprite - noRot: true - sprite: _CP14/Objects/Materials/stone_block.rsi - layers: - - state: stone - map: ["base"] - - type: Appearance - - type: Stack - stackType: CP14Stone - count: 1 - baseLayer: base - layerStates: - - stone - - stone_2 - - stone_3 - - type: Material - - type: PhysicalComposition # точно ли это нужно? - materialComposition: - CP14Stone: 100 - - type: CP14MagicEssenceContainer - essences: - Earth: 1 - -- type: entity - id: CP14StoneBlock10 - parent: CP14StoneBlock1 - suffix: 10 - components: - - type: Stack - count: 10 - - type: entity id: CP14WoodLog parent: BaseItem diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/_CP14/Entities/Objects/Misc/tiles.yml index b98d3c52c6..6a2bb0ddc5 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/tiles.yml @@ -66,6 +66,19 @@ - type: Stack stackType: CP14FloorTileMarbleBrick +- type: entity + parent: CP14FloorTileBase + id: CP14FloorTileMarbleSmallbricks + name: marble small brick + components: + - type: Sprite + state: marble_smallbricks + - type: FloorTile + outputs: + - CP14FloorMarbleSmallbricks + - type: Stack + stackType: CP14FloorTileMarbleSmallbricks + - type: entity parent: CP14FloorTileBase id: CP14FloorTileOakWoodplanks diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml index 158b9bd2bb..344486e8ac 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml @@ -1,8 +1,7 @@ - type: entity parent: - BaseStructure - - CP14BaseFlammable - id: CP14WoodenTableBase + id: CP14TableBase categories: [ ForkFiltered ] abstract: true components: @@ -17,6 +16,31 @@ - TableMask layer: - TableLayer + - type: Damageable + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 60 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/picaxe2.ogg + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepHull + - type: Climbable + - type: PlaceableSurface + +- type: entity + parent: + - CP14TableBase + - CP14BaseFlammable + id: CP14WoodenTableBase + abstract: true + components: - type: Damageable damageContainer: Inorganic damageModifierSet: Wood @@ -52,8 +76,6 @@ - type: FireVisuals sprite: _CP14/Effects/fire.rsi normalState: full - - type: Climbable - - type: PlaceableSurface - type: entity parent: CP14WoodenTableBase @@ -116,4 +138,25 @@ state: full - type: Construction graph: CP14TableWoodenCounter - node: CP14TableWoodenCounter \ No newline at end of file + node: CP14TableWoodenCounter + +- type: entity + parent: CP14TableBase + id: CP14TableMarble + name: marble table + description: Exquisite white marble table. + components: + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Metallic + - type: Sprite + sprite: _CP14/Structures/Furniture/Tables/marble.rsi + - type: Icon + sprite: _CP14/Structures/Furniture/Tables/marble.rsi + state: full + - type: IconSmooth + key: state + base: state + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepFloor \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml index 92963d4bef..92c874d129 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml @@ -38,6 +38,39 @@ - !type:DoActsBehavior acts: ["Destruction"] +- type: entity + id: CP14WallMarbleStone + name: marble + parent: CP14WallStone + components: + - type: Sprite + sprite: _CP14/Structures/Walls/Natural/marble_stone.rsi + - type: Icon + sprite: _CP14/Structures/Walls/Natural/marble_stone.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 350 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + - !type:SpawnEntitiesBehavior + spawn: + CP14MarbleBlock1: + min: 2 + max: 3 + - !type:DoActsBehavior + acts: ["Destruction"] - type: entity id: CP14WallStoneIndestructable diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml index 00cd3c3192..b52903ede7 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml @@ -71,6 +71,25 @@ sprite: _CP14/Structures/Walls/marblebricks_stone_wall.rsi - type: IconSmooth base: stonebricks + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Rock + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Construction + graph: CP14WallMarbleBrick + node: WallMarbleBrick - type: CP14WallpaperHolder - type: entity diff --git a/Resources/Prototypes/_CP14/Materials/simple.yml b/Resources/Prototypes/_CP14/Materials/simple.yml index 72d962f421..d973e54f8b 100644 --- a/Resources/Prototypes/_CP14/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Materials/simple.yml @@ -25,6 +25,15 @@ color: "#555963" price: 0 +- type: material + id: CP14MarbleStone + stackEntity: CP14MarbleBlock1 + name: cp14-material-stone-block #TODO + unit: materials-unit-chunk + icon: { sprite: _CP14/Objects/Materials/marble_block.rsi, state: stone_2 } + color: "#555963" + price: 0 + - type: material id: CP14Nail stackEntity: CP14Nail1 diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_magma_caves.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_magma_caves.yml index 3fdfc4fe38..3dce558ba9 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_magma_caves.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_magma_caves.yml @@ -41,6 +41,10 @@ biomeTemplate: CP14CavesFloor tileMask: - CP14FloorGrass + - !type:BiomeDunGen + biomeTemplate: CP14MarbleCaves + tileMask: + - CP14FloorMarble - type: dungeonConfig id: CP14DemiplaneCavesRingFloorMaskStone @@ -102,9 +106,9 @@ - !type:NoiseDistanceDunGen size: 50, 50 distanceConfig: !type:DunGenEuclideanSquaredDistance - blendWeight: 0.6 + blendWeight: 0.8 layers: - - tile: Space + - tile: CP14FloorMarble threshold: 0.50 noise: frequency: 0.010 @@ -112,18 +116,4 @@ fractalType: FBm octaves: 5 lacunarity: 2 - gain: 0.5 - - !type:NoiseDistanceDunGen - size: 80, 50 - distanceConfig: !type:DunGenEuclideanSquaredDistance - blendWeight: 0.2 - layers: - - tile: Space - threshold: 0.50 - noise: - frequency: 0.08 - noiseType: OpenSimplex2 - fractalType: FBm - octaves: 5 - lacunarity: 2 gain: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/marble_cave.yml b/Resources/Prototypes/_CP14/Procedural/marble_cave.yml new file mode 100644 index 0000000000..09f0c9e097 --- /dev/null +++ b/Resources/Prototypes/_CP14/Procedural/marble_cave.yml @@ -0,0 +1,47 @@ +- type: biomeTemplate + id: CP14MarbleCaves + layers: + - !type:BiomeTileLayer + threshold: -1.0 + tile: CP14FloorMarbleCave + #Rocks + - !type:BiomeEntityLayer + threshold: 0.4 + noise: + seed: 1 + noiseType: OpenSimplex2 + fractalType: FBm + frequency: 2 + allowedTiles: + - CP14FloorMarbleCave + entities: + - CP14RockSmall + # Lakes + - !type:BiomeEntityLayer + threshold: -0.45 + invert: true + noise: + seed: 12 + noiseType: Perlin + fractalType: Ridged + octaves: 1 + frequency: 0.1 + gain: 0.5 + allowedTiles: + - CP14FloorMarbleCave + entities: + - CP14FloorLava + - !type:BiomeEntityLayer + threshold: -0.45 + invert: true + noise: + seed: 0 + noiseType: Perlin + fractalType: Ridged + octaves: 1 + frequency: 0.1 + gain: 0.5 + allowedTiles: + - CP14FloorMarbleCave + entities: + - CP14WallMarbleStone \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallMarble.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallMarble.yml new file mode 100644 index 0000000000..be85b28eb8 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallMarble.yml @@ -0,0 +1,16 @@ +- type: constructionGraph + id: CP14WallMarbleBrick + start: start + graph: + - node: start + edges: + - to: WallMarbleBrick + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: CP14MarbleStone + amount: 3 + doAfter: 2 + - node: WallMarbleBrick + entity: CP14WallMarbleBrick \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml b/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml index 254acbdaaf..0efaa2c6ed 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml @@ -72,7 +72,7 @@ - type: construction crystallPunkAllowed: true - name: stone wall + name: stonebrick wall description: Sturdy enough to cover you from threats or cold winds. id: CP14WallStonebrick graph: CP14WallStonebrick @@ -88,6 +88,24 @@ conditions: - !type:TileNotBlocked +- type: construction + crystallPunkAllowed: true + name: marble brick wall + description: Sturdy enough to cover you from threats or cold winds. + id: CP14WallMarbleBrick + graph: CP14WallMarbleBrick + startNode: start + targetNode: CP14WallMarbleBrick + category: construction-category-structures + icon: + sprite: _CP14/Structures/Walls/marblebricks_stone_wall.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + - type: construction crystallPunkAllowed: true name: iron grille diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/tile.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/tile.yml index ec21f927c4..a5b6dc8fef 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/tile.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/tile.yml @@ -15,11 +15,22 @@ craftTime: 1 requirements: - !type:StackResource - stack: CP14Stone + stack: CP14MarbleStone count: 1 result: CP14FloorTileMarbleBrick resultCount: 4 +- type: CP14Recipe + id: CP14FloorTileMarbleSmallbricks + tag: CP14RecipeWorkbench + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14MarbleStone + count: 1 + result: CP14FloorTileMarbleSmallbricks + resultCount: 4 + - type: CP14Recipe id: CP14FloorTileStonebricks tag: CP14RecipeWorkbench diff --git a/Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml index 55d98612a4..7e0d19b7e2 100644 --- a/Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml @@ -12,6 +12,13 @@ icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: marble } maxCount: 30 +- type: stack + id: CP14FloorTileMarbleSmallbricks + name: marble small brick + spawn: CP14FloorTileMarbleSmallbricks + icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: marble_smallbricks } + maxCount: 30 + - type: stack id: CP14FloorTileOakWoodplanks name: oak woodplanks diff --git a/Resources/Prototypes/_CP14/Stacks/materials.yml b/Resources/Prototypes/_CP14/Stacks/materials.yml index a6560a2398..0ed9e839bb 100644 --- a/Resources/Prototypes/_CP14/Stacks/materials.yml +++ b/Resources/Prototypes/_CP14/Stacks/materials.yml @@ -12,6 +12,13 @@ icon: { sprite: _CP14/Objects/Materials/stone_block.rsi, state: stone_2 } maxCount: 10 +- type: stack + id: CP14MarbleStone + name: cp14-stack-marble-block + spawn: CP14MarbleBlock1 + icon: { sprite: _CP14/Objects/Materials/marble_block.rsi, state: stone_2 } + maxCount: 10 + - type: stack id: CP14WoodenPlanks name: cp14-stack-wood-planks diff --git a/Resources/Prototypes/_CP14/Tiles/natural.yml b/Resources/Prototypes/_CP14/Tiles/natural.yml index 216b82d48c..dfc5fa5346 100644 --- a/Resources/Prototypes/_CP14/Tiles/natural.yml +++ b/Resources/Prototypes/_CP14/Tiles/natural.yml @@ -40,6 +40,37 @@ heatCapacity: 10000 weather: true +- type: tile + editorHidden: false + id: CP14FloorMarbleCave + name: cp14-tiles-marble-cave + sprite: /Textures/_CP14/Tiles/marble_cave.png + variants: 14 + placementVariants: + - 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 + baseTurf: CP14FloorBase + deconstructTools: [ CP14Digging ] + isSubfloor: true + itemDrop: CP14MarbleBlock1 + footstepSounds: + collection: FootstepAsteroid + heatCapacity: 10000 + weather: true + indestructible: true + - type: tile editorHidden: false id: CP14FloorSand diff --git a/Resources/Prototypes/_CP14/Tiles/produced.yml b/Resources/Prototypes/_CP14/Tiles/produced.yml index b0753b1840..e5ca26932e 100644 --- a/Resources/Prototypes/_CP14/Tiles/produced.yml +++ b/Resources/Prototypes/_CP14/Tiles/produced.yml @@ -205,6 +205,34 @@ deconstructTools: [ Prying ] itemDrop: CP14FloorTileMarbleBrick +- type: tile + editorHidden: false + id: CP14FloorMarbleSmallbricks + name: cp14-tiles-stonebricks-marble + sprite: /Textures/_CP14/Tiles/Marble/small_bricks.png + variants: 9 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + edgeSpritePriority: 102 + edgeSprites: + South: /Textures/_CP14/Tiles/Marble/double_edge_S.png + baseTurf: CP14FloorFoundation + isSubfloor: false + footstepSounds: + collection: FootstepAsteroid + heatCapacity: 10000 + weather: true + deconstructTools: [ Prying ] + itemDrop: CP14FloorTileMarbleSmallbricks + - type: tile editorHidden: false id: CP14FloorDirtSeedbed diff --git a/Resources/Textures/_CP14/Objects/Materials/marble_block.rsi/meta.json b/Resources/Textures/_CP14/Objects/Materials/marble_block.rsi/meta.json new file mode 100644 index 0000000000..8d40490c65 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Materials/marble_block.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github)", + "states": [ + { + "name": "stone" + }, + { + "name": "stone_2" + }, + { + "name": "stone_3" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Materials/marble_block.rsi/stone.png b/Resources/Textures/_CP14/Objects/Materials/marble_block.rsi/stone.png new file mode 100644 index 0000000000..bfa7e36ee7 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/marble_block.rsi/stone.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/marble_block.rsi/stone_2.png b/Resources/Textures/_CP14/Objects/Materials/marble_block.rsi/stone_2.png new file mode 100644 index 0000000000..f8d11fc240 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/marble_block.rsi/stone_2.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/marble_block.rsi/stone_3.png b/Resources/Textures/_CP14/Objects/Materials/marble_block.rsi/stone_3.png new file mode 100644 index 0000000000..6e07973f0c Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/marble_block.rsi/stone_3.png differ diff --git a/Resources/Textures/_CP14/Objects/Tile/tile.rsi/marble.png b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/marble.png index 6f45377cc5..d9cd8a1296 100644 Binary files a/Resources/Textures/_CP14/Objects/Tile/tile.rsi/marble.png and b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/marble.png differ diff --git a/Resources/Textures/_CP14/Objects/Tile/tile.rsi/marble_smallbricks.png b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/marble_smallbricks.png new file mode 100644 index 0000000000..9b46d3fb06 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/marble_smallbricks.png differ diff --git a/Resources/Textures/_CP14/Objects/Tile/tile.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/meta.json index 1fef4aff31..75c1f84aab 100644 --- a/Resources/Textures/_CP14/Objects/Tile/tile.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/meta.json @@ -13,6 +13,9 @@ { "name": "marble" }, + { + "name": "marble_smallbricks" + }, { "name": "oak_woodplanks" }, diff --git a/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/marble.png b/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/marble.png index 64722701de..efeb471f5b 100644 Binary files a/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/marble.png and b/Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/marble.png differ diff --git a/Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/marble.png b/Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/marble.png index ebde437231..c6832ea43b 100644 Binary files a/Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/marble.png and b/Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/marble.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/full.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/full.png new file mode 100644 index 0000000000..c75af24e5a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/meta.json new file mode 100644 index 0000000000..9329b33e43 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github) ", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "state0", + "directions": 4 + }, + { + "name": "state1", + "directions": 4 + }, + { + "name": "state2", + "directions": 4 + }, + { + "name": "state3", + "directions": 4 + }, + { + "name": "state4", + "directions": 4 + }, + { + "name": "state5", + "directions": 4 + }, + { + "name": "state6", + "directions": 4 + }, + { + "name": "state7", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state0.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state0.png new file mode 100644 index 0000000000..8fe3600c87 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state0.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state1.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state1.png new file mode 100644 index 0000000000..82d06031be Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state1.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state2.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state2.png new file mode 100644 index 0000000000..8fe3600c87 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state2.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state3.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state3.png new file mode 100644 index 0000000000..144b5ad037 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state3.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state4.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state4.png new file mode 100644 index 0000000000..3dc4bf94e5 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state4.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state5.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state5.png new file mode 100644 index 0000000000..bc4d535276 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state5.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state6.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state6.png new file mode 100644 index 0000000000..c749a279ca Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state6.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state7.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state7.png new file mode 100644 index 0000000000..62e6dc0b85 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state7.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/full.png new file mode 100644 index 0000000000..50630e7101 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/meta.json new file mode 100644 index 0000000000..d06eff8c18 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 64 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github) ", + "states": [ + { + "name": "wall0", + "directions": 4 + }, + { + "name": "wall1", + "directions": 4 + }, + { + "name": "wall2", + "directions": 4 + }, + { + "name": "wall3", + "directions": 4 + }, + { + "name": "wall4", + "directions": 4 + }, + { + "name": "wall5", + "directions": 4 + }, + { + "name": "wall6", + "directions": 4 + }, + { + "name": "wall7", + "directions": 4 + }, + { + "name": "full" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall0.png b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall0.png new file mode 100644 index 0000000000..d509e6abe1 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall1.png b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall1.png new file mode 100644 index 0000000000..ac4c1ea0d1 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall2.png b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall2.png new file mode 100644 index 0000000000..ccf2f8a54e Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall3.png b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall3.png new file mode 100644 index 0000000000..6889787fbb Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall4.png b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall4.png new file mode 100644 index 0000000000..9937cc7375 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall5.png b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall5.png new file mode 100644 index 0000000000..2a9eb7f8bf Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall6.png b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall6.png new file mode 100644 index 0000000000..df431b190b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall7.png b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall7.png new file mode 100644 index 0000000000..41325f8f16 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall7.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/full.png index ab2d71768a..f336c11704 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/full.png and b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/meta.json index d7dc0c6a95..9d72dff925 100644 --- a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All right reserved", - "copyright": "Created by jaraten (Discord/Github) ", + "copyright": "Created by jaraten (Discord/Github), recolored by TheShuEd", "size": { "x": 32, "y": 64 diff --git a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks0.png b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks0.png index f768d03ed3..bdcf0964eb 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks0.png and b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks1.png b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks1.png index 5adb38da7b..c84b5a55c2 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks1.png and b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks2.png b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks2.png index b72dc5192d..3117f5637e 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks2.png and b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks3.png b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks3.png index 9608d98074..60921f28b0 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks3.png and b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks4.png b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks4.png index 50b6d76f44..527b469e6e 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks4.png and b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks5.png b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks5.png index 1f10e4c648..67dd7ce6c2 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks5.png and b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks6.png b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks6.png index 70b76284c8..b53b2c28cf 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks6.png and b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/stonebricks6.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/full.png b/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/full.png index 93a9be48e5..c997759a21 100644 Binary files a/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/full.png and b/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window0.png b/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window0.png index 194e532929..8a51b7124d 100644 Binary files a/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window0.png and b/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window0.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window1.png b/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window1.png index 9b5cc6959a..af58e66197 100644 Binary files a/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window1.png and b/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window1.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window2.png b/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window2.png index 7ef8d6614a..2ba01dbfc3 100644 Binary files a/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window2.png and b/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window2.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window3.png b/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window3.png index 5f69ba8da4..962ef8c7d4 100644 Binary files a/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window3.png and b/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window3.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window4.png b/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window4.png index 8c0edd716c..0650806ffd 100644 Binary files a/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window4.png and b/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window4.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window5.png b/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window5.png index 96a1db98f7..3a3b4abc19 100644 Binary files a/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window5.png and b/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window5.png differ diff --git a/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window6.png b/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window6.png index b9b89b18a0..2cb125b87d 100644 Binary files a/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window6.png and b/Resources/Textures/_CP14/Structures/Windows/marble_bricks_window.rsi/window6.png differ diff --git a/Resources/Textures/_CP14/Tiles/Marble/attribution.yml b/Resources/Textures/_CP14/Tiles/Marble/attribution.yml index a7b8473a98..2f1f8864f0 100644 --- a/Resources/Textures/_CP14/Tiles/Marble/attribution.yml +++ b/Resources/Textures/_CP14/Tiles/Marble/attribution.yml @@ -1,6 +1,7 @@ - files: - marble.png - double_edge_S.png - license: "CLA" + - small_bricks + license: "All Right Reserved" copyright: "Created by TheShuEd" - source: "https://github.com/crystallpunk-14/crystall-punk-14/pull/502" + source: "https://github.com/crystallpunk-14/crystall-punk-14" diff --git a/Resources/Textures/_CP14/Tiles/Marble/double_edge_S.png b/Resources/Textures/_CP14/Tiles/Marble/double_edge_S.png index cc75155754..4437ac3637 100644 Binary files a/Resources/Textures/_CP14/Tiles/Marble/double_edge_S.png and b/Resources/Textures/_CP14/Tiles/Marble/double_edge_S.png differ diff --git a/Resources/Textures/_CP14/Tiles/Marble/marble.png b/Resources/Textures/_CP14/Tiles/Marble/marble.png index 59296ed811..9854ab9ef7 100644 Binary files a/Resources/Textures/_CP14/Tiles/Marble/marble.png and b/Resources/Textures/_CP14/Tiles/Marble/marble.png differ diff --git a/Resources/Textures/_CP14/Tiles/Marble/small_bricks.png b/Resources/Textures/_CP14/Tiles/Marble/small_bricks.png new file mode 100644 index 0000000000..023bc499a1 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Marble/small_bricks.png differ diff --git a/Resources/Textures/_CP14/Tiles/attributions.yml b/Resources/Textures/_CP14/Tiles/attributions.yml index 8898069bbe..7a557226a5 100644 --- a/Resources/Textures/_CP14/Tiles/attributions.yml +++ b/Resources/Textures/_CP14/Tiles/attributions.yml @@ -1,7 +1,7 @@ # Attempted to keep the files in alphabetical order so its easier to audit. # Finding individual authors is an unfeasible task. If you can reference the author please do so. -- files: ["cave.png", "foundation.png", "ice.png"] +- files: ["cave.png", "foundation.png", "ice.png", "marble_cave.png"] license: "CC-BY-SA-3.0" copyright: "Space Station 14, recolored by TheShuEd" source: "https://github.com/crystallpunk-14/crystall-punk-14/" diff --git a/Resources/Textures/_CP14/Tiles/marble_cave.png b/Resources/Textures/_CP14/Tiles/marble_cave.png new file mode 100644 index 0000000000..a032a5a494 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/marble_cave.png differ