diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index 87005cec5f..96db8fde57 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -77,8 +77,11 @@ tiles-jungle-grass-floor = jungle grass floor tiles-dark-grass-floor = dark grass floor tiles-light-grass-floor = light grass floor tiles-dirt-floor = dirt floor -tiles-asteroid-floor = asteroid floor +tiles-asteroid-sand = asteroid sand +tiles-asteroid-sand-rocks = asteroid rocks +tiles-asteroid-sand-pebbles = asteroid pebbles 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 diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index fec7c193a6..f57faa772f 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1000,10 +1000,55 @@ 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-floor - sprite: /Textures/Tiles/Asteroid/asteroid_sand.png + name: tiles-asteroid-sand + sprite: /Textures/Tiles/Asteroid/asteroid.png + baseTurf: Space + isSubfloor: true + canCrowbar: false + footstepSounds: + collection: FootstepAsteroid + heatCapacity: 10000 + 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 ] + baseTurf: Space + isSubfloor: true + canCrowbar: false + footstepSounds: + collection: FootstepAsteroid + heatCapacity: 10000 + 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 ] baseTurf: Space isSubfloor: true canCrowbar: false diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml index 9506c45e55..5c11c7f171 100644 --- a/Resources/Prototypes/Tiles/plating.yml +++ b/Resources/Prototypes/Tiles/plating.yml @@ -10,6 +10,18 @@ friction: 0.3 heatCapacity: 10000 +- type: tile + id: PlatingAsteroid + name: tiles-asteroid-plating + sprite: /Textures/Tiles/Asteroid/asteroid_plating.png + baseTurf: Lattice + isSubfloor: true + canAxe: true + footstepSounds: + collection: FootstepPlating + friction: 0.3 + heatCapacity: 10000 + - type: tile id: Lattice name: tiles-lattice diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/bar.png b/Resources/Textures/Objects/Tiles/tile.rsi/bar.png index 132676f315..08d5e64492 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/bar.png and b/Resources/Textures/Objects/Tiles/tile.rsi/bar.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/blue.png b/Resources/Textures/Objects/Tiles/tile.rsi/blue.png index 97fdf79917..f3be1b6936 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/blue.png and b/Resources/Textures/Objects/Tiles/tile.rsi/blue.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/checker-dark.png b/Resources/Textures/Objects/Tiles/tile.rsi/checker-dark.png index 5a26573cf5..874c43744b 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/checker-dark.png and b/Resources/Textures/Objects/Tiles/tile.rsi/checker-dark.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/checker-light.png b/Resources/Textures/Objects/Tiles/tile.rsi/checker-light.png index 4377bd29a5..28de30553a 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/checker-light.png and b/Resources/Textures/Objects/Tiles/tile.rsi/checker-light.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/clown.png b/Resources/Textures/Objects/Tiles/tile.rsi/clown.png index 49c2c43ae8..6086d9847c 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/clown.png and b/Resources/Textures/Objects/Tiles/tile.rsi/clown.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-inhand-left.png index f13dac630c..5537d4ab83 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/dark-inhand-left.png and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-inhand-right.png index aab893421c..0036d2628a 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/dark-inhand-right.png and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark.png index e277ec85a5..cd05817621 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/dark.png and b/Resources/Textures/Objects/Tiles/tile.rsi/dark.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dirty-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/dirty-inhand-left.png index dce587625e..03a6af71ee 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/dirty-inhand-left.png and b/Resources/Textures/Objects/Tiles/tile.rsi/dirty-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dirty-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/dirty-inhand-right.png index 85d5d99e08..a8f566ef9b 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/dirty-inhand-right.png and b/Resources/Textures/Objects/Tiles/tile.rsi/dirty-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dirty.png b/Resources/Textures/Objects/Tiles/tile.rsi/dirty.png index bfcacab190..462d7c9b1a 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/dirty.png and b/Resources/Textures/Objects/Tiles/tile.rsi/dirty.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/hydro.png b/Resources/Textures/Objects/Tiles/tile.rsi/hydro.png index b0c6d70751..ce925dd8e0 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/hydro.png and b/Resources/Textures/Objects/Tiles/tile.rsi/hydro.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/kitchen.png b/Resources/Textures/Objects/Tiles/tile.rsi/kitchen.png index aefc9e6e34..0145faee28 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/kitchen.png and b/Resources/Textures/Objects/Tiles/tile.rsi/kitchen.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/laundry.png b/Resources/Textures/Objects/Tiles/tile.rsi/laundry.png index e41b2c2440..8664e177fe 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/laundry.png and b/Resources/Textures/Objects/Tiles/tile.rsi/laundry.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/mime.png b/Resources/Textures/Objects/Tiles/tile.rsi/mime.png index 4bdbc553e1..28194ec574 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/mime.png and b/Resources/Textures/Objects/Tiles/tile.rsi/mime.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/showroom.png b/Resources/Textures/Objects/Tiles/tile.rsi/showroom.png index ef1747c427..2f9e90e230 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/showroom.png and b/Resources/Textures/Objects/Tiles/tile.rsi/showroom.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-inhand-left.png index 0b245f52de..63a4c1426a 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/steel-inhand-left.png and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel-inhand-right.png index a7ca30bd3c..3c45615bb9 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/steel-inhand-right.png and b/Resources/Textures/Objects/Tiles/tile.rsi/steel-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel.png index 349fe828a7..5ea3049f87 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/steel.png and b/Resources/Textures/Objects/Tiles/tile.rsi/steel.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-inhand-left.png index 124182672f..0a7220ee44 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/white-inhand-left.png and b/Resources/Textures/Objects/Tiles/tile.rsi/white-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-inhand-right.png index da055fd3be..a9f821fe66 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/white-inhand-right.png and b/Resources/Textures/Objects/Tiles/tile.rsi/white-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white.png b/Resources/Textures/Objects/Tiles/tile.rsi/white.png index dde26807d0..28459f0cb7 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/white.png and b/Resources/Textures/Objects/Tiles/tile.rsi/white.png differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid_pebbles.png b/Resources/Textures/Tiles/Asteroid/asteroid_pebbles.png new file mode 100644 index 0000000000..9ec17e8bac Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/asteroid_pebbles.png differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid_plating.png b/Resources/Textures/Tiles/Asteroid/asteroid_plating.png new file mode 100644 index 0000000000..599700452a Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/asteroid_plating.png differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid_rocks.png b/Resources/Textures/Tiles/Asteroid/asteroid_rocks.png new file mode 100644 index 0000000000..b2309e17b4 Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/asteroid_rocks.png differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid_rocks_red.png b/Resources/Textures/Tiles/Asteroid/asteroid_rocks_red.png new file mode 100644 index 0000000000..9e4deb1170 Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/asteroid_rocks_red.png differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid_sand.png b/Resources/Textures/Tiles/Asteroid/asteroid_sand.png deleted file mode 100644 index efa1480d21..0000000000 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid_sand.png and /dev/null differ diff --git a/Resources/Textures/Tiles/Asteroid/asteroid_tile.png b/Resources/Textures/Tiles/Asteroid/asteroid_tile.png index a8666de5f7..5b61bea581 100644 Binary files a/Resources/Textures/Tiles/Asteroid/asteroid_tile.png and b/Resources/Textures/Tiles/Asteroid/asteroid_tile.png differ diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml index e6fbd44bec..94cb724afd 100644 --- a/Resources/Textures/Tiles/attributions.yml +++ b/Resources/Textures/Tiles/attributions.yml @@ -6,10 +6,15 @@ copyright: "CEV-Eris commit 28e589f0ff72a009adf17db767e90be39054f0f2" source: "https://github.com/discordia-space/CEV-Eris/" -- files: [ "asteroid_sand.png", "asteroid_tile.png", "elevator_shaft.png", "freezer.png", "green_circuit.png", "lino.png", "mono.png", "rock_vault.png", "showroom.png"] +- 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"] license: "CC-BY-SA-3.0" - copyright: "vgstation13 at roughly commit e4d3ea7f69d21c3667be12b114fa935c4640cb05, asteroid.png renamed to asteroid_sand.png, asteroidfloor.png renamed to asteroid_tile.png" + copyright: "vgstation13 at roughly commit e4d3ea7f69d21c3667be12b114fa935c4640cb05, asteroid_rocks_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"] + 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." + 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"] license: "CC-BY-SA-3.0" @@ -20,6 +25,11 @@ license: "CC-BY-SA-3.0" copyright: "Modified from reinforced.png by github user @Flareguy" source: "https://github.com/space-wizards/space-station-14/pull/18676" + +- files: ["asteroid_plating"] + license: "CC-BY-SA-3.0" + copyright: "Modified from plating.png by github user @Flareguy" + source: "https://github.com/space-wizards/space-station-14/" - files: ["rglass.png"] license: "CC-BY-SA-3.0"