diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 1592b4efdd..170b200188 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -853,6 +853,8 @@ id: FloorGlass name: tiles-glass-floor sprite: /Textures/Tiles/glass.png + variants: 4 + placementVariants: [0, 1, 2, 3] baseTurf: Plating isSubfloor: false canCrowbar: true @@ -865,6 +867,8 @@ id: FloorRGlass name: tiles-reinforced-glass-floor sprite: /Textures/Tiles/rglass.png + variants: 4 + placementVariants: [0, 1, 2, 3] baseTurf: Plating isSubfloor: false canCrowbar: true diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml index 1ff0882277..13b1b1c43c 100644 --- a/Resources/Textures/Tiles/attributions.yml +++ b/Resources/Textures/Tiles/attributions.yml @@ -11,10 +11,20 @@ copyright: "vgstation13 at roughly commit e4d3ea7f69d21c3667be12b114fa935c4640cb05, asteroid.png renamed to asteroid_sand.png, asteroidfloor.png renamed to asteroid_tile.png" source: "https://github.com/vgstation-coders/vgstation13" -- files: ["blue_circuit.png", "cropped_parallax.png", "glass.png", "eighties.png", "gold.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "plating.png", "rglass.png", "reinforced.png", "silver.png", "snow.png", "wood.png"] +- 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" copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, cropped_parallax modified from parallax." source: "https://github.com/tgstation/tgstation/" + +- files: ["rglass.png"] + license: "CC-BY-SA-3.0" + copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, rglass modified by github user @notquitehadouken." + source: "https://github.com/space-wizards/space-station-14/pull/17948" + +- files: ["glass.png"] + license: "CC0-1.0" + copyright: "Created by github user @notquitehadouken." + source: "https://github.com/space-wizards/space-station-14/pull/17948" - files: [ "bar.png", "blue.png", "kitchen.png", "laundry.png", "mime.png", "steel.png", "steel_dirty.png", "steel_diagonal.png", "steel_mini.png", "steel_offset.png", "steel_pavement.png", "white.png", "white_diagonal.png", "white_mini.png", "white_offset.png", "white_pavement.png", "white_plastic.png", "dark.png", "dark_diagonal.png", "dark_mini.png", "dark_offset.png", "dark_pavement.png", "dark_plastic.png", "hydro.png", "clown.png" ] license: "CC0-1.0" diff --git a/Resources/Textures/Tiles/glass.png b/Resources/Textures/Tiles/glass.png index 6f47c3d2c1..37adc67679 100644 Binary files a/Resources/Textures/Tiles/glass.png and b/Resources/Textures/Tiles/glass.png differ diff --git a/Resources/Textures/Tiles/rglass.png b/Resources/Textures/Tiles/rglass.png index da20b68680..bae2908132 100644 Binary files a/Resources/Textures/Tiles/rglass.png and b/Resources/Textures/Tiles/rglass.png differ