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

Resources/Prototypes/Entities/Objects/Misc/tiles.yml

@@ -54,6 +54,25 @@
     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
   parent: FloorTileItemBase
@@ -387,6 +406,22 @@
   - 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
   parent: FloorTileItemBase
@@ -419,6 +454,70 @@
   - 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
   name: white shuttle floor

Resources/Prototypes/Stacks/floor_tile_stacks.yml

@@ -3,6 +3,11 @@
   name: steel tile
   spawn: FloorTileItemSteel
   
+- type: stack
+  id: FloorTileMetalDiamond
+  name: steel tile
+  spawn: FloorTileItemMetalDiamond
+
 - type: stack
   id: FloorTileWood
   name: wood floor
@@ -103,6 +108,11 @@
   name: blue arcade tile
   spawn: FloorTileItemArcadeBlue
   
+- type: stack
+  id: FloorTileStackArcadeBlue2
+  name: blue arcade tile
+  spawn: FloorTileItemArcadeBlue2
+
 - type: stack
   id: FloorTileStackArcadeRed
   name: red arcade tile
@@ -148,6 +158,26 @@
   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
   name: elevator shaft tile

Resources/Prototypes/Tiles/floors.yml

@@ -15,6 +15,21 @@
   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
   name: 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
@@ -355,6 +385,70 @@
   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
   id: FloorShuttleWhite

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

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
+