From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Sat, 9 Sep 2023 06:33:22 +0000 (-0600)
Subject: Revert "Semi revert glass tile resprite (#19266)" (#19931)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=ca289d4f0b0586198c7e63a367d5e6e021b7f508;p=space-station-14.git

Revert "Semi revert glass tile resprite (#19266)" (#19931)

This reverts commit 38f921f831a21c91a0b526caa5072be7544c3bb1.
---

diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl
index 36e6bbdfa2..219c7295d9 100644
--- a/Resources/Locale/en-US/tiles/tiles.ftl
+++ b/Resources/Locale/en-US/tiles/tiles.ftl
@@ -76,9 +76,7 @@ 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 a642a9ce10..908cd466a3 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -1179,18 +1179,6 @@
   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
@@ -1209,18 +1197,6 @@
   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 638c8eea9b..641100fe42 100644
--- 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", "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/"
@@ -31,12 +31,12 @@
   copyright: "Modified from plating.png by github user @Flareguy"
   source: "https://github.com/space-wizards/space-station-14/"
   
-- files: ["rglass_alt.png"]
+- 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_alt.png"]
+- files: ["glass.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 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/glass_alt.png b/Resources/Textures/Tiles/glass_alt.png
deleted file mode 100644
index 37adc67679..0000000000
Binary files a/Resources/Textures/Tiles/glass_alt.png and /dev/null 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
diff --git a/Resources/Textures/Tiles/rglass_alt.png b/Resources/Textures/Tiles/rglass_alt.png
deleted file mode 100644
index bae2908132..0000000000
Binary files a/Resources/Textures/Tiles/rglass_alt.png and /dev/null differ