From 8d9b56fce69ac52872c5b63e6f0a2b2a23a64b9c Mon Sep 17 00:00:00 2001
From: Peptide90 <78795277+Peptide90@users.noreply.github.com>
Date: Thu, 2 Jun 2022 03:10:58 +0100
Subject: [PATCH] Goon floor pack 1 (#8267)

* floors boxing, arcadeblue2 and carpet clown

* adds gym, metaldiamond and carpetoffice from goon

* adds variants for boxing and gym

* tile variants updated
---
 .../Entities/Objects/Misc/tiles.yml           |  99 ++++++++++++++++++
 .../Prototypes/Stacks/floor_tile_stacks.yml   |  30 ++++++
 Resources/Prototypes/Tiles/floors.yml         |  94 +++++++++++++++++
 .../Objects/Tiles/tile.rsi/arcadeblue2.png    | Bin 0 -> 328 bytes
 .../Objects/Tiles/tile.rsi/boxing.png         | Bin 0 -> 505 bytes
 .../Objects/Tiles/tile.rsi/carpetclown.png    | Bin 0 -> 845 bytes
 .../Objects/Tiles/tile.rsi/carpetoffice.png   | Bin 0 -> 395 bytes
 .../Textures/Objects/Tiles/tile.rsi/gym.png   | Bin 0 -> 351 bytes
 .../Textures/Objects/Tiles/tile.rsi/meta.json |  18 ++++
 .../Objects/Tiles/tile.rsi/metaldiamond.png   | Bin 0 -> 515 bytes
 Resources/Textures/Tiles/arcadeblue2.png      | Bin 0 -> 546 bytes
 Resources/Textures/Tiles/boxing.png           | Bin 0 -> 807 bytes
 Resources/Textures/Tiles/carpetclown.png      | Bin 0 -> 1148 bytes
 Resources/Textures/Tiles/carpetoffice.png     | Bin 0 -> 447 bytes
 Resources/Textures/Tiles/copyright.txt        |   2 +
 Resources/Textures/Tiles/gym.png              | Bin 0 -> 561 bytes
 Resources/Textures/Tiles/metaldiamond.png     | Bin 0 -> 448 bytes
 17 files changed, 243 insertions(+)
 create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/arcadeblue2.png
 create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/boxing.png
 create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/carpetclown.png
 create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/carpetoffice.png
 create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/gym.png
 create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/metaldiamond.png
 create mode 100644 Resources/Textures/Tiles/arcadeblue2.png
 create mode 100644 Resources/Textures/Tiles/boxing.png
 create mode 100644 Resources/Textures/Tiles/carpetclown.png
 create mode 100644 Resources/Textures/Tiles/carpetoffice.png
 create mode 100644 Resources/Textures/Tiles/gym.png
 create mode 100644 Resources/Textures/Tiles/metaldiamond.png

diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index cd7f0d5f35..420d472d62 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -53,6 +53,25 @@
   - type: Construction
     graph: TileSteel
     node: steeltile
+    
+- type: entity
+  name: steel tile
+  parent: FloorTileItemBase
+  id: FloorTileItemMetalDiamond
+  components:
+  - type: Sprite
+    state: metaldiamond
+  - type: Item
+    HeldPrefix: steel
+  - type: FloorTile
+    outputs:
+      - plating
+      - FloorMetalDiamond
+  - type: Stack
+    stackType: FloorTileMetalDiamond
+#  - type: Construction
+#    graph: TileSteel
+#    node: steeltile
 
 - type: entity
   name: wood floor
@@ -386,6 +405,22 @@
       - FloorArcadeBlue
   - type: Stack
     stackType: FloorTileStackArcadeBlue
+    
+- type: entity
+  name: blue arcade floor
+  parent: FloorTileItemBase
+  id: FloorTileItemArcadeBlue2
+  components:
+  - type: Sprite
+    state: arcadeblue2
+  - type: Item
+    HeldPrefix: generic
+  - type: FloorTile
+    outputs:
+      - plating
+      - FloorArcadeBlue2
+  - type: Stack
+    stackType: FloorTileStackArcadeBlue2
 
 - type: entity
   name: red arcade floor
@@ -418,6 +453,70 @@
       - FloorEighties
   - type: Stack
     stackType: FloorTileStackEighties
+    
+- type: entity
+  name: clown carpet floor
+  parent: FloorTileItemBase
+  id: FloorTileItemCarpetClown
+  components:
+  - type: Sprite
+    state: carpetclown
+  - type: Item
+    HeldPrefix: generic
+  - type: FloorTile
+    outputs:
+      - plating
+      - FloorCarpetClown
+  - type: Stack
+    stackType: FloorTileStackCarpetClown
+    
+- type: entity
+  name: office carpet floor
+  parent: FloorTileItemBase
+  id: FloorTileItemCarpetOffice
+  components:
+  - type: Sprite
+    state: carpetoffice
+  - type: Item
+    HeldPrefix: generic
+  - type: FloorTile
+    outputs:
+      - plating
+      - FloorCarpetOffice
+  - type: Stack
+    stackType: FloorTileStackCarpetOffice
+    
+- type: entity
+  name: boxing ring floor
+  parent: FloorTileItemBase
+  id: FloorTileItemBoxing
+  components:
+  - type: Sprite
+    state: boxing
+  - type: Item
+    HeldPrefix: generic
+  - type: FloorTile
+    outputs:
+      - plating
+      - FloorBoxing
+  - type: Stack
+    stackType: FloorTileStackBoxing
+    
+- type: entity
+  name: gym floor
+  parent: FloorTileItemBase
+  id: FloorTileItemGym
+  components:
+  - type: Sprite
+    state: gym
+  - type: Item
+    HeldPrefix: generic
+  - type: FloorTile
+    outputs:
+      - plating
+      - FloorGym
+  - type: Stack
+    stackType: FloorTileStackGym
 
 # Shuttles
 - type: entity
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
index a8d3a6c117..39f2d98431 100644
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
@@ -2,6 +2,11 @@
   id: FloorTileSteel
   name: steel tile
   spawn: FloorTileItemSteel
+  
+- type: stack
+  id: FloorTileMetalDiamond
+  name: steel tile
+  spawn: FloorTileItemMetalDiamond
 
 - type: stack
   id: FloorTileWood
@@ -102,6 +107,11 @@
   id: FloorTileStackArcadeBlue
   name: blue arcade tile
   spawn: FloorTileItemArcadeBlue
+  
+- type: stack
+  id: FloorTileStackArcadeBlue2
+  name: blue arcade tile
+  spawn: FloorTileItemArcadeBlue2
 
 - type: stack
   id: FloorTileStackArcadeRed
@@ -147,6 +157,26 @@
   id: FloorCarpetPink
   name: pink carpet tile
   spawn: FloorCarpetItemPink
+  
+- type: stack
+  id: FloorTileStackCarpetClown
+  name: clown carpet tile
+  spawn: FloorTileItemCarpetClown
+
+- type: stack
+  id: FloorTileStackCarpetOffice
+  name: office carpet tile
+  spawn: FloorTileItemCarpetOffice
+  
+- type: stack
+  id: FloorTileStackBoxing
+  name: boxing ring tile
+  spawn: FloorTileItemBoxing
+  
+- type: stack
+  id: FloorTileStackGym
+  name: gym floor tile
+  spawn: FloorTileItemGym
 
 - type: stack
   id: FloorTileElevatorShaft
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 9841145209..b80c7b715c 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -14,6 +14,21 @@
   item_drop: FloorTileItemSteel
   thermalConductivity: 0.04
   heatCapacity: 10000
+  
+- type: tile
+  id: FloorMetalDiamond
+  name: diamond plate floor
+  texture: "metaldiamond"
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.30
+  item_drop: FloorTileItemMetalDiamond
+  thermalConductivity: 0.04
+  heatCapacity: 10000
 
 - type: tile
   id: floor_wood
@@ -325,6 +340,21 @@
   thermalConductivity: 0.04
   heatCapacity: 10000
 
+- type: tile
+  id: FloorArcadeBlue2
+  name: blue arcade floor
+  texture: arcadeblue2
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.40
+  item_drop: FloorTileItemArcadeBlue2
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
 - type: tile
   id: FloorArcadeRed
   name: red arcade floor
@@ -354,6 +384,70 @@
   item_drop: FloorTileItemEighties
   thermalConductivity: 0.04
   heatCapacity: 10000
+  
+- type: tile
+  id: FloorCarpetClown
+  name: clown carpet floor
+  texture: carpetclown
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.40
+  item_drop: FloorTileItemCarpetClown
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+  
+- type: tile
+  id: FloorCarpetOffice
+  name: office carpet floor
+  texture: carpetoffice
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.40
+  item_drop: FloorTileItemCarpetOffice
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+  
+- type: tile
+  id: FloorBoxing
+  name: boxing ring floor
+  texture: boxing
+  variants: 4
+  placementVariants: [0, 1, 2, 3]
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.40
+  item_drop: FloorTileItemBoxing
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+  
+- type: tile
+  id: FloorGym
+  name: gym floor
+  texture: gym
+  variants: 4
+  placementVariants: [0, 1, 2, 3]
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.40
+  item_drop: FloorTileItemGym
+  thermalConductivity: 0.04
+  heatCapacity: 10000
 
 # Shuttle
 - type: tile
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/arcadeblue2.png b/Resources/Textures/Objects/Tiles/tile.rsi/arcadeblue2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5a924315aac2196dde8aa9b080d95f88f06f58a
GIT binary patch
literal 328
zcmV-O0k{5%P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$0!c(cR9J;$U>F6XU=)mWz(|ZDabvIlq#E4K_L(8>_+f(PGtt6w1_lO((qFs`
z+va%^)JxC-lz_ykgaeqS4j={$T?hQLOQoL!Cf8=6@PBLgF)&!xGW;ulM0*D;du79L
z<HijXG1eQK7#NN>GyHw|o1k7ofM7D+E8F%zO6&+hgK&YDXSd<CgJy}a>X|%I>Igaj
zpYNBwy1}sQ)eQ{ss%P>HZBh@Z;{ZY+*S(G**j9_7;n@|q7_pW!FfcH%P-1zMm<B^I
z&lQH?wd)w7q;$wKgW?d-UAc-ON=$=n{RDFXtU@8CT*n3o<pP>j$HZ7Z3P!;w7zGRr
a3=9BY&P9*BBqsC#0000<MNUMnLSTZZU4`)g

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/boxing.png b/Resources/Textures/Objects/Tiles/tile.rsi/boxing.png
new file mode 100644
index 0000000000000000000000000000000000000000..87ec779dce4a099b13f2fa792e477aca431990e8
GIT binary patch
literal 505
zcmV<V0S5kwP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$vq?ljR9J=Wl}nP;Knz4*O66{X;96|B11o|Xu_L$!7bBQYw<XQOcDH+&2p7!k
zaIX9*mtH9)8Fua3^}kC!i@yH&S^u*6_b;C|_qW#uKOP1OFf+`I)*9|kYpn~sZ7mqb
zpbd><bENBmPGfL7ojD!`+zgix(A<bf9wWB4?gId*D#l3Mri5iC<0?R8VrKI?5fMZr
zZrcub0YoIKqN)%OGmx#`53>cCd6TIvZPoxx888W|i2Bpktb!^eF-G)N_Fn-2lE~$Q
z1!x7BRYWEL5kbz^Tk5hvz$tRFK)M84=uP6BMU3ameQ)1x0<`AOP{8f_?D2GFnAfbI
z_i7X1co_I~_kc;0*MQH(_Tl|Ie&0Q?B-`gskVIx)z+MFa)42~O64BhrOzz{FWRqy7
z2@>HF_nkG+RfJ}S`;unEq?=aDDp(ci(yng?08=M4cWMr1FZ8-g6Ub~skGd>?=~V7c
zMu3F-mA$#q=0OAy5~Vk6LwBRO<8F*q6kNvg1mHK_BH1*sUKm=>wQ0e(&mYy?8LK!&
vGS1U5Rz>D+B-4nFDsqPE`5o`twQJWCsw&l7LvfiN00000NkvXXu0mjfpP%E`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/carpetclown.png b/Resources/Textures/Objects/Tiles/tile.rsi/carpetclown.png
new file mode 100644
index 0000000000000000000000000000000000000000..44b9c748c073ce37078feec06a6f7cfb42a8ff22
GIT binary patch
literal 845
zcmV-T1G4;yP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&2T4RhR9J=Wl}%_|RTRg6_v77pGc{v03k|k5B2`2SimA0#Fc`lm>Z(*lPz1%G
zAbxaV!4I-%MFrQj6p9N$>Ow?82#CuOYw84KVo?-qXp+{CG&b|zy!Y<CE^d<9`37d`
z{CDr2^UnFbbM8481{!Ff|GPvlPRA!tdaX6-SwY8jn0@~UDh{^qlDFAy4szg&@SIwY
zY)m1Q;o;M-mc}o2I6isO132Yy3l*+^WqQ+=WFFI61wh7<r0`U=z@?6bpWY>NIWK(k
z<bURnWdIw=rIn1C(}6nD!SJak`*VoYdR*$LYC*IW%vdlR8I{J?We)RcidF`2#GO&<
zA3GoeLb+oEa;1*jxk{x5zHk6s{ro#DeR!x8ptJ(tPC#Q4b}TOgu(~{jj8xZQ3Czep
zRBH-fIE0q`an)rwXZh^4ulfg2#sCn@h}7i(tSmei-l_HWjtP>s1>nL+ZSz|r<Ng6`
zmZ2lXvB$3rK)Tyk87V4fZ$%tE!li9PT-r87E!M<FaANo_GMDxb0MJ=Wuvx~5{a0X%
ze6teKuR8%qea7W;ZCW)rvtEF9vPRLd{R1dtsBEdCjN$z3DAU__aE_a4E`C7j?*sM`
zPjp8!ca~NSUhFi<=O5`GVDI=_6uD)wF@pEu^f#TS={&J8$OqpfEj-6|T|;A~PGhCc
zsrE1*G0ga`@+l}C!^s7Q+xrHe&mQH*7F3l03AyvUbU;zL_aUxZ`~eMU)BT^Ri|0r#
zz<d1yBpE#LyW*F54<by&++%CO7>)wJjo!u$=YPa2%hNL#k+Fs?P%R5i4=t!IDSTmx
zWEi>Jc>sK#AtFQ8z8jxf&eU&0*svd5T9C}#(nI<l0NP(Z!_S{gbN|-A0BAkYM#!-3
z)OfKDbq^v|JoR<(Nx$C?Kr-`eDL`oppu5xeUHdn!+dZC*TTG&a#`*%AOdy-fw2O_|
zzZ0oUY3$MpJUaKf0MI(HzI@1Vhdj)l+F`5@74T`!ZgUX5=M(@nJps_ubv)2O0}b>q
XDZU`UkJ!e+00000NkvXXu0mjf_K}PH

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/carpetoffice.png b/Resources/Textures/Objects/Tiles/tile.rsi/carpetoffice.png
new file mode 100644
index 0000000000000000000000000000000000000000..54df794f6b508a9d1f5ed474b3aff022f7c757b3
GIT binary patch
literal 395
zcmV;60d)R}P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$MM*?KR9J=Wm9a|0P!xv0T$*bdg2eU>bP#+N!NJL`4^R|z7ur#*i*63OISW3E
z;NSx|q%G2>F=_90vZ$mzkycQeZ~5ToaJlz~oIpuQ$*SWN8oIi+mI;^)l{wf^LdDaJ
zy(-^xr|L~@PMYHRN*rjntW91~-4{qx7)DsnVG{Sq%Rig*j$QZyrWV58F{T!x9X;Fk
zr@8s!4Rrf(aDnRfNo_jYd+pqODGkhhx!|QVF!$wx|9=DSxWaf{i{|DqKNqM-16e$P
z1dL&>*+0WXIk|w`fFGdhArDW_sCtO&2Q)TzrnzK^!VT<hZ$Z?@7`ROyL1?6C1L6f-
zUCmv&MOLvLB}l7Kyuc*xVaZVO0OJP`53qhPGk1p37fby8&+ucRG~CT!Sww|?$GUTA
p(=~&BQ~bm<j|!b%Qc|+oyaRe!U`R7C13>@)002ovPDHLkV1kCmuyOzZ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/gym.png b/Resources/Textures/Objects/Tiles/tile.rsi/gym.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8e96f17e8d05e0ceafd4088f72e9961007bbef6
GIT binary patch
literal 351
zcmV-l0igbgP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$8A(JzR9J=WRWT02Fbq7mkfm>7<z?)M=fQ-;SIQDZ&5(w;A+22)$w^hy*g89B
zI|V8#D*hd0aXRhx{0;f>c2W6N2Q7Hl67EliD=>N1lh|kpcxE^vbnTSqF);dp(Satx
zw@vuCKW(BlCa*D|TzkRqdEQrpsz3<900<a~J;%LdcSNg$11l6rf#>bph8FEVB~WTI
z3D4>Dxk5`Yl|Yg@qFM5OrTnG@Vr}JG?u8Nj+_yq4LDz;8%LfQ*<hHmk-x|y%NT)0}
zqEundrvy_IMp7Vjx}_nlST%-@mgn4&J}o)SB>=+dV*+_|I!f1YxUg)Qm=$=Fzk^QK
x(w_VNl)&M7rYOCXU)H%4(2?zTTv1U`@dBqMj5fOrgZKad002ovPDHLkV1iY<m<s>^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
index 45e8ab4d88..5e76d93009 100644
--- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
+++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
@@ -109,6 +109,9 @@
     {
       "name": "arcadeblue"
     },
+    {
+      "name": "arcadeblue2"
+    },
     {
       "name": "arcadered"
     },
@@ -130,6 +133,21 @@
     {
       "name": "shuttlered"
     },
+    {
+      "name": "carpetclown"
+    },
+    {
+      "name": "carpetoffice"
+    },
+    {
+      "name": "boxing"
+    },
+    {
+      "name": "gym"
+    },
+    {
+      "name": "metaldiamond"
+    },
     {
       "name": "bcircuit-inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/metaldiamond.png b/Resources/Textures/Objects/Tiles/tile.rsi/metaldiamond.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7cfde6a33f7ea8f52b8266268763e89866e71c9
GIT binary patch
literal 515
zcmV+e0{s1nP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$y-7qtR9J=Wm9eU$Koo|*UACF(a2EyyiI6IlkXEeI*rv*R<h5*lf&|-uRjPmx
zI3VoBYRYU8W{BjndiSQg{@ro(%<udkXJFQ>S>Ihhro6P-Y;FL~xxw=&icnRIF#w22
zsGV~h4u{eHKgV9!@AtR1ZNuiq7`m<lpznJC{JN?VMG<Y=0<hcdZeKP4kR(ai)H#Q>
zHq=0<{Ym&bj^okZqXvGzy&)o4YXR79w*aJRI;fK*K}5*&oG6M&)0FG=`gH?vKWbwP
zS(Z^%Rru5OdQDlDA@k*ONmW(hn<*MK@aO$KWL(!ZaL-&-sq1=>d0p3t2u;&G0sG$u
zfI;RWGGIbgNz-%y=1UoXJNZ8IJkNtExHI541t^N*^$d7<2L4r-W%-$w(+v2`Pp1<i
z5;Fg&256cFReha-$Bb1qWb8qEWW*Q~7<mZ;KF1_UaLzr=0ndbAFNz|7Iz^M`fQXP~
z8OP%>JbRoAe%&)5B9kEeHN`;Nwt;ehuIsSYa=Bav>;5iing(kvi^XEJ_vi`4aU3%C
z)6Lha`ZO2%zW)>hldj{{YBhSReWdgGJgNVzS+l;k{sQM62ixZc$d~{C002ovPDHLk
FV1hFe^8Nq-

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/arcadeblue2.png b/Resources/Textures/Tiles/arcadeblue2.png
new file mode 100644
index 0000000000000000000000000000000000000000..013af9f36f723033972d1b6cbea18c5c025043b4
GIT binary patch
literal 546
zcmV+-0^R+IP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0001rP)t-sr8z>R
zIzhRfP9Hj4BQs#4IXxFMO1Pj+ww_6vou-+erWJ9o7pgH9a<Uh3v#PMPz#WPbTbLE9
zEQE=Wg@}=?vA7jmoD^J}7OXH8lPeUID!(6!y&Z;vh>Q}GCzBd&kr`>d9U{OTCchsh
zZE$&Pad?>-A}VB{qNT2CaCDa$9xP>}z_}*Bx+bFl&F%mI0C9R$Sad{Xb7OL8aCB*J
zZU6vyoKseCa&`CgQ*iP1<SI)oD$dN$Q?OMq(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#
zlEji!AX6!^C^<1DH9k49s35gOiHkEOv#1y-Zpg)%R+N~V3SlcNxca$(jRych_8m!M
z2&ZZQ007oWL_t(IjkS~O4uUWYh07Ql$k2%jB6tA-LFfCwo)e51U?awu^S9^QX}ba#
z$ixbPA!Q+g6+#wR0BS#`*Z>Mjza$WB11SAch{_xqLL)7q>EsUtXM*6&95umZdV)9i
z*jR=IZ)=xxpZRRi1z)W<ZEX;;ZM5qVVo3P@MIeD29eVymW{A7`ARL)P^3x=b6ND2c
z{M%imS^DW8X2{NYQNG_FBjlH=F0Yy{is~lry8n>XA{E*>l%}45<@<sN4WX6j2sW}O
kcR|&J=XEzXsF1ww2c9w*IbztKCjbBd07*qoM6N<$g7hfjwg3PC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/boxing.png b/Resources/Textures/Tiles/boxing.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3c414a5b66ad145bdaca7ac8bf75e8ba5e72481
GIT binary patch
literal 807
zcmV+?1K9kDP)<h;3K|Lk000e1NJLTq004jh001Be0{{R3?fifj00001b5ch_0Itp)
z=>Px#eo#zQMP;3~Y@@qsqPk?Awr8KXWuCWbp}J_GxnY^JW1O{Zqq}UPx^ASrYM{Ao
zqPlCKxon}jZ=}3wpt)+Hx@)4kYoWSopSWqBw`rfaVw<&SpSWnAw`ZQWVVbmPowi_^
zvt*pLWt_EVowi?@vt*mKXPmWNm$7A=wO*LAYooini*|tk00LJ@L_t(og{_xsvcn(<
zg~<$SkOgG_d%OaIqJ=b_>yJ(i%K1DoJ^&ue6^d37(I33({Y$|epg#Zske@dIKj}vT
zQ~;}?B*n6C8pY3%Yb2EP`zR0s0Q(_NDt&I=h^TEk-mSOrHwv4>7y+78p!Ko<V4*Q^
zxkn7P`ARB>t##8ZqyW_a^*T8~p&_NC%^-0WYSV$rVJnhAdWvKpEaUW?YFe&g*7XMj
z_lO$Y0dP9Jm)ih1Cp+Q*iH2q77i7Wdj@MF$3jhKGfJ(y+?eP>KcQ^y!<`baOV1Oo$
zg>)N0>aY{i+Cbj7{5U|W!ShtiiNm4x1fT=-_Op$4vzXQj4Sze!7@h&#;UjF4aNl0T
zO2g)77=%S<Epzz0QfctMwU0yLaRpeD@$WJCvQ!$OY~A)e9~}OwR2mh)|CLu7KLVK}
z+UdcaIBYC}F9<-ly0y=oCzXa0+~+$TGv^x!`zT0PK3ne{pwgJ1VFdTjaClle%qxtp
z4J$wxajLN_1e07At>KM%S~)BLyyNBosm66$Fjmc>rQ2`muxyX*JAgxD5QLcIYGZop
z_FFm(vNK*}0HAASTjoHnaRA)YnE+4>5aeud`2hsT4iE{zs&N9qd^;1Mbl7b4?RTDa
z5&#G@U<7@?p*cTc%z@hB_0VX$UjV>L!zYMODn0!y08b7h27q{qHh@%PpC1|=8>Io1
z4v%XCjw8DpBKHY*DAQPs@*t6($|FGTu-(9T#r?Q&o>#=FQD2*2+`wvwA4_t{gZgUd
lSHR8T>v~VHm5}10?H}E}Jvk=UBxe8s002ovPDHLkV1gx`cbEVG

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/carpetclown.png b/Resources/Textures/Tiles/carpetclown.png
new file mode 100644
index 0000000000000000000000000000000000000000..03dd2be40be6995fe2a449187bf344cfffd2151b
GIT binary patch
literal 1148
zcmV-?1cUpDP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw00048P)t-smO-VQ
zL#m)hu9`-um@2PnyfR_CE?%=PD6y$4vaKhnq++-sYPuu1Yay^`AhIt|tuR!wFNmrx
zgS0Y^n=Y}DD5$z~BfFb0yr49)l`piJGqPANv2P->KrXaiF{)H8xG;UNFL|^@F}{l-
zzmFq#KB#^}tBNP9x-^8gg&?x1E^|Agk0`OEDVC}|EwrjJl`ONICy}Quo2sHMJA0x&
zfv8KiVM2zhK!T>ADwep5BCVw_N3UM3LN8IcX}Kd_u_9Z!BdEJ2X1gV;u_B_mb0dwk
zF^IA*f+xIoB(-}byL~6NyJ{t}btHnTEhR|1xnd)+ULq$>yd+1pQYE`iB(+nhK2M@N
zc(o>WyChd9yjZG3akC`5nIycOCn26gD}=Krd8;UXu`au9vXdk&vud(pFS~UlDS)pr
zymnNjL9}W!vTr23dnc-1E~+k0R42BrW-_!gRxh=4Dd&Zn0008pNkl<ZIE^Kf3sc%a
z6oog47@#2yD3Qi!E6|qMKzRhJQV>M3)(UC}g2h5m;)~MK|3A}n!`V%k;oS4x-I-j*
zI1k5hOJ1*c*|*~3{Q*AsN(c#p_*#;ruoPji@pxC)yemE^;131`Au2>ef)tKO9Ag{<
zfUSZcugBzNJ{Tes3PoXfIJd(R=UtQE$T3-tDM({)(9Z^vgrE|Sye?zM)XgneAcW{e
z9-}<Ry?rOgP_nHmib8fYo`}Z<vT(p;^8JU8stW$L3IZykaVV8YY4F)jGP#rdr0Z&0
zg`ZZGO+`pi9?EEFfqe3FR?q2V<583?xGAheUdwAqRxk`Bo71zpzMV!1nh5bkDh@_I
zqiMwwD;dTY9oo(6DugP6C-&l+rtKGtWo7`O=fD6${Yo`^z{io#15hav!9`^CT|(d(
z6xA{d00;%6R50``A#&(Ytsc~HHZ7k)Nu^w@FoRSgL=IQ29@MLcs31UI1HoX05|&ZO
zQWLdatyXJ|+R<^dd7RNQ<x1JT1rA}Hd^<h;o<6A88;!%WAMnqc`#7Xgz%8hx1)ZFp
zAYD6bUmTq`Nty<a2!&GXvUSxm%?|8FyM5NStmEc+vr8Vk?os~gveh?DvtMhRwJ+dz
zt?rFwSw`=g^?vrqrhMP*m^A<vCcOu@12(wr{km**%s!Sm9NFWWt_!ektnOfNhl0Do
z0BnR!dt}?g`|+6auqPA80pSi9a{H$JV54OGI37P)WIs=w7iY>GAYgY)+tn~IhAeCH
z{2PR+<FKhS;OGM8gFPG#ZJy`vAMdTF2{aQO=Y=^h`1U*Ip9LVm^L`$P$>i^3J{M<G
zhe;BB+&CeQFoMemc>nkx^5RSsBXBWZG(INqHf$0wv$-hF#W1FmNnv-wJouaV0l(V?
zba961jYv##hX>oY?4uIiZ6gvuiU7f+#e8|ZG~IqafE^4*1rW%NNdEyPAilU7h<mdD
O0000<MNUMnLSTaNF$e<y

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/carpetoffice.png b/Resources/Textures/Tiles/carpetoffice.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b142f1d1a45980f9dc1a64c08d5d93427f9f919
GIT binary patch
literal 447
zcmV;w0YLtVP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw00018P)t-s0F;pc
ze0m0rlK_*G1&opfl$rsQn*fxU0Fjjdl9K_Bm;#NI1B#9Tgp2}$j|GsG0hN~mo0$P}
zcC=q+0)l}9kB|V2jR%B?0EUSHg@*u$i3W>`V41T3Gyl73a8+uN`Tzg`d3sb>bVOxy
zV{&P5bZKvH004NLQ&w<tb@%jBaPjrzDoZUY&dkqKuvIY8GvMMZ&rB)F0CJ3txHvOX
zGt)ClAe`co#FA7XQz<_!Ei*YaJ~^?dAhpCuiHkEOv#1y-VaUaqR+N~V3S}3imS^Ur
zfZ56lu6{0Hy8z;!Aklpi;zIxc0GLTcK~y-6rIOhaf-nq411f?DC~;v)`2Wvj&^j#z
zQd=I*q<QL@djk-~2a)3`NzQ3@$*)CezJEY<yVoXY?eKWM-V)HXUH^g9RIr)=5ii8p
z+-(O9`Z(bHe-m&9C1oHv&@u;y1BH}Dt7T2FEJ+(>?F#A}5UrM`9he;l6YSu9)iVaK
pt8P0)4@s1-nysMdPX`JLY6PlFJ$$`>K|BBe002ovPDHLkV1gCCv4sEt

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/copyright.txt b/Resources/Textures/Tiles/copyright.txt
index 002ee174ba..bf3af7bd22 100644
--- a/Resources/Textures/Tiles/copyright.txt
+++ b/Resources/Textures/Tiles/copyright.txt
@@ -15,3 +15,5 @@ shuttleblue, orange, purple, red and white taken from ParadiseSS13 at https://gi
 
 deprecated.png made by 20kdc, licensed under SS14's MIT license - don't remove it, it's useful to make sure that maps with old tiles get noticed.
 
+arcadeblue2, boxing, carpetclown, carpetoffice, and gym taken from Goon at commit https://github.com/goonstation/goonstation/commit/c4d549f9259728427c6003da0aa2d95aaafff805
+
diff --git a/Resources/Textures/Tiles/gym.png b/Resources/Textures/Tiles/gym.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2dae4db4b22172baed2970080f0c51204d45deb
GIT binary patch
literal 561
zcmV-10?z%3P)<h;3K|Lk000e1NJLTq004jh001Be0{{R3?fifj00001b5ch_0Itp)
z=>Px#3{Xr|MS(3gj4(HcE;f5CH4!8w2mk;9(@8`@R9J<zmkV;kFbG7^aQ{0uV<W_8
z!DQlU(nd`rc&ucgM3b>}$Q*pLKj$+>wx>h=8t(~!4#2C<$vW5oTMu0%UVrw#z(+R3
z&o4a*oeIJYP#fwQmpH>%Q33IOy&Qnq;<i_eOr63BkPiSUfCg9rbd20890zld=vKf2
zXmk#sW@JS~3dc<afYTQO)QoB!DqI4blM*|NLU=J-V1PyLHl_eefMeS7o7MgVOU6a+
zdH5QD^KuuS8;G$2@Lu@Lt_5cY@5qi}bO$=di2{86NcxatlZ<Ntc9w|&r{L!RgN&Mw
z0Oh%c(Jsyk4*-f{)NOSu?pdYqGXO<^cNl*d0O*;qAIiH0y8hZanH3zp4I~)>n3=z}
z?jT3!o)}Tpt^sIYkz<xdk72{OR;Msn9s!Jw?jeVH05E<4OsG*|?-~KD2!KY%XaTZ)
zU<v`mvKfm&$C!%SR{+H6D$A{i#js?wg}nkW&B0ETW<S=~adnIn1x(+yIenS|0E3R`
zw$TFED76U<O=PT}N90*crcI~<T<@8{T6Jj*1B4@}8P|GHIHFJj3=eq>`hii}+FIcN
z0I}>pJ1`?RjMCQD3cofAM%3i~gLhX8Y%%%+m~aPE60`&+00000NkvXXu0mjfGQQ=Y

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Tiles/metaldiamond.png b/Resources/Textures/Tiles/metaldiamond.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed48f2ef36bed637a212ea9fad0ab4c2af1c44bc
GIT binary patch
literal 448
zcmV;x0YCnUP)<h;3K|Lk000e1NJLTq001BW001Ba0{{R3fmCP50000RP)t-shJ}T6
zbaYu+StlnaMMXtaR8%}XJau(-kB^V$dW|;#00Cf0L_t(2kzJ8Nj-)UQMblDG?<uI-
z7qsRAQ)<{_=K^Er0yu^}QZ9g$bI(t!SA+OOvXc1m9Ku@{-tg)0KF6*P@5JWr$%({b
zMxj`?f?9Et;(fR;ZnQWVR#|)s_qAGFE7?}FY!wBX-EAiGnZ@Ql{1T753GL2lw={)!
zb-zsGWt=Y6DGU;i7wPdbtco2U6i+5Ojr@!nr|>|31xG5lq!<e5&kIl&&#7@dw(96_
zzE<U}_F>4gO9YF~79AWPPQH`3*q$<ukobkd#Yp40b2?s<5kJ0E`taa%QuLF+;SFpk
zP*aQvYc6OzEY9*1YaGMh$^;j>Rkjrz51ko4T;U_exm_xG$Dbj*6Zhe_#OA}V%;2C#
z8jr8sd?2dW5%t7SPGUK;$P_+HR(K%H#8Tt<T)>CGiGBMRwknN-)|ylEamP$Bj|?Y9
qjic*sx94pf$7eU*+VubY_xuAH@0kle9XcNX0000<MNUMnLSTZtG0G_b

literal 0
HcmV?d00001