Semi revert glass tile resprite (#19266)

diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl
index 219c7295d9e19d0f7e8b79993d50969e8999a2e4..36e6bbdfa2e735e93e62177dfb6942bbca3716bb 100644 (file)
--- a/Resources/Locale/en-US/tiles/tiles.ftl
+++ b/Resources/Locale/en-US/tiles/tiles.ftl
@@ -76,7 +76,9 @@ tiles-red-shuttle-floor = red shuttle floor
 tiles-gold-tile = gold tile
 tiles-silver-tile = silver tile
 tiles-glass-floor = glass floor
+tiles-glass-floor-alt = fancy glass floor
 tiles-reinforced-glass-floor = reinforced glass floor
+tiles-reinforced-glass-floor-alt = fancy reinforced glass floor
 tiles-green-circuit-floor = green circuit floor
 tiles-blue-circuit-floor = blue circuit floor
 tiles-snow = snow

diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 908cd466a3f29acce6cadaaceb4d573080c56022..a642a9ce105b420ec12f9fe08611f017ef214acf 100644 (file)
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -1179,6 +1179,18 @@
   id: FloorGlass
   name: tiles-glass-floor
   sprite: /Textures/Tiles/glass.png
+  baseTurf: Plating
+  isSubfloor: false
+  canCrowbar: true
+  footstepSounds:
+    collection: FootstepTile
+  itemDrop: SheetGlass1
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorGlassAlt
+  name: tiles-glass-floor-alt
+  sprite: /Textures/Tiles/glass_alt.png
   variants: 4
   placementVariants:
   - 1.0
@@ -1197,6 +1209,18 @@
   id: FloorRGlass
   name: tiles-reinforced-glass-floor
   sprite: /Textures/Tiles/rglass.png
+  baseTurf: Plating
+  isSubfloor: false
+  canCrowbar: true
+  footstepSounds:
+    collection: FootstepTile
+  itemDrop: SheetRGlass1
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorRGlassAlt
+  name: tiles-reinforced-glass-floor-alt
+  sprite: /Textures/Tiles/rglass_alt.png
   variants: 4
   placementVariants:
   - 1.0

diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml
index 641100fe421a98a2e49f3942b201c1ad4fff9d32..638c8eea9baacacc32a72f61a98cfb44063025b5 100644 (file)
--- a/Resources/Textures/Tiles/attributions.yml
+++ b/Resources/Textures/Tiles/attributions.yml
@@ -16,7 +16,7 @@
   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"]
+- 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"]
   license: "CC-BY-SA-3.0"
   copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, cropped_parallax modified from parallax."
   source: "https://github.com/tgstation/tgstation/"
@@ -31,12 +31,12 @@
   copyright: "Modified from plating.png by github user @Flareguy"
   source: "https://github.com/space-wizards/space-station-14/"
   
-- files: ["rglass.png"]
+- files: ["rglass_alt.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"]
+- files: ["glass_alt.png"]
   license: "CC0-1.0"
   copyright: "Created by github user @notquitehadouken."
   source: "https://github.com/space-wizards/space-station-14/pull/17948"

diff --git a/Resources/Textures/Tiles/glass.png b/Resources/Textures/Tiles/glass.png
index 37adc67679ee5ef61ffb63558c06cc608a25d803..6f47c3d2c1760754b841d554e0e7bcc22ed97c54 100644 (file)
Binary files a/Resources/Textures/Tiles/glass.png and b/Resources/Textures/Tiles/glass.png differ

diff --git a/Resources/Textures/Tiles/glass_alt.png b/Resources/Textures/Tiles/glass_alt.png
new file mode 100644 (file)
index 0000000..37adc67
Binary files /dev/null and b/Resources/Textures/Tiles/glass_alt.png differ

diff --git a/Resources/Textures/Tiles/rglass.png b/Resources/Textures/Tiles/rglass.png
index bae2908132bbdd4ac4ed025e37c8bcedc775970a..da20b686807400aa5d2b5c73a398227f32893bf6 100644 (file)
Binary files a/Resources/Textures/Tiles/rglass.png and b/Resources/Textures/Tiles/rglass.png differ

diff --git a/Resources/Textures/Tiles/rglass_alt.png b/Resources/Textures/Tiles/rglass_alt.png
new file mode 100644 (file)
index 0000000..bae2908
Binary files /dev/null and b/Resources/Textures/Tiles/rglass_alt.png differ