diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
index ad7fa7389e..9fe0554257 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
@@ -36,6 +36,9 @@
             - glass
             - glass_2
             - glass_3
+    - type: FloorTile
+      outputs:
+        - floor_glass
 
 - type: entity
   id: SheetGlass1
@@ -69,6 +72,9 @@
             - rglass
             - rglass_2
             - rglass_3
+    - type: FloorTile
+      outputs:
+        - floor_rglass
 
 - type: entity
   id: SheetRGlass1
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
index 888fc2b6c5..443f44a43e 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
@@ -36,7 +36,10 @@
             - steel
             - steel_2
             - steel_3
-
+    - type: FloorTile
+      outputs:
+        - underplating
+        
 - type: entity
   id: SheetSteel1
   name: steel
diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
index 0a863e9e87..57d16e31b8 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
@@ -35,7 +35,11 @@
             - rods_3
             - rods_4
             - rods_5
-
+    - type: FloorTile
+      outputs:
+        - lattice
+        - floor_reinforced
+        
 - type: entity
   id: PartRodMetal1
   name: metal rod
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 2678975766..fe74c635dc 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -253,3 +253,27 @@
   footstep_sounds: footstep_floor
   friction: 0.35
   item_drop: FloorTileItemGold
+
+- type: tile
+  name: floor_glass
+  display_name: glass floor
+  texture: glass
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_floor
+  friction: 0.35
+  item_drop: SheetGlass1
+
+- type: tile
+  name: floor_rglass
+  display_name: reinforced glass floor
+  texture: rglass
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_floor
+  friction: 0.35
+  item_drop: SheetRGlass1
diff --git a/Resources/Textures/Constructible/Tiles/glass.png b/Resources/Textures/Constructible/Tiles/glass.png
new file mode 100644
index 0000000000..6f47c3d2c1
Binary files /dev/null and b/Resources/Textures/Constructible/Tiles/glass.png differ
diff --git a/Resources/Textures/Constructible/Tiles/rglass.png b/Resources/Textures/Constructible/Tiles/rglass.png
new file mode 100644
index 0000000000..da20b68680
Binary files /dev/null and b/Resources/Textures/Constructible/Tiles/rglass.png differ