Big tile PR (3 carpets, 4 red sands, 1 grass, 5 shuttle floors) (#6864)

2022-02-27 07:01:48 +00:00
parent 7d9c7e46ab
commit fc667f8f44
27 changed files with 413 additions and 1 deletions
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -329,6 +329,136 @@
      - plating
      - floor_laundry

+# Carpets
+- type: entity
+  name: blue arcade floor
+  parent: FloorTileItemBase
+  id: FloorTileItemArcadeBlue
+  components:
+  - type: Sprite
+    state: arcadeblue
+  - type: Item
+    HeldPrefix: arcadeblue
+  - type: FloorTile
+    outputs:
+      - plating
+      - FloorArcadeBlue
+  - type: Stack
+    stackType: FloorTileStackArcadeBlue
+      
+- type: entity
+  name: red arcade floor
+  parent: FloorTileItemBase
+  id: FloorTileItemArcadeRed
+  components:
+  - type: Sprite
+    state: arcadered
+  - type: Item
+    HeldPrefix: arcadered
+  - type: FloorTile
+    outputs:
+      - plating
+      - FloorArcadeRed
+  - type: Stack
+    stackType: FloorTileStackArcadeRed
+      
+- type: entity
+  name: eighties floor
+  parent: FloorTileItemBase
+  id: FloorTileItemEighties
+  components:
+  - type: Sprite
+    state: eighties
+  - type: Item
+    HeldPrefix: eighties
+  - type: FloorTile
+    outputs:
+      - plating
+      - FloorEighties
+  - type: Stack
+    stackType: FloorTileStackEighties
+
+# Shuttles
+- type: entity
+  name: white shuttle floor
+  parent: FloorTileItemBase
+  id: FloorTileItemShuttleWhite
+  components:
+  - type: Sprite
+    state: shuttlewhite
+  - type: Item
+    HeldPrefix: shuttlewhite
+  - type: FloorTile
+    outputs:
+      - plating
+      - FloorShuttleWhite
+  - type: Stack
+    stackType: FloorTileStackShuttleWhite
+    
+- type: entity
+  name: blue shuttle floor
+  parent: FloorTileItemBase
+  id: FloorTileItemShuttleBlue
+  components:
+  - type: Sprite
+    state: shuttleblue
+  - type: Item
+    HeldPrefix: shuttleblue
+  - type: FloorTile
+    outputs:
+      - plating
+      - FloorShuttleBlue
+  - type: Stack
+    stackType: FloorTileStackShuttleBlue
+    
+- type: entity
+  name: orange shuttle floor
+  parent: FloorTileItemBase
+  id: FloorTileItemShuttleOrange
+  components:
+  - type: Sprite
+    state: shuttleorange
+  - type: Item
+    HeldPrefix: shuttleorange
+  - type: FloorTile
+    outputs:
+      - plating
+      - FloorShuttleOrange
+  - type: Stack
+    stackType: FloorTileStackShuttleOrange
+    
+- type: entity
+  name: purple shuttle floor
+  parent: FloorTileItemBase
+  id: FloorTileItemShuttlePurple
+  components:
+  - type: Sprite
+    state: shuttlepurple
+  - type: Item
+    HeldPrefix: shuttlepurple
+  - type: FloorTile
+    outputs:
+      - plating
+      - FloorShuttlePurple
+  - type: Stack
+    stackType: FloorTileStackShuttlePurple
+    
+- type: entity
+  name: red shuttle floor
+  parent: FloorTileItemBase
+  id: FloorTileItemShuttleRed
+  components:
+  - type: Sprite
+    state: shuttlered
+  - type: Item
+    HeldPrefix: shuttlered
+  - type: FloorTile
+    outputs:
+      - plating
+      - FloorShuttleRed
+  - type: Stack
+    stackType: FloorTileStackShuttleRed
+
 # Materials
 - type: entity
  name: gold floor
@@ -403,6 +533,20 @@
    outputs:
      - plating
      - floor_grass
+      
+- type: entity
+  name: jungle grass tile
+  parent: FloorTileItemBase
+  id: FloorTileItemGrassJungle
+  components:
+  - type: Sprite
+    state: grassjungle
+  - type: Item
+    HeldPrefix: grassjungle
+  - type: FloorTile
+    outputs:
+      - plating
+      - FloorGrassJungle

 - type: entity
  name: snow tile
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
@@ -67,3 +67,43 @@
  id: FloorTileDirty
  name: dirty tile
  spawn: FloorTileItemDirty
+
+- type: stack
+  id: FloorTileStackShuttleWhite
+  name: white shuttle tile
+  spawn: FloorTileItemShuttleWhite
+  
+- type: stack
+  id: FloorTileStackShuttleBlue
+  name: blue shuttle tile
+  spawn: FloorTileItemShuttleBlue
+  
+- type: stack
+  id: FloorTileStackShuttleOrange
+  name: orange shuttle tile
+  spawn: FloorTileItemShuttleOrange
+  
+- type: stack
+  id: FloorTileStackShuttlePurple
+  name: purple shuttle tile
+  spawn: FloorTileItemShuttlePurple
+  
+- type: stack
+  id: FloorTileStackShuttleRed
+  name: red shuttle tile
+  spawn: FloorTileItemShuttleRed
+  
+- type: stack
+  id: FloorTileStackEighties
+  name: eighties floor tile
+  spawn: FloorTileItemEighties
+  
+- type: stack
+  id: FloorTileStackArcadeBlue
+  name: blue arcade tile
+  spawn: FloorTileItemArcadeBlue
+  
+- type: stack
+  id: FloorTileStackArcadeRed
+  name: red arcade tile
+  spawn: FloorTileItemArcadeRed
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -298,6 +298,129 @@
  item_drop: FloorTileItemLaundry
  thermalConductivity: 0.04
  heatCapacity: 10000
+  
+# Carpets (non smoothing)
+- type: tile
+  id: FloorArcadeBlue
+  name: blue arcade floor
+  texture: arcadeblue
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.40
+  item_drop: FloorTileItemArcadeBlue
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+  
+- type: tile
+  id: FloorArcadeRed
+  name: red arcade floor
+  texture: arcadered
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.40
+  item_drop: FloorTileItemArcadeRed
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+  
+- type: tile
+  id: FloorEighties
+  name: eighties floor
+  texture: eighties
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.40
+  item_drop: FloorTileItemEighties
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+# Shuttle
+- type: tile
+  id: FloorShuttleWhite
+  name: white shuttle floor
+  texture: shuttlewhite
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.30
+  item_drop: FloorTileItemShuttleWhite
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+  
+- type: tile
+  id: FloorShuttleBlue
+  name: blue shuttle floor
+  texture: shuttleblue
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.30
+  item_drop: FloorTileItemShuttleBlue
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+  
+- type: tile
+  id: FloorShuttleOrange
+  name: orange shuttle floor
+  texture: shuttleorange
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.30
+  item_drop: FloorTileItemShuttleOrange
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+  
+- type: tile
+  id: FloorShuttlePurple
+  name: purple shuttle floor
+  texture: shuttlepurple
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.30
+  item_drop: FloorTileItemShuttlePurple
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorShuttleRed
+  name: red shuttle floor
+  texture: shuttlered
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.30
+  item_drop: FloorTileItemShuttleRed
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+

 # Materials
 - type: tile
@@ -421,6 +544,21 @@
  item_drop: FloorTileItemGrass
  thermalConductivity: 0.04
  heatCapacity: 10000
+  
+- type: tile
+  id: FloorGrassJungle
+  name: jungle grass floor
+  texture: grassjungle
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_floor
+  friction: 0.30
+  item_drop: FloorTileItemGrassJungle
+  thermalConductivity: 0.04
+  heatCapacity: 10000

 # Asteroid
 - type: tile
@@ -506,3 +644,60 @@
  friction: 0.30
  thermalConductivity: 0.04
  heatCapacity: 10000
+  
+- type: tile
+  id: FloorAsteroidIronsand1
+  name: asteroid ironsand
+  texture: ironsand1
+  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: FloorAsteroidIronsand2
+  name: asteroid ironsand pebbles
+  texture: ironsand2
+  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: FloorAsteroidIronsand3
+  name: asteroid ironsand pebbles 2
+  texture: ironsand3
+  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: FloorAsteroidIronsand4
+  name: asteroid ironsand rock
+  texture: ironsand4
+  base_turfs:
+  - space
+  is_subfloor: false
+  can_crowbar: false
+  footstep_sounds:
+    collection: footstep_asteroid
+  friction: 0.30
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+