diff --git a/Resources/Locale/en-US/_CP14/stack/materials.ftl b/Resources/Locale/en-US/_CP14/stack/materials.ftl index d43a821bd2..d7bc70bcf7 100644 --- a/Resources/Locale/en-US/_CP14/stack/materials.ftl +++ b/Resources/Locale/en-US/_CP14/stack/materials.ftl @@ -1,6 +1,5 @@ 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 ec5f29f15e..a0fc614de3 100644 --- a/Resources/Locale/en-US/_CP14/tiles/tiles.ftl +++ b/Resources/Locale/en-US/_CP14/tiles/tiles.ftl @@ -10,7 +10,6 @@ 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 @@ -62,7 +61,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 brick floor +cp14-tiles-stonebricks-marble = marble 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 6e1f9081d1..d56293fd43 100644 --- a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl @@ -1,6 +1,5 @@ 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 e3ef7e6390..c288d50f67 100644 --- a/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl +++ b/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl @@ -10,7 +10,6 @@ cp14-tiles-sand = песок cp14-tiles-snow = снег cp14-tiles-snow-deep = глубокий снег cp14-tiles-snow-deep-deep = очень глубокий снег -cp14-tiles-marble-cave = мраморный пол # Produced cp14-tiles-foundation = фундамент @@ -62,7 +61,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 a30a0b9f24..b44b1e368e 100644 --- a/Resources/Maps/_CP14/dev_map.yml +++ b/Resources/Maps/_CP14/dev_map.yml @@ -43,10 +43,9 @@ entities: data: {} - type: CP14CloudShadows - type: MapLight - ambientLightColor: "#DDDDDDFF" + - type: LightCycle - type: SunShadow - alpha: 0.8 - direction: 1, -1.5 + - type: SunShadowCycle - 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 35207d6505..4827f53662 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml @@ -137,18 +137,4 @@ color: green - state: frame - type: CP14BiomeSpawner - 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 + biome: CP14LeafMaze \ 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 deleted file mode 100644 index 9088da3ae2..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/rocks.yml +++ /dev/null @@ -1,124 +0,0 @@ -- 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 630016edf5..615e7870e2 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml @@ -1,3 +1,91 @@ +- 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 6a2bb0ddc5..b98d3c52c6 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/tiles.yml @@ -66,19 +66,6 @@ - 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 344486e8ac..158b9bd2bb 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml @@ -1,7 +1,8 @@ - type: entity parent: - BaseStructure - id: CP14TableBase + - CP14BaseFlammable + id: CP14WoodenTableBase categories: [ ForkFiltered ] abstract: true components: @@ -16,31 +17,6 @@ - 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 @@ -76,6 +52,8 @@ - type: FireVisuals sprite: _CP14/Effects/fire.rsi normalState: full + - type: Climbable + - type: PlaceableSurface - type: entity parent: CP14WoodenTableBase @@ -138,25 +116,4 @@ state: full - type: Construction graph: CP14TableWoodenCounter - 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 + node: CP14TableWoodenCounter \ 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 92c874d129..92963d4bef 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml @@ -38,39 +38,6 @@ - !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 764d73cd4f..00cd3c3192 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml @@ -71,25 +71,6 @@ 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: CP14WallMarbleBrick - type: CP14WallpaperHolder - type: entity diff --git a/Resources/Prototypes/_CP14/Materials/simple.yml b/Resources/Prototypes/_CP14/Materials/simple.yml index d973e54f8b..72d962f421 100644 --- a/Resources/Prototypes/_CP14/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Materials/simple.yml @@ -25,15 +25,6 @@ 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 3dce558ba9..3fdfc4fe38 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_magma_caves.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_magma_caves.yml @@ -41,10 +41,6 @@ biomeTemplate: CP14CavesFloor tileMask: - CP14FloorGrass - - !type:BiomeDunGen - biomeTemplate: CP14MarbleCaves - tileMask: - - CP14FloorMarble - type: dungeonConfig id: CP14DemiplaneCavesRingFloorMaskStone @@ -106,9 +102,9 @@ - !type:NoiseDistanceDunGen size: 50, 50 distanceConfig: !type:DunGenEuclideanSquaredDistance - blendWeight: 0.8 + blendWeight: 0.6 layers: - - tile: CP14FloorMarble + - tile: Space threshold: 0.50 noise: frequency: 0.010 @@ -116,4 +112,18 @@ 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 deleted file mode 100644 index 09f0c9e097..0000000000 --- a/Resources/Prototypes/_CP14/Procedural/marble_cave.yml +++ /dev/null @@ -1,47 +0,0 @@ -- 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/walls.yml b/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml index 0efaa2c6ed..254acbdaaf 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: stonebrick wall + name: stone wall description: Sturdy enough to cover you from threats or cold winds. id: CP14WallStonebrick graph: CP14WallStonebrick @@ -88,24 +88,6 @@ 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 a5b6dc8fef..ec21f927c4 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/tile.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/tile.yml @@ -15,22 +15,11 @@ craftTime: 1 requirements: - !type:StackResource - stack: CP14MarbleStone + stack: CP14Stone 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 7e0d19b7e2..55d98612a4 100644 --- a/Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml @@ -12,13 +12,6 @@ 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 0ed9e839bb..a6560a2398 100644 --- a/Resources/Prototypes/_CP14/Stacks/materials.yml +++ b/Resources/Prototypes/_CP14/Stacks/materials.yml @@ -12,13 +12,6 @@ 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 dfc5fa5346..216b82d48c 100644 --- a/Resources/Prototypes/_CP14/Tiles/natural.yml +++ b/Resources/Prototypes/_CP14/Tiles/natural.yml @@ -40,37 +40,6 @@ 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 e5ca26932e..b0753b1840 100644 --- a/Resources/Prototypes/_CP14/Tiles/produced.yml +++ b/Resources/Prototypes/_CP14/Tiles/produced.yml @@ -205,34 +205,6 @@ 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 deleted file mode 100644 index 8d40490c65..0000000000 --- a/Resources/Textures/_CP14/Objects/Materials/marble_block.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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 deleted file mode 100644 index bfa7e36ee7..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Materials/marble_block.rsi/stone.png and /dev/null 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 deleted file mode 100644 index f8d11fc240..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Materials/marble_block.rsi/stone_2.png and /dev/null 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 deleted file mode 100644 index 6e07973f0c..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Materials/marble_block.rsi/stone_3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Tile/tile.rsi/marble.png b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/marble.png index d9cd8a1296..6f45377cc5 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 deleted file mode 100644 index 9b46d3fb06..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Tile/tile.rsi/marble_smallbricks.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Tile/tile.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/meta.json index 75c1f84aab..1fef4aff31 100644 --- a/Resources/Textures/_CP14/Objects/Tile/tile.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Tile/tile.rsi/meta.json @@ -13,9 +13,6 @@ { "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 efeb471f5b..64722701de 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 c6832ea43b..ebde437231 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 deleted file mode 100644 index c75af24e5a..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/full.png and /dev/null 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 deleted file mode 100644 index 9329b33e43..0000000000 --- a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/meta.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "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 deleted file mode 100644 index 8fe3600c87..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state0.png and /dev/null 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 deleted file mode 100644 index 82d06031be..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state1.png and /dev/null 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 deleted file mode 100644 index 8fe3600c87..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state2.png and /dev/null 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 deleted file mode 100644 index 144b5ad037..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state3.png and /dev/null 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 deleted file mode 100644 index 3dc4bf94e5..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state4.png and /dev/null 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 deleted file mode 100644 index bc4d535276..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state5.png and /dev/null 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 deleted file mode 100644 index c749a279ca..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state6.png and /dev/null 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 deleted file mode 100644 index 62e6dc0b85..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Furniture/Tables/marble.rsi/state7.png and /dev/null 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 deleted file mode 100644 index 50630e7101..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/full.png and /dev/null 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 deleted file mode 100644 index d06eff8c18..0000000000 --- a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/meta.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "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 deleted file mode 100644 index d509e6abe1..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall0.png and /dev/null 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 deleted file mode 100644 index ac4c1ea0d1..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall1.png and /dev/null 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 deleted file mode 100644 index ccf2f8a54e..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall2.png and /dev/null 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 deleted file mode 100644 index 6889787fbb..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall3.png and /dev/null 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 deleted file mode 100644 index 9937cc7375..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall4.png and /dev/null 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 deleted file mode 100644 index 2a9eb7f8bf..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall5.png and /dev/null 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 deleted file mode 100644 index df431b190b..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall6.png and /dev/null 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 deleted file mode 100644 index 41325f8f16..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/Natural/marble_stone.rsi/wall7.png and /dev/null 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 f336c11704..ab2d71768a 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 9d72dff925..d7dc0c6a95 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), recolored by TheShuEd", + "copyright": "Created by jaraten (Discord/Github) ", "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 bdcf0964eb..f768d03ed3 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 c84b5a55c2..5adb38da7b 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 3117f5637e..b72dc5192d 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 60921f28b0..9608d98074 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 527b469e6e..50b6d76f44 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 67dd7ce6c2..1f10e4c648 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 b53b2c28cf..70b76284c8 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 c997759a21..93a9be48e5 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 8a51b7124d..194e532929 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 af58e66197..9b5cc6959a 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 2ba01dbfc3..7ef8d6614a 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 962ef8c7d4..5f69ba8da4 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 0650806ffd..8c0edd716c 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 3a3b4abc19..96a1db98f7 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 2cb125b87d..b9b89b18a0 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 2f1f8864f0..a7b8473a98 100644 --- a/Resources/Textures/_CP14/Tiles/Marble/attribution.yml +++ b/Resources/Textures/_CP14/Tiles/Marble/attribution.yml @@ -1,7 +1,6 @@ - files: - marble.png - double_edge_S.png - - small_bricks - license: "All Right Reserved" + license: "CLA" copyright: "Created by TheShuEd" - source: "https://github.com/crystallpunk-14/crystall-punk-14" + source: "https://github.com/crystallpunk-14/crystall-punk-14/pull/502" diff --git a/Resources/Textures/_CP14/Tiles/Marble/double_edge_S.png b/Resources/Textures/_CP14/Tiles/Marble/double_edge_S.png index 4437ac3637..cc75155754 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 9854ab9ef7..59296ed811 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 deleted file mode 100644 index 023bc499a1..0000000000 Binary files a/Resources/Textures/_CP14/Tiles/Marble/small_bricks.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Tiles/attributions.yml b/Resources/Textures/_CP14/Tiles/attributions.yml index 7a557226a5..8898069bbe 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", "marble_cave.png"] +- files: ["cave.png", "foundation.png", "ice.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 deleted file mode 100644 index a032a5a494..0000000000 Binary files a/Resources/Textures/_CP14/Tiles/marble_cave.png and /dev/null differ