Lots of new inhands, adds phoron (#1220)

* Beaker Inhands * Flashlight Inhands * Tile Refactor * Adds metal/glass sheet inhands * Removes plasma * Adds Phoron * We boolin' * Phoron inhands * First Pass inhand food * First food inhand pass * Soda inhand sprites * Actually adds them
2020-06-25 11:51:58 +00:00
parent 70a803e24e
commit bad7f9dc6b
299 changed files with 4421 additions and 144 deletions
--- a/Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml
@@ -29,6 +29,8 @@
    sprite: Objects/Drinks/cola.rsi
  - type: Icon
    sprite: Objects/Drinks/cola.rsi
+  - type: Item
+    sprite: Objects/Drinks/cola.rsi

 - type: entity
  parent: DrinkCanBaseFull
@@ -40,6 +42,8 @@
    sprite: Objects/Drinks/ice_tea_can.rsi
  - type: Icon
    sprite: Objects/Drinks/ice_tea_can.rsi
+  - type: Item
+    sprite: Objects/Drinks/ice_tea_can.rsi

 - type: entity
  parent: DrinkCanBaseFull
@@ -51,17 +55,21 @@
    sprite: Objects/Drinks/lemon-lime.rsi
  - type: Icon
    sprite: Objects/Drinks/lemon-lime.rsi
+  - type: Item
+    sprite: Objects/Drinks/lemon-lime.rsi

 - type: entity
  parent: DrinkCanBaseFull
-  id: DrinkPurpleCan
-  name: purple can
-  description: ''
+  id: DrinkGrapeCan
+  name: grape soda can
+  description: 'Sweetened drink with a grape flavor and a deep purple color.'
  components:
  - type: Sprite
    sprite: Objects/Drinks/purple_can.rsi
  - type: Icon
    sprite: Objects/Drinks/purple_can.rsi
+  - type: Item
+    sprite: Objects/Drinks/purple_can.rsi

 - type: entity
  parent: DrinkCanBaseFull
@@ -73,6 +81,8 @@
    sprite: Objects/Drinks/space_mountain_wind.rsi
  - type: Icon
    sprite: Objects/Drinks/space_mountain_wind.rsi
+  - type: Item
+    sprite: Objects/Drinks/space_mountain_wind.rsi

 - type: entity
  parent: DrinkCanBaseFull
@@ -84,6 +94,8 @@
    sprite: Objects/Drinks/space-up.rsi
  - type: Icon
    sprite: Objects/Drinks/space-up.rsi
+  - type: Item
+    sprite: Objects/Drinks/space-up.rsi

 - type: entity
  parent: DrinkCanBaseFull
@@ -95,6 +107,8 @@
    sprite: Objects/Drinks/starkist.rsi
  - type: Icon
    sprite: Objects/Drinks/starkist.rsi
+  - type: Item
+    sprite: Objects/Drinks/starkist.rsi

 - type: entity
  parent: DrinkCanBaseFull
@@ -106,6 +120,8 @@
    sprite: Objects/Drinks/thirteen_loko.rsi
  - type: Icon
    sprite: Objects/Drinks/thirteen_loko.rsi
+  - type: Item
+    sprite: Objects/Drinks/thirteen_loko.rsi

 - type: entity
  parent: DrinkCanBaseFull
@@ -118,6 +134,8 @@
    sprite: Objects/Drinks/changelingsting.rsi
  - type: Icon
    sprite: Objects/Drinks/changelingsting.rsi
+  - type: Item
+    sprite: Objects/Drinks/changelingsting.rsi

 - type: entity
  parent: DrinkCanBaseFull
@@ -130,6 +148,8 @@
    sprite: Objects/Drinks/dr_gibb.rsi
  - type: Icon
    sprite: Objects/Drinks/dr_gibb.rsi
+  - type: Item
+    sprite: Objects/Drinks/dr_gibb.rsi

 - type: entity
  parent: DrinkCanBaseFull
@@ -142,20 +162,5 @@
    sprite: Objects/Drinks/energy_drink.rsi
  - type: Icon
    sprite: Objects/Drinks/energy_drink.rsi
-
- type: entity
-  parent: DrinkCanBaseFull
-  id: DrinkGrapeSoda
-  name: Grape soda
-  description: Sweetened drink with a grape flavor and a deep purple color.
-  components:
-  - type: Drink
-  - type: Solution
-    contents:
-      reagents:
-      - ReagentId: chem.Cola
-        Quantity: 20
-  - type: Sprite
-    sprite: Objects/Drinks/grapesoda.rsi
-  - type: Icon
-    sprite: Objects/Drinks/grapesoda.rsi
+  - type: Item
+    sprite: Objects/Drinks/energy_drink.rsi
--- a/Resources/Prototypes/Entities/Items/Consumables/food.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/food.yml
@@ -36,6 +36,8 @@
    sprite: Objects/Food/4no_raisins.rsi
  - type: Icon
    sprite: Objects/Food/4no_raisins.rsi
+  - type: Item
+    sprite: Objects/Food/4no_raisins.rsi

 - type: entity
  name: aesir salad
@@ -358,6 +360,8 @@
    sprite: Objects/Food/candy.rsi
  - type: Icon
    sprite: Objects/Food/candy.rsi
+  - type: Item
+    sprite: Objects/Food/candy.rsi

 - type: entity
  name: candy corn
@@ -444,6 +448,8 @@
    sprite: Objects/Food/cheeseburger.rsi
  - type: Icon
    sprite: Objects/Food/cheeseburger.rsi
+  - type: Item
+    sprite: Objects/Food/cheeseburger.rsi

 - type: entity
  name: cheesecake (slice)
@@ -548,6 +554,8 @@
    sprite: Objects/Food/chips.rsi
  - type: Icon
    sprite: Objects/Food/chips.rsi
+  - type: Item
+    sprite: Objects/Food/chips.rsi

 - type: entity
  name: chocolate bar
@@ -614,6 +622,8 @@
    sprite: Objects/Food/clownburger.rsi
  - type: Icon
    sprite: Objects/Food/clownburger.rsi
+  - type: Item
+    sprite: Objects/Food/clownburger.rsi

 - type: entity
  name: clown's tears
@@ -793,6 +803,8 @@
    sprite: Objects/Food/donut1.rsi
  - type: Icon
    sprite: Objects/Food/donut1.rsi
+  - type: Item
+    sprite: Objects/Food/donut1.rsi

 - type: entity
  parent: FoodBase
@@ -809,6 +821,8 @@
    sprite: Objects/Food/donut2.rsi
  - type: Icon
    sprite: Objects/Food/donut2.rsi
+  - type: Item
+    sprite: Objects/Food/donut2.rsi

 - type: entity
  parent: FoodBase
@@ -825,6 +839,8 @@
    sprite: Objects/Food/egg-blue.rsi
  - type: Icon
    sprite: Objects/Food/egg-blue.rsi
+  - type: Item
+    sprite: Objects/Food/egg-blue.rsi

 - type: entity
  parent: FoodBase
@@ -841,6 +857,8 @@
    sprite: Objects/Food/egg-green.rsi
  - type: Icon
    sprite: Objects/Food/egg-green.rsi
+  - type: Item
+    sprite: Objects/Food/egg-green.rsi

 - type: entity
  parent: FoodBase
@@ -857,6 +875,8 @@
    sprite: Objects/Food/egg-mime.rsi
  - type: Icon
    sprite: Objects/Food/egg-mime.rsi
+  - type: Item
+    sprite: Objects/Food/egg-mime.rsi

 - type: entity
  parent: FoodBase
@@ -873,6 +893,8 @@
    sprite: Objects/Food/egg-orange.rsi
  - type: Icon
    sprite: Objects/Food/egg-orange.rsi
+  - type: Item
+    sprite: Objects/Food/egg-orange.rsi

 - type: entity
  parent: FoodBase
@@ -889,6 +911,8 @@
    sprite: Objects/Food/egg-purple.rsi
  - type: Icon
    sprite: Objects/Food/egg-purple.rsi
+  - type: Item
+    sprite: Objects/Food/egg-purple.rsi

 - type: entity
  parent: FoodBase
@@ -905,6 +929,8 @@
    sprite: Objects/Food/egg-rainbow.rsi
  - type: Icon
    sprite: Objects/Food/egg-rainbow.rsi
+  - type: Item
+    sprite: Objects/Food/egg-rainbow.rsi

 - type: entity
  parent: FoodBase
@@ -921,6 +947,9 @@
    sprite: Objects/Food/egg-red.rsi
  - type: Icon
    sprite: Objects/Food/egg-red.rsi
+  - type: Item
+    sprite: Objects/Food/egg-red.rsi
+

 - type: entity
  parent: FoodBase
@@ -937,6 +966,8 @@
    sprite: Objects/Food/egg-yellow.rsi
  - type: Icon
    sprite: Objects/Food/egg-yellow.rsi
+  - type: Item
+    sprite: Objects/Food/egg-yellow.rsi

 - type: entity
  parent: FoodBase
@@ -953,6 +984,8 @@
    sprite: Objects/Food/egg.rsi
  - type: Icon
    sprite: Objects/Food/egg.rsi
+  - type: Item
+    sprite: Objects/Food/egg.rsi

 - type: entity
  parent: FoodBase
@@ -1066,6 +1099,8 @@
    sprite: Objects/Food/fishburger.rsi
  - type: Icon
    sprite: Objects/Food/fishburger.rsi
+  - type: Item
+    sprite: Objects/Food/fishburger.rsi

 #- type: entity
 #  parent: FoodBase
@@ -1214,6 +1249,8 @@
    sprite: Objects/Food/hburger.rsi
  - type: Icon
    sprite: Objects/Food/hburger.rsi
+  - type: Item
+    sprite: Objects/Food/hburger.rsi

 - type: entity
  parent: FoodBase
@@ -1378,6 +1415,8 @@
    sprite: Objects/Food/jellyburger.rsi
  - type: Icon
    sprite: Objects/Food/jellyburger.rsi
+  - type: Item
+    sprite: Objects/Food/jellyburger.rsi

 - type: entity
  parent: FoodBase
@@ -1563,6 +1602,8 @@
    sprite: Objects/Food/meatball.rsi
  - type: Icon
    sprite: Objects/Food/meatball.rsi
+  - type: Item
+    sprite: Objects/Food/meatball.rsi

 - type: entity
  parent: FoodBase
@@ -1750,6 +1791,8 @@
    sprite: Objects/Food/hburger.rsi
  - type: Icon
    sprite: Objects/Food/hburger.rsi
+  - type: Item
+    sprite: Objects/Food/hburger.rsi

 - type: entity
  parent: FoodBase
@@ -1785,22 +1828,6 @@
  - type: Icon
    sprite: Objects/Food/monkeysdelight.rsi

- type: entity
-  parent: FoodBase
-  id: FoodMonkiesDelightOld
-  name: monkies delight (old)
-  description: ''
-  components:
-  - type: Solution
-    contents:
-      reagents:
-      - ReagentId: chem.Nutriment
-        Quantity: 30
-  - type: Sprite
-    sprite: Objects/Food/monkiesdelightold.rsi
-  - type: Icon
-    sprite: Objects/Food/monkiesdelightold.rsi
-
 #- type: entity
 #  parent: FoodBase
 #  id: FoodMtearp
@@ -2313,6 +2340,8 @@
    sprite: Objects/Food/sosjerky.rsi
  - type: Icon
    sprite: Objects/Food/sosjerky.rsi
+  - type: Item
+    sprite: Objects/Food/sosjerky.rsi

 - type: entity
  parent: FoodBase
@@ -2449,22 +2478,8 @@
    sprite: Objects/Food/spellburger.rsi
  - type: Icon
    sprite: Objects/Food/spellburger.rsi
-
- type: entity
-  parent: FoodBase
-  id: FoodSpellburgerold
-  name: spell burger (old)
-  description: This is absolutely Ei Nath.
-  components:
-  - type: Solution
-    contents:
-      reagents:
-      - ReagentId: chem.Nutriment
-        Quantity: 12
-  - type: Sprite
-    sprite: Objects/Food/spellburgerold.rsi
-  - type: Icon
-    sprite: Objects/Food/spellburgerold.rsi
+  - type: Item
+    sprite: Objects/Food/spellburger.rsi

 - type: entity
  parent: FoodBase
@@ -2697,6 +2712,8 @@
    sprite: Objects/Food/tofuburger.rsi
  - type: Icon
    sprite: Objects/Food/tofuburger.rsi
+  - type: Item
+    sprite: Objects/Food/tofuburger.rsi

 - type: entity
  parent: FoodBase
@@ -2919,6 +2936,8 @@
    sprite: Objects/Food/xburger.rsi
  - type: Icon
    sprite: Objects/Food/xburger.rsi
+  - type: Item
+    sprite: Objects/Food/xburger.rsi

 - type: entity
  parent: FoodBase
--- a/Resources/Prototypes/Entities/Items/Consumables/food_containers.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/food_containers.yml
@@ -176,6 +176,8 @@
    sprite: Objects/FoodContainers/eggbox_shut.rsi
  - type: Icon
    sprite: Objects/FoodContainers/eggbox_shut.rsi
+  - type: Item
+    sprite: Objects/FoodContainers/eggbox_shut.rsi

 - type: entity
  parent: FoodContainerBase
@@ -192,6 +194,8 @@
  - type: Icon
    sprite: Objects/FoodContainers/eggbox.rsi
    state: eggbox-12
+  - type: Item
+    sprite: Objects/FoodContainers/eggbox.rsi
  - type: Appearance
    visuals:
    - type: FoodContainerVisualizer2D
@@ -339,9 +343,11 @@
      FoodContainerMushroomPizza: 25
      FoodContainerVegetablePizza: 25
  - type: Sprite
-    sprite: Objects/FoodContainers/pizzabox_open.rsi
+    sprite: Objects/FoodContainers/pizzabox.rsi
  - type: Icon
-    sprite: Objects/FoodContainers/pizzabox_open.rsi
+    sprite: Objects/FoodContainers/pizzabox.rsi
+  - type: Item
+    sprite: Objects/FoodContainers/pizzabox.rsi

 - type: entity
  parent: FoodContainerBase
@@ -383,6 +389,8 @@
    sprite: Objects/FoodContainers/pumpkinpie.rsi
  - type: Icon
    sprite: Objects/FoodContainers/pumpkinpie.rsi
+  - type: Item
+    sprite: Objects/FoodContainers/pumpkinpie.rsi

 - type: entity
  parent: FoodContainerBase
--- a/Resources/Prototypes/Entities/Items/chemistry.yml
+++ b/Resources/Prototypes/Entities/Items/chemistry.yml
@@ -8,6 +8,9 @@
    texture: Objects/Chemistry/chemicals.rsi/beaker.png
  - type: Icon
    texture: Objects/Chemistry/chemicals.rsi/beaker.png
+  - type: Item
+    sprite: Objects/Chemistry/chemicals.rsi
+    HeldPrefix: beaker
  - type: Solution
    fillingState: beaker
    maxVol: 50
@@ -25,6 +28,9 @@
    texture: Objects/Chemistry/chemicals.rsi/beakerlarge.png
  - type: Icon
    texture: Objects/Chemistry/chemicals.rsi/beakerlarge.png
+  - type: Item
+    sprite: Objects/Chemistry/chemicals.rsi
+    HeldPrefix: beaker
  - type: Solution
    fillingState: beakerlarge
    maxVol: 100
--- a/Resources/Prototypes/Entities/Items/flashlight.yml
+++ b/Resources/Prototypes/Entities/Items/flashlight.yml
@@ -15,6 +15,9 @@
  - type: Icon
    sprite: Objects/Tools/flashlight.rsi
    state: lantern_off
+  - type: Item
+    sprite: Objects/Tools/flashlight.rsi
+    HeldPrefix: off
  - type: PointLight
    enabled: false
    radius: 3
--- a/Resources/Prototypes/Entities/Items/materials.yml
+++ b/Resources/Prototypes/Entities/Items/materials.yml
@@ -20,9 +20,14 @@
  - type: Stack
    stacktype: enum.StackType.Metal
  - type: Sprite
-    texture: Objects/Materials/sheet_metal.png
+    sprite: Objects/Materials/sheets.rsi
+    state: metal
  - type: Icon
-    texture: Objects/Materials/sheet_metal.png
+    sprite: Objects/Materials/sheets.rsi
+    state: metal
+  - type: Item
+    sprite: Objects/Materials/sheets.rsi
+    HeldPrefix: metal

 - type: entity
  id: SteelSheet1
@@ -44,9 +49,14 @@
  - type: Stack
    stacktype: enum.StackType.Glass
  - type: Sprite
-    texture: Objects/Materials/sheet_glass.png
+    sprite: Objects/Materials/sheets.rsi
+    state: glass
  - type: Icon
-    texture: Objects/Materials/sheet_glass.png
+    sprite: Objects/Materials/sheets.rsi
+    state: glass
+  - type: Item
+    sprite: Objects/Materials/sheets.rsi
+    HeldPrefix: glass

 - type: entity
  id: GlassSheet1
@@ -104,3 +114,42 @@
  components:
  - type: Stack
    count: 1
+
+- type: entity
+  name: phoron ore
+  id: OrePhoron
+  parent: BaseItem
+  components:
+  - type: Sprite
+    texture: Objects/Materials/phoron_ore.png
+  - type: Icon
+    texture: Objects/Materials/phoron_ore.png
+
+- type: entity
+  name: phoron sheet
+  id: PhoronStack
+  parent: MaterialStack
+  components:
+  - type: Material
+    materials:
+    - key: enum.MaterialKeys.Stack
+      mat: phoron
+  - type: Stack
+    stacktype: enum.StackType.Phoron
+  - type: Sprite
+    sprite: Objects/Materials/sheets.rsi
+    state: phoron
+  - type: Icon
+    sprite: Objects/Materials/sheets.rsi
+    state: phoron
+  - type: Item
+    sprite: Objects/Materials/sheets.rsi
+    HeldPrefix: phoron
+
+- type: entity
+  id: PhoronStack1
+  name: phoron sheet 1
+  parent: PhoronStack
+  components:
+  - type: Stack
+    count: 1
--- a/Resources/Prototypes/Entities/Items/tiles.yml
+++ b/Resources/Prototypes/Entities/Items/tiles.yml
@@ -18,12 +18,16 @@
    max: 8

 - type: entity
-  name: Steel Floor Tile
+  name: steel floor tile
  parent: FloorTileItemBase
  id: FloorTileItemSteel
+  components:
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_steel

 - type: entity
-  name: Carpet Floor Tile
+  name: carpet floor tile
  parent: FloorTileItemBase
  id: FloorTileItemCarpet
  components:
@@ -33,6 +37,9 @@
  - type: Icon
    sprite: Objects/Tiles/tile.rsi
    state: tile_carpet
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_carpet
  - type: FloorTile
    output: floor_carpet
  - type: Stack
@@ -49,6 +56,9 @@
  - type: Icon
    sprite: Objects/Tiles/tile.rsi
    state: tile_wood
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_wood
  - type: FloorTile
    output: floor_wood
  - type: Stack
@@ -67,6 +77,9 @@
  - type: Icon
    sprite: Objects/Tiles/tile.rsi
    state: tile_white
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_white
  - type: FloorTile
    output: floor_white
  - type: Stack
@@ -85,6 +98,9 @@
  - type: Icon
    sprite: Objects/Tiles/tile.rsi
    state: tile_dark
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_dark
  - type: FloorTile
    output: floor_dark
  - type: Stack
@@ -103,6 +119,9 @@
  - type: Icon
    sprite: Objects/Tiles/tile.rsi
    state: tile_dark_techfloor_grid
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_dark
  - type: FloorTile
    output: floor_techmaint

@@ -113,9 +132,199 @@
  components:
  - type: Sprite
    sprite: Objects/Tiles/tile.rsi
-    state: tile_cafe #this is close enough for now.
+    state: tile_showroom
  - type: Icon
    sprite: Objects/Tiles/tile.rsi
-    state: tile_cafe
+    state: tile_showroom
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_showroom
  - type: FloorTile
    output: floor_freezer
+
+- type: entity
+  name: floor tile showroom
+  parent: FloorTileItemBase
+  id: FloorTileItemShowroom
+  components:
+  - type: Sprite
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_showroom
+  - type: Icon
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_showroom
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_showroom
+  - type: FloorTile
+    output: floor_showroom
+
+- type: entity
+  name: floor tile snow
+  parent: FloorTileItemBase
+  id: FloorTileItemSnow
+  components:
+  - type: Sprite
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_snow
+  - type: Icon
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_snow
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_silver
+  - type: FloorTile
+    output: floor_snow
+
+- type: entity
+  name: floor tile green circuit
+  parent: FloorTileItemBase
+  id: FloorTileItemGCircuit
+  components:
+  - type: Sprite
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_gcircuit
+  - type: Icon
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_gcircuit
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_silver
+  - type: FloorTile
+    output: floor_green_circuit
+
+- type: entity
+  name: floor tile gold
+  parent: FloorTileItemBase
+  id: FloorTileItemGold
+  components:
+  - type: Sprite
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_gold
+  - type: Icon
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_gold
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_gold
+  - type: FloorTile
+    output: floor_gold
+
+- type: entity
+  name: floor tile reinforced
+  parent: FloorTileItemBase
+  id: FloorTileItemReinforced
+  components:
+  - type: Sprite
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_reinforced
+  - type: Icon
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_reinforced
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_reinforced
+  - type: FloorTile
+    output: floor_reinforced
+
+- type: entity
+  name: floor tile rock
+  parent: FloorTileItemBase
+  id: FloorTileItemRock
+  components:
+  - type: Sprite
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_rockvault
+  - type: Icon
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_rockvault
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_steel
+  - type: FloorTile
+    output: floor_rockvault
+
+- type: entity
+  name: floor tile mono
+  parent: FloorTileItemBase
+  id: FloorTileItemMono
+  components:
+  - type: Sprite
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_white_monofloor
+  - type: Icon
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_white_monofloor
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_steel
+  - type: FloorTile
+    output: floor_mono
+
+- type: entity
+  name: floor tile linoleum
+  parent: FloorTileItemBase
+  id: FloorTileItemLino
+  components:
+  - type: Sprite
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_white_monofloor
+  - type: Icon
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_white_monofloor
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_steel
+  - type: FloorTile
+    output: floor_lino
+
+- type: entity
+  name: floor tile asteroid
+  parent: FloorTileItemBase
+  id: FloorTileItemAsteroid
+  components:
+  - type: Sprite
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_white
+  - type: Icon
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_white
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_brown
+  - type: FloorTile
+    output: floor_asteroid_tile
+
+- type: entity
+  name: floor tile hydro
+  parent: FloorTileItemBase
+  id: FloorTileItemHydro
+  components:
+  - type: Sprite
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_hydro
+  - type: Icon
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_hydro
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_hydro
+  - type: FloorTile
+    output: floor_hydro
+
+- type: entity
+  name: floor tile dirty
+  parent: FloorTileItemBase
+  id: FloorTileItemDirty
+  components:
+  - type: Sprite
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_dirty
+  - type: Icon
+    sprite: Objects/Tiles/tile.rsi
+    state: tile_dirty
+  - type: Item
+    sprite: Objects/Tiles/tile.rsi
+    HeldPrefix: tile_brown
+  - type: FloorTile
+    output: floor_steel_dirty
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -72,6 +72,7 @@
  can_crowbar: true
  footstep_sounds: footstep_floor
  friction: 0.35
+  item_drop: FloorTileItemGCircuit

 - type: tile
  name: floor_lino
@@ -84,6 +85,7 @@
  can_crowbar: true
  footstep_sounds: footstep_floor
  friction: 0.35
+  item_drop: FloorTileItemLino

 - type: tile
  name: floor_mono
@@ -96,6 +98,7 @@
  can_crowbar: true
  footstep_sounds: footstep_floor
  friction: 0.35
+  item_drop: FloorTileItemMono

 - type: tile
  name: floor_reinforced
@@ -108,10 +111,11 @@
  can_crowbar: true
  footstep_sounds: footstep_floor
  friction: 0.35
+  item_drop: FloorTileItemReinforced

 - type: tile
  name: floor_rock_vault
-  display_name: Rock vault floor
+  display_name: rock floor
  texture: "rock_vault"
  base_turfs:
  - space
@@ -120,6 +124,7 @@
  can_crowbar: true
  footstep_sounds: footstep_floor
  friction: 0.35
+  item_drop: FloorTileItemRock

 - type: tile
  name: floor_showroom
@@ -132,6 +137,7 @@
  can_crowbar: true
  footstep_sounds: footstep_floor
  friction: 0.35
+  item_drop: FloorTileItemShowroom

 - type: tile
  name: floor_steel
@@ -157,6 +163,7 @@
  can_crowbar: true
  footstep_sounds: footstep_floor
  friction: 0.35
+  item_drop: FloorTileItemDirty

 - type: tile
  name: floor_techmaint
@@ -201,10 +208,12 @@
  texture: asteroid_tile
  base_turfs:
  - space
+  - underplating
  is_subfloor: false
-  can_crowbar: false
+  can_crowbar: true
  footstep_sounds: footstep_asteroid
  friction: 0.35
+  item_drop: FloorTileItemAsteroid

 - type: tile
  name: floor_asteroid_coarse_sand0
@@ -249,3 +258,27 @@
  can_crowbar: false
  footstep_sounds: footstep_asteroid
  friction: 0.35
+
+- type: tile
+  name: floor_snow
+  display_name: Snow
+  texture: snow
+  base_turfs:
+  - space
+  is_subfloor: false
+  can_crowbar: false
+  footstep_sounds: snowstep
+  friction: 0.35
+
+- type: tile
+  name: floor_gold
+  display_name: Gold Tile
+  texture: gold
+  base_turfs:
+  - space
+  - underplating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds: footstep_floor
+  friction: 0.35
+  item_drop: FloorTileItemGold
--- a/Resources/Prototypes/materials.yml
+++ b/Resources/Prototypes/materials.yml
@@ -26,3 +26,12 @@
  electricresistivity: 8.0e-9
  thermalconductivity: 30
  specificheat: 1000
+
+- type: material
+  id: phoron
+  name: phoron
+  icon: Objects/Materials/phoron_sheet.png
+  density: 200
+  electricresistivity: 2.1e-1
+  thermalconductivity: 80
+  specificheat: 2000