diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index 973033ce02..0536fa3927 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -71,6 +71,7 @@ tiles-reinforced-glass-floor = reinforced glass floor tiles-green-circuit-floor = green circuit floor tiles-blue-circuit-floor = blue circuit floor tiles-snow = snow +tiles-snow-plating = snowed plating tiles-grass-floor = grass floor tiles-planet-grass-floor = grass floor tiles-jungle-grass-floor = jungle grass floor @@ -78,15 +79,10 @@ tiles-dark-grass-floor = dark grass floor tiles-light-grass-floor = light grass floor tiles-dirt-floor = dirt floor tiles-asteroid-sand = asteroid sand -tiles-asteroid-sand-rocks = asteroid rocks -tiles-asteroid-sand-pebbles = asteroid pebbles +tiles-asteroid-sand-dug = dug asteroid sand tiles-asteroid-tile = asteroid tile tiles-asteroid-plating = asteroid plating -tiles-asteroid-coarse-sand = asteroid coarse sand -tiles-asteroid-dug-coarse-sand = asteroid dug coarse sand tiles-asteroid-ironsand = asteroid ironsand -tiles-asteroid-ironsand-pebbles = asteroid ironsand pebbles -tiles-asteroid-ironsand-rock = asteroid ironsand rock tiles-cave = cave tiles-cave-drought = cave drought tiles-flesh-floor = flesh floor diff --git a/Resources/Prototypes/Entities/World/Debris/asteroids.yml b/Resources/Prototypes/Entities/World/Debris/asteroids.yml index f1d6f029ba..f662953edb 100644 --- a/Resources/Prototypes/Entities/World/Debris/asteroids.yml +++ b/Resources/Prototypes/Entities/World/Debris/asteroids.yml @@ -7,13 +7,13 @@ - type: MapGrid - type: BlobFloorPlanBuilder floorTileset: - - FloorAsteroidCoarseSand0 + - FloorAsteroidSand blobDrawProb: 0.5 radius: 6 floorPlacements: 16 - type: SimpleFloorPlanPopulator entries: - FloorAsteroidCoarseSand0: + FloorAsteroidSand: - id: WallRock prob: 0.5 orGroup: rock diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 6efef85de8..84116aa4cb 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1146,13 +1146,26 @@ weather: true # Asteroid -# TODO: Change the rock & pebbles into regular variants with a 20% chance to spawn (like SS13.) Give ironsand variants from /vg/station. -# TODO: Probably remove asteroid coarse sand if it isn't resprited by the time tile migrations exist. It was likely made to co-exist with the CEV-Eris style rocks and doesn't look too good nowadays. - type: tile id: FloorAsteroidSand name: tiles-asteroid-sand sprite: /Textures/Tiles/Asteroid/asteroid.png + variants: 13 + placementVariants: + - 0.8 + - 0.0166 #Should be roughly 20%.... I think??? I don't know dude, I'm just a YAML monkey. + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0116 + - 0.0116 baseTurf: Space isSubfloor: true canCrowbar: false @@ -1162,11 +1175,9 @@ weather: true - type: tile - id: FloorAsteroidSandRocks - name: tiles-asteroid-sand-rocks - sprite: /Textures/Tiles/Asteroid/asteroid_rocks.png - variants: 8 - placementVariants: [ 0, 1, 2, 3, 4, 5, 6, 7 ] + id: FloorAsteroidSandDug + name: tiles-asteroid-sand + sprite: /Textures/Tiles/Asteroid/asteroid_dug.png baseTurf: Space isSubfloor: true canCrowbar: false @@ -1176,25 +1187,24 @@ weather: true - type: tile - id: FloorAsteroidSandRocksRed - name: tiles-asteroid-sand-rocks - sprite: /Textures/Tiles/Asteroid/asteroid_rocks_red.png - variants: 8 - placementVariants: [ 0, 1, 2, 3, 4, 5, 6, 7 ] - baseTurf: Space - isSubfloor: true - canCrowbar: false - footstepSounds: - collection: FootstepAsteroid - heatCapacity: 10000 - weather: true - -- type: tile - id: FloorAsteroidSandPebbles - name: tiles-asteroid-sand-pebbles - sprite: /Textures/Tiles/Asteroid/asteroid_pebbles.png - variants: 4 - placementVariants: [ 0, 1, 2, 3 ] + id: FloorAsteroidSandRed + name: tiles-asteroid-sand + sprite: /Textures/Tiles/Asteroid/asteroid_red.png + variants: 13 + placementVariants: + - 0.8 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0116 + - 0.0116 baseTurf: Space isSubfloor: true canCrowbar: false @@ -1216,38 +1226,26 @@ weather: true - type: tile - id: FloorAsteroidCoarseSand0 - name: tiles-asteroid-coarse-sand - sprite: /Textures/Tiles/Asteroid/asteroid_coarse_sand.png - variants: 3 + id: FloorAsteroidIronsand + name: tiles-asteroid-ironsand + sprite: /Textures/Tiles/Asteroid/ironsand.png + variants: 15 placementVariants: - 1.0 - 1.0 - 1.0 - baseTurf: Space - isSubfloor: true - canCrowbar: false - footstepSounds: - collection: FootstepAsteroid - heatCapacity: 10000 - weather: true - -- type: tileAlias - id: FloorBasaslt - target: FloorBasalt - -- type: tileAlias - id: FloorAsteroidCoarseSand1 - target: FloorAsteroidCoarseSand0 - -- type: tileAlias - id: FloorAsteroidCoarseSand2 - target: FloorAsteroidCoarseSand0 - -- type: tile - id: FloorAsteroidCoarseSandDug - name: tiles-asteroid-dug-coarse-sand - sprite: /Textures/Tiles/Asteroid/asteroid_coarse_sand_dug.png + - 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: Space isSubfloor: true canCrowbar: false @@ -1257,45 +1255,21 @@ weather: true - type: tile - id: FloorAsteroidIronsand1 + id: FloorAsteroidSandUnvariantized + name: tiles-asteroid-sand + sprite: /Textures/Tiles/Asteroid/asteroid0.png + baseTurf: Space + isSubfloor: true + canCrowbar: false + footstepSounds: + collection: FootstepAsteroid + heatCapacity: 10000 + weather: true + +- type: tile + id: FloorAsteroidIronsandUnvariantized name: tiles-asteroid-ironsand - sprite: /Textures/Tiles/ironsand1.png - baseTurf: Space - isSubfloor: true - canCrowbar: false - footstepSounds: - collection: FootstepAsteroid - heatCapacity: 10000 - weather: true - -- type: tile - id: FloorAsteroidIronsand2 - name: tiles-asteroid-ironsand-pebbles - sprite: /Textures/Tiles/ironsand2.png - baseTurf: Space - isSubfloor: true - canCrowbar: false - footstepSounds: - collection: FootstepAsteroid - heatCapacity: 10000 - weather: true - -- type: tile - id: FloorAsteroidIronsand3 - name: tiles-asteroid-ironsand-pebbles - sprite: /Textures/Tiles/ironsand3.png - baseTurf: Space - isSubfloor: true - canCrowbar: false - footstepSounds: - collection: FootstepAsteroid - heatCapacity: 10000 - weather: true - -- type: tile - id: FloorAsteroidIronsand4 - name: tiles-asteroid-ironsand-rock - sprite: /Textures/Tiles/ironsand4.png + sprite: /Textures/Tiles/Asteroid/ironsand0.png baseTurf: Space isSubfloor: true canCrowbar: false @@ -1473,7 +1447,7 @@ baseTurf: Plating isSubfloor: false canCrowbar: false - canAxe: false #You can't RCD these in SS13 apparently, so this is probably the next best thing + canAxe: false footstepSounds: collection: FootstepHull itemDrop: FloorTileItemSteel diff --git a/Resources/Prototypes/Tiles/planet.yml b/Resources/Prototypes/Tiles/planet.yml index e0738a779a..377ada678a 100644 --- a/Resources/Prototypes/Tiles/planet.yml +++ b/Resources/Prototypes/Tiles/planet.yml @@ -101,19 +101,19 @@ sprite: /Textures/Tiles/Planet/Snow/snow.png variants: 13 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 + - 0.8 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0166 + - 0.0116 + - 0.0116 #cornerSprites: # - /Textures/Tiles/Planet/Snow/single_edge.png #cardinalSprites: diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml index 5c11c7f171..ee15c11157 100644 --- a/Resources/Prototypes/Tiles/plating.yml +++ b/Resources/Prototypes/Tiles/plating.yml @@ -22,6 +22,18 @@ friction: 0.3 heatCapacity: 10000 +- type: tile + id: PlatingSnow + name: tiles-snow-plating + sprite: /Textures/Tiles/snow_plating.png #Not in the snow planet RSI because it doesn't have any metadata. Should probably be moved to its own folder later. + baseTurf: Lattice + isSubfloor: true + canAxe: true + footstepSounds: + collection: FootstepPlating + friction: 0.15 #a little less then actual snow + heatCapacity: 10000 + - type: tile id: Lattice name: tiles-lattice diff --git a/Resources/Prototypes/Tiles/tile_migrations.yml b/Resources/Prototypes/Tiles/tile_migrations.yml new file mode 100644 index 0000000000..ccbb933a47 --- /dev/null +++ b/Resources/Prototypes/Tiles/tile_migrations.yml @@ -0,0 +1,50 @@ +- type: tileAlias + id: FloorBasaslt + target: FloorBasalt + +- type: tileAlias + id: FloorAsteroidCoarseSand1 + target: FloorAsteroidCoarseSand0 + +- type: tileAlias + id: FloorAsteroidCoarseSand2 + target: FloorAsteroidCoarseSand0 + +# 2023-08-21 +# Asteroid coarse sand has been nuked since it was made to fit in with the old CEV-Eris style rocks. This tile alias is inevitably not enough to fix every instance of it appearing since the tile is so common, but it's the only reasonable way forward since it's not the default anymore. + +- type: tileAlias + id: FloorAsteroidSandRocks + target: FloorAsteroidSand + +- type: tileAlias + id: FloorAsteroidSandRocksRed + target: FloorAsteroidSandRed + +- type: tileAlias + id: FloorAsteroidSandPebbles + target: FloorAsteroidSand + +- type: tileAlias + id: FloorAsteroidIronsand1 + target: FloorAsteroidIronsand + +- type: tileAlias + id: FloorAsteroidIronsand2 + target: FloorAsteroidIronsand + +- type: tileAlias + id: FloorAsteroidIronsand3 + target: FloorAsteroidIronsand + +- type: tileAlias + id: FloorAsteroidIronsand4 + target: FloorAsteroidIronsand + +- type: tileAlias + id: FloorAsteroidCoarseSand0 + target: FloorAsteroidSand + +- type: tileAlias + id: FloorAsteroidCoarseSandDug + target: FloorAsteroidSandDug \ No newline at end of file diff --git a/Resources/Textures/Tiles/Asteroid/asteroid.png b/Resources/Textures/Tiles/Asteroid/asteroid.png index 97d9fcc5dc..304d2be367 100644 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid.png and b/Resources/Textures/Tiles/Asteroid/asteroid.png differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid1.png b/Resources/Textures/Tiles/Asteroid/asteroid1.png deleted file mode 100644 index 6ceabebbb7..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid1.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid10.png b/Resources/Textures/Tiles/Asteroid/asteroid10.png deleted file mode 100644 index 9d33861088..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid10.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid11.png b/Resources/Textures/Tiles/Asteroid/asteroid11.png deleted file mode 100644 index fade0c06c9..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid11.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid12.png b/Resources/Textures/Tiles/Asteroid/asteroid12.png deleted file mode 100644 index b0eabae9c2..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid12.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid2.png b/Resources/Textures/Tiles/Asteroid/asteroid2.png deleted file mode 100644 index 73bae67f66..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid2.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid3.png b/Resources/Textures/Tiles/Asteroid/asteroid3.png deleted file mode 100644 index def3348d0b..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid3.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid4.png b/Resources/Textures/Tiles/Asteroid/asteroid4.png deleted file mode 100644 index c78c7646d5..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid4.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid5.png b/Resources/Textures/Tiles/Asteroid/asteroid5.png deleted file mode 100644 index 2ceebd64f6..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid5.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid6.png b/Resources/Textures/Tiles/Asteroid/asteroid6.png deleted file mode 100644 index 1a2e35e98c..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid6.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid7.png b/Resources/Textures/Tiles/Asteroid/asteroid7.png deleted file mode 100644 index 1b1a5913e8..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid7.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid8.png b/Resources/Textures/Tiles/Asteroid/asteroid8.png deleted file mode 100644 index 45a15ba0fb..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid8.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid9.png b/Resources/Textures/Tiles/Asteroid/asteroid9.png deleted file mode 100644 index c79d007626..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid9.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand.png b/Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand.png deleted file mode 100644 index 4e9a96e2c2..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand_dug.png b/Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand_dug.png deleted file mode 100644 index af24089603..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid_coarse_sand_dug.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid_pebbles.png b/Resources/Textures/Tiles/Asteroid/asteroid_pebbles.png deleted file mode 100644 index 9ec17e8bac..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid_pebbles.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid_red.png b/Resources/Textures/Tiles/Asteroid/asteroid_red.png new file mode 100644 index 0000000000..8b32e28220 Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/asteroid_red.png differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid_rocks.png b/Resources/Textures/Tiles/Asteroid/asteroid_rocks.png deleted file mode 100644 index b2309e17b4..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid_rocks.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid_rocks_red.png b/Resources/Textures/Tiles/Asteroid/asteroid_rocks_red.png deleted file mode 100644 index 9e4deb1170..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid_rocks_red.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/ironsand.png b/Resources/Textures/Tiles/Asteroid/ironsand.png new file mode 100644 index 0000000000..485cbd09ba Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/ironsand.png differ diff --git a/Resources/Textures/Tiles/ironsand1.png b/Resources/Textures/Tiles/Asteroid/ironsand0.png similarity index 100% rename from Resources/Textures/Tiles/ironsand1.png rename to Resources/Textures/Tiles/Asteroid/ironsand0.png diff --git a/Resources/Textures/Tiles/Planet/Snow/meta.json b/Resources/Textures/Tiles/Planet/Snow/meta.json index 85b770fa38..7280e2ce99 100644 --- a/Resources/Textures/Tiles/Planet/Snow/meta.json +++ b/Resources/Textures/Tiles/Planet/Snow/meta.json @@ -79,15 +79,12 @@ { "name": "snow12" }, - { - "name": "snowplating" - }, { "name": "permafrost" }, { "name": "edge0", - "directions": 4 + "directions": 4 }, { "name": "edge1", diff --git a/Resources/Textures/Tiles/Planet/Snow/snowplating.png b/Resources/Textures/Tiles/Planet/Snow/snowplating.png deleted file mode 100644 index 0dc0e48fed..0000000000 Binary files a/Resources/Textures/Tiles/Planet/Snow/snowplating.png and /dev/null differ diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml index 94cb724afd..641100fe42 100644 --- a/Resources/Textures/Tiles/attributions.yml +++ b/Resources/Textures/Tiles/attributions.yml @@ -6,14 +6,14 @@ copyright: "CEV-Eris commit 28e589f0ff72a009adf17db767e90be39054f0f2" source: "https://github.com/discordia-space/CEV-Eris/" -- files: [ "asteroid_rocks_red.png", "asteroid_tile.png", "elevator_shaft.png", "freezer.png", "green_circuit.png", "lino.png", "mono.png", "rock_vault.png", "showroom.png"] +- files: [ "asteroid_red.png", "asteroid_tile.png", "elevator_shaft.png", "freezer.png", "green_circuit.png", "lino.png", "mono.png", "rock_vault.png", "showroom.png"] license: "CC-BY-SA-3.0" - copyright: "vgstation13 at roughly commit e4d3ea7f69d21c3667be12b114fa935c4640cb05, asteroid_rocks_red and asteroid_tile taken from commit /vg/station at commit 02b9f6894af4419c9f7e699a22c402b086d8067e." + copyright: "vgstation13 at roughly commit e4d3ea7f69d21c3667be12b114fa935c4640cb05, asteroid_red and asteroid_tile taken from commit /vg/station at commit 02b9f6894af4419c9f7e699a22c402b086d8067e." source: "https://github.com/vgstation-coders/vgstation13" -- files: [ "asteroid.png", "asteroid0.png", "asteroid1.png", "asteroid2.png", "asteroid3.png", "asteroid4.png", "asteroid5.png", "asteroid6.png", "asteroid7.png", "asteroid8.png", "asteroid9.png", "asteroid10.png", "asteroid_rocks.png", "asteroid_pebbles.png"] +- files: [ "asteroid.png", "asteroid_dug.png", "asteroid0.png"] license: "CC-BY-SA-3.0" - copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae, asteroid_rocks and asteroid_pebbles modified from asteroid tiles 0-10." + copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae." source: "https://github.com/tgstation/tgstation/" - files: ["blue_circuit.png", "cropped_parallax.png", "eighties.png", "gold.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "plating.png", "reinforced.png", "silver.png", "snow.png", "wood.png"] @@ -26,7 +26,7 @@ copyright: "Modified from reinforced.png by github user @Flareguy" source: "https://github.com/space-wizards/space-station-14/pull/18676" -- files: ["asteroid_plating"] +- files: ["asteroid_plating.png, snow_plating.png"] license: "CC-BY-SA-3.0" copyright: "Modified from plating.png by github user @Flareguy" source: "https://github.com/space-wizards/space-station-14/" diff --git a/Resources/Textures/Tiles/ironsand2.png b/Resources/Textures/Tiles/ironsand2.png deleted file mode 100644 index bf0631ed13..0000000000 Binary files a/Resources/Textures/Tiles/ironsand2.png and /dev/null differ diff --git a/Resources/Textures/Tiles/ironsand3.png b/Resources/Textures/Tiles/ironsand3.png deleted file mode 100644 index f00107a225..0000000000 Binary files a/Resources/Textures/Tiles/ironsand3.png and /dev/null differ diff --git a/Resources/Textures/Tiles/ironsand4.png b/Resources/Textures/Tiles/ironsand4.png deleted file mode 100644 index ec4f169aca..0000000000 Binary files a/Resources/Textures/Tiles/ironsand4.png and /dev/null differ diff --git a/Resources/Textures/Tiles/snow_plating.png b/Resources/Textures/Tiles/snow_plating.png new file mode 100644 index 0000000000..09c8af0181 Binary files /dev/null and b/Resources/Textures/Tiles/snow_plating.png differ