From 86a3b55aadfd84b5c5a1374743a96bc399aa6ec3 Mon Sep 17 00:00:00 2001
From: Peptide90 <78795277+Peptide90@users.noreply.github.com>
Date: Tue, 2 Aug 2022 13:55:30 +0100
Subject: [PATCH] Adds two new cave floors (#9873)

---
 Resources/Prototypes/Tiles/floors.yml     |  32 ++++++++++++++++++++++
 Resources/Textures/Tiles/attributions.yml |   7 ++++-
 Resources/Textures/Tiles/cave.png         | Bin 0 -> 1482 bytes
 Resources/Textures/Tiles/cavedrought.png  | Bin 0 -> 1892 bytes
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Tiles/cave.png
 create mode 100644 Resources/Textures/Tiles/cavedrought.png

diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 478d1da96e..3f4dcf7342 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -811,3 +811,35 @@
   thermalConductivity: 0.04
   heatCapacity: 10000
 
+# Caves
+- type: tile
+  id: FloorCave
+  name: cave
+  texture: cave
+  variants: 7
+  placementVariants: [0, 1, 2, 3, 4, 5, 6]
+  base_turfs:
+  - space
+  is_subfloor: false
+  can_crowbar: false
+  footstep_sounds:
+    collection: footstep_asteroid
+  friction: 0.30
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+  
+- type: tile
+  id: FloorCaveDrought
+  name: cave drought
+  texture: cavedrought
+  variants: 8
+  placementVariants: [0, 1, 2, 3, 4, 5, 6, 7]
+  base_turfs:
+  - space
+  is_subfloor: false
+  can_crowbar: false
+  footstep_sounds:
+    collection: footstep_asteroid
+  friction: 0.30
+  thermalConductivity: 0.04
+  heatCapacity: 10000
\ No newline at end of file
diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml
index 767b29b4b3..4fef9e8a3f 100644
--- a/Resources/Textures/Tiles/attributions.yml
+++ b/Resources/Textures/Tiles/attributions.yml
@@ -33,4 +33,9 @@
 - files: ["arcadeblue2.png", "boxing.png", "carpetclown.png", "carpetoffice.png", "gym.png", "metaldiamond.png"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "by WALPVRGIS for Goonstation, taken at commit 236551b95a5b24917c72f3069223026b2dc4e690 from floors.dmi"
-  source: "https://github.com/goonstation/goonstation"
\ No newline at end of file
+  source: "https://github.com/goonstation/goonstation"
+  
+- files: ["cave.png", "cavedrought.png"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Mojave-Sun, taken at commit 0587dd16e28108bdf0b0a28e2caae4319845e861"
+  source: "https://github.com/Mojave-Sun/mojave-sun-13"
\ No newline at end of file
diff --git a/Resources/Textures/Tiles/cave.png b/Resources/Textures/Tiles/cave.png
new file mode 100644
index 0000000000000000000000000000000000000000..22799b01b8430781778d4e8c5a239f8ed41bad22
GIT binary patch
literal 1482
zcmV;*1vUDKP)<h;3K|Lk000e1NJLTq007_s001Be0{{R3JR5{(00001b5ch_0Itp)
z=>Px#3{Xr|MLRn>MM6L`GBGJ5AxpZJ<p2N$Y)M2xR9J<bS=nObI0zK*|Np!#prF9+
zWHWi_NnFiQ;*{qcQIV5B^lSb6E3W!4@-6;~8^Dit`J;Zh^3N|!{2~5F`Cst|!Qub-
zMYg=EUEVT{;Ltvgul|Pv16L&^H2om&h90=8vI`SW17wGS>QYk7WXnTB^})hV;vO#$
zc^q}(I`H~Z{ApzPgAFBed7Wmk4NUtVS=BSnlf$-<$KN*+>l;TGr%myLYdpR`sjyGa
zgBf2ybxekxUU^8{#Za*ru%EVk;xKPAOm-9cI8UWO_!;rYe;vQF>h?ae2Hy99oQfD(
z4^x9@p07t)+Cx2E_I5f8i{otzo8CFkN;{QuVpaiSeoHJFN@nHdW!420$D#0V7KKKJ
z`onUya@-TdV0A`m6AXzLf@P561IGom3}>4fyJ?MAm@2Uh8Y8UKd_CBKXzQ;4TlBGR
zq3;Cyp}z7ff?bQqDsHl$lN1|?G)f@MtLNn)5S%2!tQ<cne&I#BH(4MPyqrxLYBS{D
z8^JJTAN*uGT)#d~sEV_1AI|a-LU6aDx0{};)@%;C`Gx8GfjTq`HwyPdcn;6VvG7mc
zhVvD>+O7&wP1E9!=m5kM<`(kj-;p}kmrS(GHE<ffKt2MSZG_zPVpQ0$!K}upYRr_f
z1A5_~=pGqv`8t?gKvNs>^Fq84)<bhyGgda{y(*PnjR^0rDbL@ba3_sY#*K(Z9-O!j
zVo^zV<9Lrf`8gG>mH>j6GFPG)<9!IR4>3a!y>(Xuyqdl87ZJ@9W0Lhxf)Sr-U+=Sa
z2KqNacalSp<!73e7!fmUJhR24m{@+eC6*lk`MTsirF`vM`1oF|l?S7d^w-xgm~H4U
zDx?bO9RBn2n>dSimYj)8xe{qu{yi5%8QmWNWR>X7@UI+tZc(}j4(0y9HQ1sx@Fl!L
z()OUjvm5h9-dEqw`^+;M4)FoKx?Ia%Pm9-B;Wj_q5_GI8vzgLZa%W^n^KxBJdFhwE
z<`yjs4ut+tMO8DYy{5E#w~%h8s&u$BqWLA$8FunC>JvvA`o^rJ4_Xnj%o5Uhd+0-h
zmkHR2wy^ziI%Xvq2U(NOjWR!M1hxB3eqqo#btVX<SKtSDoey?r$ak~$E~B-!3RmCm
zXJwzgOMTG~OQMFUHm|}3XC(8kNO@#RVqG3h$kPj+*i6cdS1c8ZUVA`|+Y1w<D@$|E
z&tRxaFq$)MF6BU83f3)D2LAH40opN-vX0e{YEN`tc{1%Etj2(S=?ML)bAyA9xQ>kN
z*dH6!X*zIfgWS8z69-8zh#EpZE_&9_)05s%7sJ^AURLY`gP|5NUzbp7;?||Fqp>FF
z&=eU}-ajlg4#m{$!BLk?|EVRvbCf2)w7gz{XyYiYG19D-%Ul!hnXnEl8@Bl^{N)7F
zg_NJBi%iRh4lkdM`@{Y$l3<sutd||KpJjkUf80y*c?V@x;liI`7U1$qu;ul{UZC0P
z)fUdJ@ge_9lj<y}4vGYnfzy<G#Yr(6$hLVN`%KGk%^CaFZ?%}d%6}tx7QyyGLOw@L
zHS3@8Q0B*k+n)mO^+0L|d6DPe7_U)3YA}cL_Xw&ty`B~n!ni!;ub44E<81<0A|w{3
zU9WZD<gE=19Ak_^U4=F5Z&$KLt5akX^t(zc3tWD|hgwD1G>+Fv`c)p6h|GhUl8R-l
zZCJlQ9rnlDE&6`E5-`gR#O6-O`1y`!wTxkkD{ac_PxA3b)$y}0hx27ew>?a;e5Fwv
z)VjgceME9MoYP|9=NG)?MKEUz&jk2a{q@?TBAy%X|MWkWQ;n5N-tp+!-*J|&|A+X4
k{LgsOs+X9P-@E_+0i<&e#vse?p#T5?07*qoM6N<$g0|Dw<p2Nx

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/cavedrought.png b/Resources/Textures/Tiles/cavedrought.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4d7535a89a6adcdc2b3a02d29410d600eec17cd
GIT binary patch
literal 1892
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

literal 0
HcmV?d00001