From d42d3ec2e6d9a46207be844e182d552f30d2e896 Mon Sep 17 00:00:00 2001
From: Swept <sweptwastaken@protonmail.com>
Date: Mon, 1 Mar 2021 20:57:04 +0000
Subject: [PATCH] Initial (#3470)

---
 .../Objects/Materials/Sheets/glass.yml        |   6 +++++
 .../Objects/Materials/Sheets/metal.yml        |   5 +++-
 .../Entities/Objects/Materials/parts.yml      |   6 ++++-
 Resources/Prototypes/Tiles/floors.yml         |  24 ++++++++++++++++++
 .../Textures/Constructible/Tiles/glass.png    | Bin 0 -> 547 bytes
 .../Textures/Constructible/Tiles/rglass.png   | Bin 0 -> 413 bytes
 6 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/Constructible/Tiles/glass.png
 create mode 100644 Resources/Textures/Constructible/Tiles/rglass.png

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 0000000000000000000000000000000000000000..6f47c3d2c1760754b841d554e0e7bcc22ed97c54
GIT binary patch
literal 547
zcmV+;0^I$HP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005%Nkl<ZScSD$
z%}N6?5T4fEK%pRr9(vG2q4@U(9;8p<i+IwD$G%I!i%(EI_y&6HK@UABLZMPfDV3~E
zosKifB#R%E?56YcWipxBG_G&&R*;FO#}Qmy_H)(Y;eH5(d-(i#&o+{)ySIN(jfJ0R
zP2Q?;yjUa|n!JwHvfZ+*#(C#(Ggn}No&MELFUfs6mZRYSD>eN?>dFP!m;m+D6eWLP
z(P+sWm2ohFjEE2c&ai*Rgy=g6#90)9|3Zdi?@o8N9t{K_MSx>1Ik&<}4I}#pQUr{!
z=h_Hh8^I{Vk`NnPtbf3a_<wqwvT}f1i3dj_`wUAF;KEjB`k)I?5s(r~15DJAQB8mv
z_%{@;rACkw1q_Q9GM&v~`ttl60oTt@&dy=C-QremGos)V5*MWnoFC`Ue@BG2z>oy0
z)2)&V5vNcpN%$mGMN!iYy|Oj}oU`NzfN*~4>VVmzFQ#UQ5eN~Wz(%Dl0wQBbPf!z(
zlu}NF>iC9|&<IB<G>3`OkC-F^xP($NZH6c%6RiIj+D|fI>H;wDmXMBaS*#F&A`dtx
z>Rj0n@Rx>~h&rZzwsOE-8dB~DuCb6FlH`1gfWIzv)aIb-YMrC5T7J&VRRsJ+F$Z;Y
l9U8sk)9mYcT{Kop_y)2hm4-l8<SqaJ002ovPDHLkV1gxa_CEjs

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Constructible/Tiles/rglass.png b/Resources/Textures/Constructible/Tiles/rglass.png
new file mode 100644
index 0000000000000000000000000000000000000000..da20b686807400aa5d2b5c73a398227f32893bf6
GIT binary patch
literal 413
zcmV;O0b>4%P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004GNkl<ZScPLO
zuB!jfKqfeL=m3M2oddbr88)q5#lQk$ynFMSY(vP^D<mQcrdePDoX;PF>3hF_lVs5I
zNB4+UtHjC*roT(d!o^sS6|ma}W$7@nr2YN(XBJG1nacd12iHwQwv!3Q0QnqUF$jS8
zAaQJtAx9oPgqhG4V+%T%A+(T3aRAJv=m4gf7V;P&fUXGH<<yYJ>i~31XptreI)H)r
zI8P-vO%QYdk#Rno+%$pL0o0CjLXN=51+*>)@H${*mII(F^~SZU3?ILIr%O2ivIk@z
z$X>7mK=rwXmNo-F4<`e<A+$&nAbUXe!P*g&lmleTBLhmx0kY-sI$*RMz~;))_P}U+
z0EhfAYY)IW4YV!?VD`WOxNivRUXjx?0#z)qI)oU2+%p1o&ES1Q2BhwiB+<q(Fnqjr
zl|fQYiD>oTv50{k0P84{11Ql80*tEanq+s+DFuxG|1tmoly-CcpaBCF00000NkvXX
Hu0mjf88EM5

literal 0
HcmV?d00001