diff --git a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer2D.cs b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer2D.cs
index e8eb61f505..21a22f9569 100644
--- a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer2D.cs
+++ b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer2D.cs
@@ -17,6 +17,7 @@ namespace Content.Client.GameObjects.Components.Power
private Animation _insertingMetalAnimation;
private Animation _insertingGlassAnimation;
private Animation _insertingGoldAnimation;
+ private Animation _insertingPhoronAnimation;
public override void LoadData(YamlMappingNode node)
{
@@ -26,6 +27,7 @@ namespace Content.Client.GameObjects.Components.Power
_insertingMetalAnimation = PopulateAnimation("autolathe_inserting_metal_plate", "autolathe_inserting_unlit", 0.9f);
_insertingGlassAnimation = PopulateAnimation("autolathe_inserting_glass_plate", "autolathe_inserting_unlit", 0.9f);
_insertingGoldAnimation = PopulateAnimation("autolathe_inserting_gold_plate", "autolathe_inserting_unlit", 0.9f);
+ _insertingPhoronAnimation = PopulateAnimation("autolathe_inserting_phoron_sheet", "autolathe_inserting_unlit", 0.9f);
}
private Animation PopulateAnimation(string sprite, string spriteUnlit, float length)
@@ -99,6 +101,12 @@ namespace Content.Client.GameObjects.Components.Power
animPlayer.Play(_insertingGoldAnimation, AnimationKey);
}
break;
+ case LatheVisualState.InsertingPhoron:
+ if (!animPlayer.HasRunningAnimation(AnimationKey))
+ {
+ animPlayer.Play(_insertingPhoronAnimation, AnimationKey);
+ }
+ break;
default:
throw new ArgumentOutOfRangeException();
}
diff --git a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer2D.cs b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer2D.cs
index cc58ff6c53..5049757bba 100644
--- a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer2D.cs
+++ b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer2D.cs
@@ -17,6 +17,7 @@ namespace Content.Client.GameObjects.Components.Power
private Animation _insertingMetalAnimation;
private Animation _insertingGlassAnimation;
private Animation _insertingGoldAnimation;
+ private Animation _insertingPhoronAnimation;
public override void LoadData(YamlMappingNode node)
{
@@ -26,6 +27,7 @@ namespace Content.Client.GameObjects.Components.Power
_insertingMetalAnimation = PopulateAnimation("protolathe_metal", 0.9f);
_insertingGlassAnimation = PopulateAnimation("protolathe_glass", 0.9f);
_insertingGoldAnimation = PopulateAnimation("protolathe_gold", 0.9f);
+ _insertingPhoronAnimation = PopulateAnimation("protolathe_phoron", 0.9f);
}
private Animation PopulateAnimation(string sprite, float length)
@@ -95,6 +97,12 @@ namespace Content.Client.GameObjects.Components.Power
animPlayer.Play(_insertingGoldAnimation, AnimationKey);
}
break;
+ case LatheVisualState.InsertingPhoron:
+ if (!animPlayer.HasRunningAnimation(AnimationKey))
+ {
+ animPlayer.Play(_insertingPhoronAnimation, AnimationKey);
+ }
+ break;
default:
throw new ArgumentOutOfRangeException();
}
diff --git a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs
index 8df9819af5..9f9a5b303a 100644
--- a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs
+++ b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs
@@ -109,14 +109,17 @@ namespace Content.Server.GameObjects.Components.Interactable
/// True if the light's status was toggled, false otherwise.
private bool ToggleStatus(IEntity user)
{
+ var item = Owner.GetComponent();
// Update sprite and light states to match the activation.
if (Activated)
{
TurnOff();
+ item.EquippedPrefix = "off";
}
else
{
TurnOn(user);
+ item.EquippedPrefix = "on";
}
// Toggle always succeeds.
diff --git a/Content.Shared/Construction/ConstructionPrototype.cs b/Content.Shared/Construction/ConstructionPrototype.cs
index 14e62ca006..7f2db7b7e6 100644
--- a/Content.Shared/Construction/ConstructionPrototype.cs
+++ b/Content.Shared/Construction/ConstructionPrototype.cs
@@ -215,6 +215,7 @@ namespace Content.Shared.Construction
Glass,
Cable,
Gold,
+ Phoron,
}
}
}
diff --git a/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs b/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs
index a8dc5bb3d3..b1965ce364 100644
--- a/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs
+++ b/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs
@@ -10,6 +10,7 @@ namespace Content.Shared.GameObjects.Components.Power
Producing,
InsertingMetal,
InsertingGlass,
- InsertingGold
+ InsertingGold,
+ InsertingPhoron
}
}
diff --git a/Content.Shared/GameObjects/Components/SharedStackComponent.cs b/Content.Shared/GameObjects/Components/SharedStackComponent.cs
index 3713108839..1ea9fc0105 100644
--- a/Content.Shared/GameObjects/Components/SharedStackComponent.cs
+++ b/Content.Shared/GameObjects/Components/SharedStackComponent.cs
@@ -122,6 +122,7 @@ namespace Content.Shared.GameObjects.Components
Glass,
Cable,
Gold,
+ Phoron,
Ointment,
Brutepack,
FloorTileSteel,
diff --git a/Resources/Audio/effects/footsteps/snowstep.ogg b/Resources/Audio/effects/footsteps/snowstep.ogg
new file mode 100644
index 0000000000..fc851b7896
Binary files /dev/null and b/Resources/Audio/effects/footsteps/snowstep.ogg differ
diff --git a/Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml b/Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml
index ec61d026dc..69012c5941 100644
--- 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
diff --git a/Resources/Prototypes/Entities/Items/Consumables/food.yml b/Resources/Prototypes/Entities/Items/Consumables/food.yml
index a76f1400ce..9b83d13d19 100644
--- 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
diff --git a/Resources/Prototypes/Entities/Items/Consumables/food_containers.yml b/Resources/Prototypes/Entities/Items/Consumables/food_containers.yml
index e9441dde1f..f9f10db3dd 100644
--- 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
diff --git a/Resources/Prototypes/Entities/Items/chemistry.yml b/Resources/Prototypes/Entities/Items/chemistry.yml
index 0e68c143a6..0a2c4c2ec9 100644
--- 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
diff --git a/Resources/Prototypes/Entities/Items/flashlight.yml b/Resources/Prototypes/Entities/Items/flashlight.yml
index de0eba2b17..a3c589549b 100644
--- 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
diff --git a/Resources/Prototypes/Entities/Items/materials.yml b/Resources/Prototypes/Entities/Items/materials.yml
index 2c70e2cf58..3a699285df 100644
--- 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
diff --git a/Resources/Prototypes/Entities/Items/tiles.yml b/Resources/Prototypes/Entities/Items/tiles.yml
index 9db491ed44..1360ab0622 100644
--- 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
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 8fab802f48..a023e7f89b 100644
--- 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
diff --git a/Resources/Prototypes/materials.yml b/Resources/Prototypes/materials.yml
index 1686ac7459..4b622b58a7 100644
--- 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
diff --git a/Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_phoron_sheet.png b/Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_phoron_sheet.png
new file mode 100644
index 0000000000..e70942302f
Binary files /dev/null and b/Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_phoron_sheet.png differ
diff --git a/Resources/Textures/Buildings/autolathe.rsi/meta.json b/Resources/Textures/Buildings/autolathe.rsi/meta.json
index 3bbee4b1e5..774336ea07 100644
--- a/Resources/Textures/Buildings/autolathe.rsi/meta.json
+++ b/Resources/Textures/Buildings/autolathe.rsi/meta.json
@@ -91,6 +91,23 @@
]
]
},
+ {
+ "name": "autolathe_inserting_phoron_sheet",
+ "directions": 1,
+ "delays": [
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ]
+ ]
+ },
{
"name": "autolathe_inserting_gold_plate",
"directions": 1,
diff --git a/Resources/Textures/Buildings/research.rsi/meta.json b/Resources/Textures/Buildings/research.rsi/meta.json
index c41bbc75d9..37522e74ff 100644
--- a/Resources/Textures/Buildings/research.rsi/meta.json
+++ b/Resources/Textures/Buildings/research.rsi/meta.json
@@ -258,6 +258,23 @@
]
]
},
+ {
+ "name": "protolathe_phoron",
+ "directions": 1,
+ "delays": [
+ [
+ 0.088,
+ 0.088,
+ 0.088,
+ 0.088,
+ 0.088,
+ 0.088,
+ 0.088,
+ 0.088,
+ 0.088
+ ]
+ ]
+ },
{
"name": "protolathe_building",
"directions": 1,
diff --git a/Resources/Textures/Buildings/research.rsi/protolathe_phoron.png b/Resources/Textures/Buildings/research.rsi/protolathe_phoron.png
new file mode 100644
index 0000000000..f590e9d057
Binary files /dev/null and b/Resources/Textures/Buildings/research.rsi/protolathe_phoron.png differ
diff --git a/Resources/Textures/Objects/Chemistry/chemicals.rsi/beaker-inhand-left.png b/Resources/Textures/Objects/Chemistry/chemicals.rsi/beaker-inhand-left.png
new file mode 100644
index 0000000000..b79f6f97d3
Binary files /dev/null and b/Resources/Textures/Objects/Chemistry/chemicals.rsi/beaker-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Chemistry/chemicals.rsi/beaker-inhand-right.png b/Resources/Textures/Objects/Chemistry/chemicals.rsi/beaker-inhand-right.png
new file mode 100644
index 0000000000..8acf56da76
Binary files /dev/null and b/Resources/Textures/Objects/Chemistry/chemicals.rsi/beaker-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Chemistry/chemicals.rsi/meta.json b/Resources/Textures/Objects/Chemistry/chemicals.rsi/meta.json
index 6ff5767f18..d156e2dd5e 100644
--- a/Resources/Textures/Objects/Chemistry/chemicals.rsi/meta.json
+++ b/Resources/Textures/Objects/Chemistry/chemicals.rsi/meta.json
@@ -1 +1,747 @@
-{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"beaker","directions":1,"delays":[[1]]},{"name":"beakerbluespace","directions":1,"delays":[[0.1,0.1]]},{"name":"beakerlarge","directions":1,"delays":[[1]]},{"name":"beakernoreact","directions":1,"delays":[[0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05]]},{"name":"bottle","directions":1,"delays":[[1]]},{"name":"bottle-1","directions":1,"delays":[[1]]},{"name":"bottle-2","directions":1,"delays":[[1]]},{"name":"bottle-3","directions":1,"delays":[[1]]},{"name":"bottle-4","directions":1,"delays":[[1]]},{"name":"bottle1","directions":1,"delays":[[1]]},{"name":"bottle10","directions":1,"delays":[[1]]},{"name":"bottle11","directions":1,"delays":[[1]]},{"name":"bottle12","directions":1,"delays":[[1]]},{"name":"bottle13","directions":1,"delays":[[1]]},{"name":"bottle14","directions":1,"delays":[[1]]},{"name":"bottle15","directions":1,"delays":[[1]]},{"name":"bottle16","directions":1,"delays":[[1]]},{"name":"bottle17","directions":1,"delays":[[1]]},{"name":"bottle18","directions":1,"delays":[[1]]},{"name":"bottle19","directions":1,"delays":[[1]]},{"name":"bottle2","directions":1,"delays":[[1]]},{"name":"bottle20","directions":1,"delays":[[1]]},{"name":"bottle3","directions":1,"delays":[[1]]},{"name":"bottle4","directions":1,"delays":[[1]]},{"name":"bottle5","directions":1,"delays":[[1]]},{"name":"bottle6","directions":1,"delays":[[1]]},{"name":"bottle7","directions":1,"delays":[[1]]},{"name":"bottle8","directions":1,"delays":[[1]]},{"name":"bottle9","directions":1,"delays":[[1]]},{"name":"chemg","directions":1,"delays":[[1]]},{"name":"chemg_armed","directions":1,"delays":[[0.1,0.2]]},{"name":"chemg_ass","directions":1,"delays":[[1]]},{"name":"chemg_locked","directions":1,"delays":[[1]]},{"name":"chempuff","directions":4,"delays":[[0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1]]},{"name":"dropper","directions":1,"delays":[[1]]},{"name":"large_grenade","directions":1,"delays":[[1]]},{"name":"large_grenade_armed","directions":1,"delays":[[0.1,0.1]]},{"name":"large_grenade_ass","directions":1,"delays":[[1]]},{"name":"large_grenade_locked","directions":1,"delays":[[1]]},{"name":"lid_beaker","directions":1,"delays":[[1]]},{"name":"lid_beakerlarge","directions":1,"delays":[[1]]},{"name":"lid_beakernoreact","directions":1,"delays":[[1]]},{"name":"lid_bottle","directions":1,"delays":[[1]]},{"name":"lid_vial","directions":1,"delays":[[1]]},{"name":"molten","directions":1,"delays":[[1]]},{"name":"pill","directions":1,"delays":[[1]]},{"name":"pill1","directions":1,"delays":[[1]]},{"name":"pill10","directions":1,"delays":[[1]]},{"name":"pill11","directions":1,"delays":[[1]]},{"name":"pill12","directions":1,"delays":[[1]]},{"name":"pill13","directions":1,"delays":[[1]]},{"name":"pill14","directions":1,"delays":[[1]]},{"name":"pill15","directions":1,"delays":[[1]]},{"name":"pill16","directions":1,"delays":[[1]]},{"name":"pill17","directions":1,"delays":[[1]]},{"name":"pill18","directions":1,"delays":[[1]]},{"name":"pill19","directions":1,"delays":[[1]]},{"name":"pill2","directions":1,"delays":[[1]]},{"name":"pill20","directions":1,"delays":[[1]]},{"name":"pill3","directions":1,"delays":[[1]]},{"name":"pill4","directions":1,"delays":[[1]]},{"name":"pill5","directions":1,"delays":[[1]]},{"name":"pill6","directions":1,"delays":[[1]]},{"name":"pill7","directions":1,"delays":[[1]]},{"name":"pill8","directions":1,"delays":[[1]]},{"name":"pill9","directions":1,"delays":[[1]]},{"name":"pill_canister","directions":1,"delays":[[1]]},{"name":"syringeproj","directions":1,"delays":[[1]]},{"name":"vial","directions":1,"delays":[[1]]},{"name":"weedpuff","directions":4,"delays":[[0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1],[0.1,0.1,0.1,0.1,0.1]]}]}
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi",
+ "states": [
+ {
+ "name": "beaker",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "beakerbluespace",
+ "directions": 1,
+ "delays": [
+ [
+ 0.1,
+ 0.1
+ ]
+ ]
+ },
+ {
+ "name": "beakerlarge",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "beaker-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "beaker-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "beakernoreact",
+ "directions": 1,
+ "delays": [
+ [
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05
+ ]
+ ]
+ },
+ {
+ "name": "bottle",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle-1",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle-2",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle-3",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle-4",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle1",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle10",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle11",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle12",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle13",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle14",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle15",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle16",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle17",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle18",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle19",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle2",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle20",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle3",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle4",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle5",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle6",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle7",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle8",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "bottle9",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "chemg",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "chemg_armed",
+ "directions": 1,
+ "delays": [
+ [
+ 0.1,
+ 0.2
+ ]
+ ]
+ },
+ {
+ "name": "chemg_ass",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "chemg_locked",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "chempuff",
+ "directions": 4,
+ "delays": [
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ]
+ ]
+ },
+ {
+ "name": "dropper",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "large_grenade",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "large_grenade_armed",
+ "directions": 1,
+ "delays": [
+ [
+ 0.1,
+ 0.1
+ ]
+ ]
+ },
+ {
+ "name": "large_grenade_ass",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "large_grenade_locked",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "lid_beaker",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "lid_beakerlarge",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "lid_beakernoreact",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "lid_bottle",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "lid_vial",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "molten",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill1",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill10",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill11",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill12",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill13",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill14",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill15",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill16",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill17",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill18",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill19",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill2",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill20",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill3",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill4",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill5",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill6",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill7",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill8",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill9",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "pill_canister",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "syringeproj",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "vial",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "weedpuff",
+ "directions": 4,
+ "delays": [
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ],
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Drinks/coffee.rsi/inhand-left.png b/Resources/Textures/Objects/Drinks/coffee.rsi/inhand-left.png
new file mode 100644
index 0000000000..1b4f701420
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/coffee.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Drinks/coffee.rsi/inhand-right.png b/Resources/Textures/Objects/Drinks/coffee.rsi/inhand-right.png
new file mode 100644
index 0000000000..038b2b5522
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/coffee.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Drinks/coffee.rsi/meta.json b/Resources/Textures/Objects/Drinks/coffee.rsi/meta.json
index a2bca69076..1c7849ada7 100644
--- a/Resources/Textures/Objects/Drinks/coffee.rsi/meta.json
+++ b/Resources/Textures/Objects/Drinks/coffee.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Drinks/cola.rsi/inhand-left.png b/Resources/Textures/Objects/Drinks/cola.rsi/inhand-left.png
new file mode 100644
index 0000000000..477a29c3e2
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/cola.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Drinks/cola.rsi/inhand-right.png b/Resources/Textures/Objects/Drinks/cola.rsi/inhand-right.png
new file mode 100644
index 0000000000..23a82d03f8
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/cola.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Drinks/cola.rsi/meta.json b/Resources/Textures/Objects/Drinks/cola.rsi/meta.json
index a2bca69076..1c7849ada7 100644
--- a/Resources/Textures/Objects/Drinks/cola.rsi/meta.json
+++ b/Resources/Textures/Objects/Drinks/cola.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Drinks/dr_gibb.rsi/inhand-left.png b/Resources/Textures/Objects/Drinks/dr_gibb.rsi/inhand-left.png
new file mode 100644
index 0000000000..b831c1087e
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/dr_gibb.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Drinks/dr_gibb.rsi/inhand-right.png b/Resources/Textures/Objects/Drinks/dr_gibb.rsi/inhand-right.png
new file mode 100644
index 0000000000..4767d514b1
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/dr_gibb.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Drinks/dr_gibb.rsi/meta.json b/Resources/Textures/Objects/Drinks/dr_gibb.rsi/meta.json
index a2bca69076..1c7849ada7 100644
--- a/Resources/Textures/Objects/Drinks/dr_gibb.rsi/meta.json
+++ b/Resources/Textures/Objects/Drinks/dr_gibb.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Drinks/energy_drink.rsi/inhand-left.png b/Resources/Textures/Objects/Drinks/energy_drink.rsi/inhand-left.png
new file mode 100644
index 0000000000..365b3aa812
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/energy_drink.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Drinks/energy_drink.rsi/inhand-right.png b/Resources/Textures/Objects/Drinks/energy_drink.rsi/inhand-right.png
new file mode 100644
index 0000000000..c929a445b1
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/energy_drink.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Drinks/energy_drink.rsi/meta.json b/Resources/Textures/Objects/Drinks/energy_drink.rsi/meta.json
index a2bca69076..1c7849ada7 100644
--- a/Resources/Textures/Objects/Drinks/energy_drink.rsi/meta.json
+++ b/Resources/Textures/Objects/Drinks/energy_drink.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Drinks/lemon-lime.rsi/inhand-left.png b/Resources/Textures/Objects/Drinks/lemon-lime.rsi/inhand-left.png
new file mode 100644
index 0000000000..de164f3b8c
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/lemon-lime.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Drinks/lemon-lime.rsi/inhand-right.png b/Resources/Textures/Objects/Drinks/lemon-lime.rsi/inhand-right.png
new file mode 100644
index 0000000000..a2382a5b61
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/lemon-lime.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Drinks/lemon-lime.rsi/meta.json b/Resources/Textures/Objects/Drinks/lemon-lime.rsi/meta.json
index a2bca69076..1c7849ada7 100644
--- a/Resources/Textures/Objects/Drinks/lemon-lime.rsi/meta.json
+++ b/Resources/Textures/Objects/Drinks/lemon-lime.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Drinks/purple_can.rsi/inhand-left.png b/Resources/Textures/Objects/Drinks/purple_can.rsi/inhand-left.png
new file mode 100644
index 0000000000..69b2348005
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/purple_can.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Drinks/purple_can.rsi/inhand-right.png b/Resources/Textures/Objects/Drinks/purple_can.rsi/inhand-right.png
new file mode 100644
index 0000000000..71a60e7b0c
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/purple_can.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Drinks/purple_can.rsi/meta.json b/Resources/Textures/Objects/Drinks/purple_can.rsi/meta.json
index a2bca69076..1c7849ada7 100644
--- a/Resources/Textures/Objects/Drinks/purple_can.rsi/meta.json
+++ b/Resources/Textures/Objects/Drinks/purple_can.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Drinks/sodawater.rsi/inhand-left.png b/Resources/Textures/Objects/Drinks/sodawater.rsi/inhand-left.png
new file mode 100644
index 0000000000..2e1c5e06a0
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/sodawater.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Drinks/sodawater.rsi/inhand-right.png b/Resources/Textures/Objects/Drinks/sodawater.rsi/inhand-right.png
new file mode 100644
index 0000000000..4f2a04fd09
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/sodawater.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Drinks/sodawater.rsi/meta.json b/Resources/Textures/Objects/Drinks/sodawater.rsi/meta.json
index a2bca69076..1c7849ada7 100644
--- a/Resources/Textures/Objects/Drinks/sodawater.rsi/meta.json
+++ b/Resources/Textures/Objects/Drinks/sodawater.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Drinks/space-up.rsi/inhand-left.png b/Resources/Textures/Objects/Drinks/space-up.rsi/inhand-left.png
new file mode 100644
index 0000000000..1d68344ef4
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/space-up.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Drinks/space-up.rsi/inhand-right.png b/Resources/Textures/Objects/Drinks/space-up.rsi/inhand-right.png
new file mode 100644
index 0000000000..88e420e703
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/space-up.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Drinks/space-up.rsi/meta.json b/Resources/Textures/Objects/Drinks/space-up.rsi/meta.json
index a2bca69076..1c7849ada7 100644
--- a/Resources/Textures/Objects/Drinks/space-up.rsi/meta.json
+++ b/Resources/Textures/Objects/Drinks/space-up.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Drinks/space_mountain_wind.rsi/inhand-left.png b/Resources/Textures/Objects/Drinks/space_mountain_wind.rsi/inhand-left.png
new file mode 100644
index 0000000000..d1cd7229ee
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/space_mountain_wind.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Drinks/space_mountain_wind.rsi/inhand-right.png b/Resources/Textures/Objects/Drinks/space_mountain_wind.rsi/inhand-right.png
new file mode 100644
index 0000000000..5843404b9d
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/space_mountain_wind.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Drinks/space_mountain_wind.rsi/meta.json b/Resources/Textures/Objects/Drinks/space_mountain_wind.rsi/meta.json
index a2bca69076..1c7849ada7 100644
--- a/Resources/Textures/Objects/Drinks/space_mountain_wind.rsi/meta.json
+++ b/Resources/Textures/Objects/Drinks/space_mountain_wind.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Drinks/starkist.rsi/inhand-left.png b/Resources/Textures/Objects/Drinks/starkist.rsi/inhand-left.png
new file mode 100644
index 0000000000..2c4de36e61
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/starkist.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Drinks/starkist.rsi/inhand-right.png b/Resources/Textures/Objects/Drinks/starkist.rsi/inhand-right.png
new file mode 100644
index 0000000000..be9651c155
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/starkist.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Drinks/starkist.rsi/meta.json b/Resources/Textures/Objects/Drinks/starkist.rsi/meta.json
index a2bca69076..1c7849ada7 100644
--- a/Resources/Textures/Objects/Drinks/starkist.rsi/meta.json
+++ b/Resources/Textures/Objects/Drinks/starkist.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Drinks/thirteen_loko.rsi/inhand-left.png b/Resources/Textures/Objects/Drinks/thirteen_loko.rsi/inhand-left.png
new file mode 100644
index 0000000000..642fade8f8
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/thirteen_loko.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Drinks/thirteen_loko.rsi/inhand-right.png b/Resources/Textures/Objects/Drinks/thirteen_loko.rsi/inhand-right.png
new file mode 100644
index 0000000000..6c8548832a
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/thirteen_loko.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Drinks/thirteen_loko.rsi/meta.json b/Resources/Textures/Objects/Drinks/thirteen_loko.rsi/meta.json
index a2bca69076..1c7849ada7 100644
--- a/Resources/Textures/Objects/Drinks/thirteen_loko.rsi/meta.json
+++ b/Resources/Textures/Objects/Drinks/thirteen_loko.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Drinks/tonic.rsi/inhand-left.png b/Resources/Textures/Objects/Drinks/tonic.rsi/inhand-left.png
new file mode 100644
index 0000000000..0a48331ebf
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/tonic.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Drinks/tonic.rsi/inhand-right.png b/Resources/Textures/Objects/Drinks/tonic.rsi/inhand-right.png
new file mode 100644
index 0000000000..cb145ca151
Binary files /dev/null and b/Resources/Textures/Objects/Drinks/tonic.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Drinks/tonic.rsi/meta.json b/Resources/Textures/Objects/Drinks/tonic.rsi/meta.json
index a2bca69076..1c7849ada7 100644
--- a/Resources/Textures/Objects/Drinks/tonic.rsi/meta.json
+++ b/Resources/Textures/Objects/Drinks/tonic.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/4no_raisins.rsi/inhand-left.png b/Resources/Textures/Objects/Food/4no_raisins.rsi/inhand-left.png
new file mode 100644
index 0000000000..993e02aef2
Binary files /dev/null and b/Resources/Textures/Objects/Food/4no_raisins.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/4no_raisins.rsi/inhand-right.png b/Resources/Textures/Objects/Food/4no_raisins.rsi/inhand-right.png
new file mode 100644
index 0000000000..f36ef75a67
Binary files /dev/null and b/Resources/Textures/Objects/Food/4no_raisins.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/4no_raisins.rsi/meta.json b/Resources/Textures/Objects/Food/4no_raisins.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/4no_raisins.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/4no_raisins.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/bigbiteburger.rsi/inhand-left.png b/Resources/Textures/Objects/Food/bigbiteburger.rsi/inhand-left.png
new file mode 100644
index 0000000000..f5ed6b39cd
Binary files /dev/null and b/Resources/Textures/Objects/Food/bigbiteburger.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/bigbiteburger.rsi/inhand-right.png b/Resources/Textures/Objects/Food/bigbiteburger.rsi/inhand-right.png
new file mode 100644
index 0000000000..9e9290dd8c
Binary files /dev/null and b/Resources/Textures/Objects/Food/bigbiteburger.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/bigbiteburger.rsi/meta.json b/Resources/Textures/Objects/Food/bigbiteburger.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/bigbiteburger.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/bigbiteburger.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/brainburger.rsi/inhand-left.png b/Resources/Textures/Objects/Food/brainburger.rsi/inhand-left.png
new file mode 100644
index 0000000000..f5ed6b39cd
Binary files /dev/null and b/Resources/Textures/Objects/Food/brainburger.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/brainburger.rsi/inhand-right.png b/Resources/Textures/Objects/Food/brainburger.rsi/inhand-right.png
new file mode 100644
index 0000000000..9e9290dd8c
Binary files /dev/null and b/Resources/Textures/Objects/Food/brainburger.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/brainburger.rsi/meta.json b/Resources/Textures/Objects/Food/brainburger.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/brainburger.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/brainburger.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/burger.png b/Resources/Textures/Objects/Food/burger.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Food/burger.png
rename to Resources/Textures/Objects/Food/burger.rsi/icon.png
diff --git a/Resources/Textures/Objects/Food/burger.rsi/inhand-left.png b/Resources/Textures/Objects/Food/burger.rsi/inhand-left.png
new file mode 100644
index 0000000000..f5ed6b39cd
Binary files /dev/null and b/Resources/Textures/Objects/Food/burger.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/burger.rsi/inhand-right.png b/Resources/Textures/Objects/Food/burger.rsi/inhand-right.png
new file mode 100644
index 0000000000..9e9290dd8c
Binary files /dev/null and b/Resources/Textures/Objects/Food/burger.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/burger.rsi/meta.json b/Resources/Textures/Objects/Food/burger.rsi/meta.json
new file mode 100644
index 0000000000..1c7849ada7
--- /dev/null
+++ b/Resources/Textures/Objects/Food/burger.rsi/meta.json
@@ -0,0 +1,51 @@
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/candy.rsi/inhand-left.png b/Resources/Textures/Objects/Food/candy.rsi/inhand-left.png
new file mode 100644
index 0000000000..993e02aef2
Binary files /dev/null and b/Resources/Textures/Objects/Food/candy.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/candy.rsi/inhand-right.png b/Resources/Textures/Objects/Food/candy.rsi/inhand-right.png
new file mode 100644
index 0000000000..f36ef75a67
Binary files /dev/null and b/Resources/Textures/Objects/Food/candy.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/candy.rsi/meta.json b/Resources/Textures/Objects/Food/candy.rsi/meta.json
index e76eafc94d..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/candy.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/candy.rsi/meta.json
@@ -1,15 +1,51 @@
{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
- "states": [
- {
- "name": "icon",
- "directions": 1
- }
- ]
-}
\ No newline at end of file
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/cheeseburger.rsi/inhand-left.png b/Resources/Textures/Objects/Food/cheeseburger.rsi/inhand-left.png
new file mode 100644
index 0000000000..f5ed6b39cd
Binary files /dev/null and b/Resources/Textures/Objects/Food/cheeseburger.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/cheeseburger.rsi/inhand-right.png b/Resources/Textures/Objects/Food/cheeseburger.rsi/inhand-right.png
new file mode 100644
index 0000000000..9e9290dd8c
Binary files /dev/null and b/Resources/Textures/Objects/Food/cheeseburger.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/cheeseburger.rsi/meta.json b/Resources/Textures/Objects/Food/cheeseburger.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/cheeseburger.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/cheeseburger.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/chips.rsi/inhand-left.png b/Resources/Textures/Objects/Food/chips.rsi/inhand-left.png
new file mode 100644
index 0000000000..25375d1ee4
Binary files /dev/null and b/Resources/Textures/Objects/Food/chips.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/chips.rsi/inhand-right.png b/Resources/Textures/Objects/Food/chips.rsi/inhand-right.png
new file mode 100644
index 0000000000..2d95bfabe2
Binary files /dev/null and b/Resources/Textures/Objects/Food/chips.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/chips.rsi/meta.json b/Resources/Textures/Objects/Food/chips.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/chips.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/chips.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/clownburger.rsi/inhand-left.png b/Resources/Textures/Objects/Food/clownburger.rsi/inhand-left.png
new file mode 100644
index 0000000000..f5ed6b39cd
Binary files /dev/null and b/Resources/Textures/Objects/Food/clownburger.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/clownburger.rsi/inhand-right.png b/Resources/Textures/Objects/Food/clownburger.rsi/inhand-right.png
new file mode 100644
index 0000000000..9e9290dd8c
Binary files /dev/null and b/Resources/Textures/Objects/Food/clownburger.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/clownburger.rsi/meta.json b/Resources/Textures/Objects/Food/clownburger.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/clownburger.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/clownburger.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/donut1.rsi/inhand-left.png b/Resources/Textures/Objects/Food/donut1.rsi/inhand-left.png
new file mode 100644
index 0000000000..ca88e81ba7
Binary files /dev/null and b/Resources/Textures/Objects/Food/donut1.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/donut1.rsi/inhand-right.png b/Resources/Textures/Objects/Food/donut1.rsi/inhand-right.png
new file mode 100644
index 0000000000..45966e5939
Binary files /dev/null and b/Resources/Textures/Objects/Food/donut1.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/donut1.rsi/meta.json b/Resources/Textures/Objects/Food/donut1.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/donut1.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/donut1.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/donut2.rsi/inhand-left.png b/Resources/Textures/Objects/Food/donut2.rsi/inhand-left.png
new file mode 100644
index 0000000000..2050ecf613
Binary files /dev/null and b/Resources/Textures/Objects/Food/donut2.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/donut2.rsi/inhand-right.png b/Resources/Textures/Objects/Food/donut2.rsi/inhand-right.png
new file mode 100644
index 0000000000..8ca512c675
Binary files /dev/null and b/Resources/Textures/Objects/Food/donut2.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/donut2.rsi/meta.json b/Resources/Textures/Objects/Food/donut2.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/donut2.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/donut2.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/egg-blue.rsi/inhand-left.png b/Resources/Textures/Objects/Food/egg-blue.rsi/inhand-left.png
new file mode 100644
index 0000000000..cab5b7fb31
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg-blue.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/egg-blue.rsi/inhand-right.png b/Resources/Textures/Objects/Food/egg-blue.rsi/inhand-right.png
new file mode 100644
index 0000000000..03581b6a9d
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg-blue.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/egg-blue.rsi/meta.json b/Resources/Textures/Objects/Food/egg-blue.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/egg-blue.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/egg-blue.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/egg-green.rsi/inhand-left.png b/Resources/Textures/Objects/Food/egg-green.rsi/inhand-left.png
new file mode 100644
index 0000000000..26157e3cae
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg-green.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/egg-green.rsi/inhand-right.png b/Resources/Textures/Objects/Food/egg-green.rsi/inhand-right.png
new file mode 100644
index 0000000000..4923ec9317
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg-green.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/egg-green.rsi/meta.json b/Resources/Textures/Objects/Food/egg-green.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/egg-green.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/egg-green.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/egg-mime.rsi/inhand-left.png b/Resources/Textures/Objects/Food/egg-mime.rsi/inhand-left.png
new file mode 100644
index 0000000000..e8641f9bb7
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg-mime.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/egg-mime.rsi/inhand-right.png b/Resources/Textures/Objects/Food/egg-mime.rsi/inhand-right.png
new file mode 100644
index 0000000000..1f728c63a0
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg-mime.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/egg-mime.rsi/meta.json b/Resources/Textures/Objects/Food/egg-mime.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/egg-mime.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/egg-mime.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/egg-orange.rsi/inhand-left.png b/Resources/Textures/Objects/Food/egg-orange.rsi/inhand-left.png
new file mode 100644
index 0000000000..e2e384ffa8
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg-orange.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/egg-orange.rsi/inhand-right.png b/Resources/Textures/Objects/Food/egg-orange.rsi/inhand-right.png
new file mode 100644
index 0000000000..c4d78e80ba
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg-orange.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/egg-orange.rsi/meta.json b/Resources/Textures/Objects/Food/egg-orange.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/egg-orange.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/egg-orange.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/egg-purple.rsi/inhand-left.png b/Resources/Textures/Objects/Food/egg-purple.rsi/inhand-left.png
new file mode 100644
index 0000000000..bf08c4d10b
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg-purple.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/egg-purple.rsi/inhand-right.png b/Resources/Textures/Objects/Food/egg-purple.rsi/inhand-right.png
new file mode 100644
index 0000000000..b0894a2a08
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg-purple.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/egg-purple.rsi/meta.json b/Resources/Textures/Objects/Food/egg-purple.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/egg-purple.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/egg-purple.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/egg-rainbow.rsi/inhand-left.png b/Resources/Textures/Objects/Food/egg-rainbow.rsi/inhand-left.png
new file mode 100644
index 0000000000..bb4c563f12
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg-rainbow.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/egg-rainbow.rsi/inhand-right.png b/Resources/Textures/Objects/Food/egg-rainbow.rsi/inhand-right.png
new file mode 100644
index 0000000000..fc5604916f
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg-rainbow.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/egg-rainbow.rsi/meta.json b/Resources/Textures/Objects/Food/egg-rainbow.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/egg-rainbow.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/egg-rainbow.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/egg-red.rsi/inhand-left.png b/Resources/Textures/Objects/Food/egg-red.rsi/inhand-left.png
new file mode 100644
index 0000000000..a8cbc21645
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg-red.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/egg-red.rsi/inhand-right.png b/Resources/Textures/Objects/Food/egg-red.rsi/inhand-right.png
new file mode 100644
index 0000000000..8f6ee658da
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg-red.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/egg-red.rsi/meta.json b/Resources/Textures/Objects/Food/egg-red.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/egg-red.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/egg-red.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/egg-yellow.rsi/inhand-left.png b/Resources/Textures/Objects/Food/egg-yellow.rsi/inhand-left.png
new file mode 100644
index 0000000000..4299cd49c7
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg-yellow.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/egg-yellow.rsi/inhand-right.png b/Resources/Textures/Objects/Food/egg-yellow.rsi/inhand-right.png
new file mode 100644
index 0000000000..ae6df213fa
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg-yellow.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/egg-yellow.rsi/meta.json b/Resources/Textures/Objects/Food/egg-yellow.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/egg-yellow.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/egg-yellow.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/egg.rsi/inhand-left.png b/Resources/Textures/Objects/Food/egg.rsi/inhand-left.png
new file mode 100644
index 0000000000..30853735d4
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/egg.rsi/inhand-right.png b/Resources/Textures/Objects/Food/egg.rsi/inhand-right.png
new file mode 100644
index 0000000000..73f10d28a4
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/egg.rsi/meta.json b/Resources/Textures/Objects/Food/egg.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/egg.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/egg.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/fishburger.rsi/inhand-left.png b/Resources/Textures/Objects/Food/fishburger.rsi/inhand-left.png
new file mode 100644
index 0000000000..f5ed6b39cd
Binary files /dev/null and b/Resources/Textures/Objects/Food/fishburger.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/fishburger.rsi/inhand-right.png b/Resources/Textures/Objects/Food/fishburger.rsi/inhand-right.png
new file mode 100644
index 0000000000..9e9290dd8c
Binary files /dev/null and b/Resources/Textures/Objects/Food/fishburger.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/fishburger.rsi/meta.json b/Resources/Textures/Objects/Food/fishburger.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/fishburger.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/fishburger.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/hburger.rsi/inhand-left.png b/Resources/Textures/Objects/Food/hburger.rsi/inhand-left.png
new file mode 100644
index 0000000000..f5ed6b39cd
Binary files /dev/null and b/Resources/Textures/Objects/Food/hburger.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/hburger.rsi/inhand-right.png b/Resources/Textures/Objects/Food/hburger.rsi/inhand-right.png
new file mode 100644
index 0000000000..9e9290dd8c
Binary files /dev/null and b/Resources/Textures/Objects/Food/hburger.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/hburger.rsi/meta.json b/Resources/Textures/Objects/Food/hburger.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/hburger.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/hburger.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/jellyburger.rsi/inhand-left.png b/Resources/Textures/Objects/Food/jellyburger.rsi/inhand-left.png
new file mode 100644
index 0000000000..f5ed6b39cd
Binary files /dev/null and b/Resources/Textures/Objects/Food/jellyburger.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/jellyburger.rsi/inhand-right.png b/Resources/Textures/Objects/Food/jellyburger.rsi/inhand-right.png
new file mode 100644
index 0000000000..9e9290dd8c
Binary files /dev/null and b/Resources/Textures/Objects/Food/jellyburger.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/jellyburger.rsi/meta.json b/Resources/Textures/Objects/Food/jellyburger.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/jellyburger.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/jellyburger.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/meatball.rsi/inhand-left.png b/Resources/Textures/Objects/Food/meatball.rsi/inhand-left.png
new file mode 100644
index 0000000000..3ea612c218
Binary files /dev/null and b/Resources/Textures/Objects/Food/meatball.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/meatball.rsi/inhand-right.png b/Resources/Textures/Objects/Food/meatball.rsi/inhand-right.png
new file mode 100644
index 0000000000..a9439503fa
Binary files /dev/null and b/Resources/Textures/Objects/Food/meatball.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/meatball.rsi/meta.json b/Resources/Textures/Objects/Food/meatball.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/meatball.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/meatball.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/mimeburger.rsi/inhand-left.png b/Resources/Textures/Objects/Food/mimeburger.rsi/inhand-left.png
new file mode 100644
index 0000000000..3db2175335
Binary files /dev/null and b/Resources/Textures/Objects/Food/mimeburger.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/mimeburger.rsi/inhand-right.png b/Resources/Textures/Objects/Food/mimeburger.rsi/inhand-right.png
new file mode 100644
index 0000000000..40d4fbc83e
Binary files /dev/null and b/Resources/Textures/Objects/Food/mimeburger.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/mimeburger.rsi/meta.json b/Resources/Textures/Objects/Food/mimeburger.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/mimeburger.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/mimeburger.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/monkiesdelightold.rsi/icon.png b/Resources/Textures/Objects/Food/monkiesdelightold.rsi/icon.png
deleted file mode 100644
index 8d16707ffd..0000000000
Binary files a/Resources/Textures/Objects/Food/monkiesdelightold.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Food/monkiesdelightold.rsi/meta.json b/Resources/Textures/Objects/Food/monkiesdelightold.rsi/meta.json
deleted file mode 100644
index 8aa4c1e799..0000000000
--- a/Resources/Textures/Objects/Food/monkiesdelightold.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Food/pie.rsi/inhand-left.png b/Resources/Textures/Objects/Food/pie.rsi/inhand-left.png
new file mode 100644
index 0000000000..23aeffa07a
Binary files /dev/null and b/Resources/Textures/Objects/Food/pie.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/pie.rsi/inhand-right.png b/Resources/Textures/Objects/Food/pie.rsi/inhand-right.png
new file mode 100644
index 0000000000..01027d3f31
Binary files /dev/null and b/Resources/Textures/Objects/Food/pie.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/pie.rsi/meta.json b/Resources/Textures/Objects/Food/pie.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/pie.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/pie.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/roburger.rsi/inhand-left.png b/Resources/Textures/Objects/Food/roburger.rsi/inhand-left.png
new file mode 100644
index 0000000000..3db2175335
Binary files /dev/null and b/Resources/Textures/Objects/Food/roburger.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/roburger.rsi/inhand-right.png b/Resources/Textures/Objects/Food/roburger.rsi/inhand-right.png
new file mode 100644
index 0000000000..40d4fbc83e
Binary files /dev/null and b/Resources/Textures/Objects/Food/roburger.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/roburger.rsi/meta.json b/Resources/Textures/Objects/Food/roburger.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/roburger.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/roburger.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/sandwich.rsi/inhand-left.png b/Resources/Textures/Objects/Food/sandwich.rsi/inhand-left.png
new file mode 100644
index 0000000000..f5ed6b39cd
Binary files /dev/null and b/Resources/Textures/Objects/Food/sandwich.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/sandwich.rsi/inhand-right.png b/Resources/Textures/Objects/Food/sandwich.rsi/inhand-right.png
new file mode 100644
index 0000000000..9e9290dd8c
Binary files /dev/null and b/Resources/Textures/Objects/Food/sandwich.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/sandwich.rsi/meta.json b/Resources/Textures/Objects/Food/sandwich.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/sandwich.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/sandwich.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/sosjerky.rsi/inhand-left.png b/Resources/Textures/Objects/Food/sosjerky.rsi/inhand-left.png
new file mode 100644
index 0000000000..993e02aef2
Binary files /dev/null and b/Resources/Textures/Objects/Food/sosjerky.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/sosjerky.rsi/inhand-right.png b/Resources/Textures/Objects/Food/sosjerky.rsi/inhand-right.png
new file mode 100644
index 0000000000..f36ef75a67
Binary files /dev/null and b/Resources/Textures/Objects/Food/sosjerky.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/sosjerky.rsi/meta.json b/Resources/Textures/Objects/Food/sosjerky.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/sosjerky.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/sosjerky.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/spellburger.rsi/inhand-left.png b/Resources/Textures/Objects/Food/spellburger.rsi/inhand-left.png
new file mode 100644
index 0000000000..f5ed6b39cd
Binary files /dev/null and b/Resources/Textures/Objects/Food/spellburger.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/spellburger.rsi/inhand-right.png b/Resources/Textures/Objects/Food/spellburger.rsi/inhand-right.png
new file mode 100644
index 0000000000..9e9290dd8c
Binary files /dev/null and b/Resources/Textures/Objects/Food/spellburger.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/spellburger.rsi/meta.json b/Resources/Textures/Objects/Food/spellburger.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/spellburger.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/spellburger.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/spellburgerold.rsi/icon.png b/Resources/Textures/Objects/Food/spellburgerold.rsi/icon.png
deleted file mode 100644
index 8f2948aa00..0000000000
Binary files a/Resources/Textures/Objects/Food/spellburgerold.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Food/spellburgerold.rsi/meta.json b/Resources/Textures/Objects/Food/spellburgerold.rsi/meta.json
deleted file mode 100644
index 8aa4c1e799..0000000000
--- a/Resources/Textures/Objects/Food/spellburgerold.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Food/tofuburger.rsi/inhand-left.png b/Resources/Textures/Objects/Food/tofuburger.rsi/inhand-left.png
new file mode 100644
index 0000000000..f5ed6b39cd
Binary files /dev/null and b/Resources/Textures/Objects/Food/tofuburger.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/tofuburger.rsi/inhand-right.png b/Resources/Textures/Objects/Food/tofuburger.rsi/inhand-right.png
new file mode 100644
index 0000000000..9e9290dd8c
Binary files /dev/null and b/Resources/Textures/Objects/Food/tofuburger.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/tofuburger.rsi/meta.json b/Resources/Textures/Objects/Food/tofuburger.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/tofuburger.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/tofuburger.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/xburger.rsi/inhand-left.png b/Resources/Textures/Objects/Food/xburger.rsi/inhand-left.png
new file mode 100644
index 0000000000..f5ed6b39cd
Binary files /dev/null and b/Resources/Textures/Objects/Food/xburger.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Food/xburger.rsi/inhand-right.png b/Resources/Textures/Objects/Food/xburger.rsi/inhand-right.png
new file mode 100644
index 0000000000..9e9290dd8c
Binary files /dev/null and b/Resources/Textures/Objects/Food/xburger.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Food/xburger.rsi/meta.json b/Resources/Textures/Objects/Food/xburger.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/Food/xburger.rsi/meta.json
+++ b/Resources/Textures/Objects/Food/xburger.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/FoodContainers/eggbox.rsi/inhand-left.png b/Resources/Textures/Objects/FoodContainers/eggbox.rsi/inhand-left.png
new file mode 100644
index 0000000000..8836aacfbe
Binary files /dev/null and b/Resources/Textures/Objects/FoodContainers/eggbox.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/FoodContainers/eggbox.rsi/inhand-right.png b/Resources/Textures/Objects/FoodContainers/eggbox.rsi/inhand-right.png
new file mode 100644
index 0000000000..e86da3cc45
Binary files /dev/null and b/Resources/Textures/Objects/FoodContainers/eggbox.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/FoodContainers/eggbox.rsi/meta.json b/Resources/Textures/Objects/FoodContainers/eggbox.rsi/meta.json
index 2fcfceb081..d8967565eb 100644
--- a/Resources/Textures/Objects/FoodContainers/eggbox.rsi/meta.json
+++ b/Resources/Textures/Objects/FoodContainers/eggbox.rsi/meta.json
@@ -58,6 +58,42 @@
{
"name": "eggbox-12",
"directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
}
]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/FoodContainers/eggbox_shut.rsi/inhand-left.png b/Resources/Textures/Objects/FoodContainers/eggbox_shut.rsi/inhand-left.png
new file mode 100644
index 0000000000..8836aacfbe
Binary files /dev/null and b/Resources/Textures/Objects/FoodContainers/eggbox_shut.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/FoodContainers/eggbox_shut.rsi/inhand-right.png b/Resources/Textures/Objects/FoodContainers/eggbox_shut.rsi/inhand-right.png
new file mode 100644
index 0000000000..e86da3cc45
Binary files /dev/null and b/Resources/Textures/Objects/FoodContainers/eggbox_shut.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/FoodContainers/eggbox_shut.rsi/meta.json b/Resources/Textures/Objects/FoodContainers/eggbox_shut.rsi/meta.json
index e76eafc94d..1c7849ada7 100644
--- a/Resources/Textures/Objects/FoodContainers/eggbox_shut.rsi/meta.json
+++ b/Resources/Textures/Objects/FoodContainers/eggbox_shut.rsi/meta.json
@@ -1,15 +1,51 @@
{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
},
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
- "states": [
- {
- "name": "icon",
- "directions": 1
- }
- ]
-}
\ No newline at end of file
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Food/pizzabox.png b/Resources/Textures/Objects/FoodContainers/pizzabox.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Food/pizzabox.png
rename to Resources/Textures/Objects/FoodContainers/pizzabox.rsi/icon.png
diff --git a/Resources/Textures/Objects/FoodContainers/pizzabox_open.rsi/icon.png b/Resources/Textures/Objects/FoodContainers/pizzabox.rsi/iconopen.png
similarity index 100%
rename from Resources/Textures/Objects/FoodContainers/pizzabox_open.rsi/icon.png
rename to Resources/Textures/Objects/FoodContainers/pizzabox.rsi/iconopen.png
diff --git a/Resources/Textures/Objects/FoodContainers/pizzabox.rsi/inhand-left.png b/Resources/Textures/Objects/FoodContainers/pizzabox.rsi/inhand-left.png
new file mode 100644
index 0000000000..88877665c6
Binary files /dev/null and b/Resources/Textures/Objects/FoodContainers/pizzabox.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/FoodContainers/pizzabox.rsi/inhand-right.png b/Resources/Textures/Objects/FoodContainers/pizzabox.rsi/inhand-right.png
new file mode 100644
index 0000000000..7ca1c350d4
Binary files /dev/null and b/Resources/Textures/Objects/FoodContainers/pizzabox.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/FoodContainers/pizzabox.rsi/meta.json b/Resources/Textures/Objects/FoodContainers/pizzabox.rsi/meta.json
new file mode 100644
index 0000000000..1c7849ada7
--- /dev/null
+++ b/Resources/Textures/Objects/FoodContainers/pizzabox.rsi/meta.json
@@ -0,0 +1,51 @@
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/FoodContainers/pizzabox_open.rsi/meta.json b/Resources/Textures/Objects/FoodContainers/pizzabox_open.rsi/meta.json
deleted file mode 100644
index 8aa4c1e799..0000000000
--- a/Resources/Textures/Objects/FoodContainers/pizzabox_open.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/FoodContainers/pumpkinpie.rsi/inhand-left.png b/Resources/Textures/Objects/FoodContainers/pumpkinpie.rsi/inhand-left.png
new file mode 100644
index 0000000000..23aeffa07a
Binary files /dev/null and b/Resources/Textures/Objects/FoodContainers/pumpkinpie.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/FoodContainers/pumpkinpie.rsi/inhand-right.png b/Resources/Textures/Objects/FoodContainers/pumpkinpie.rsi/inhand-right.png
new file mode 100644
index 0000000000..01027d3f31
Binary files /dev/null and b/Resources/Textures/Objects/FoodContainers/pumpkinpie.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/FoodContainers/pumpkinpie.rsi/meta.json b/Resources/Textures/Objects/FoodContainers/pumpkinpie.rsi/meta.json
index 8aa4c1e799..1c7849ada7 100644
--- a/Resources/Textures/Objects/FoodContainers/pumpkinpie.rsi/meta.json
+++ b/Resources/Textures/Objects/FoodContainers/pumpkinpie.rsi/meta.json
@@ -1 +1,51 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi",
+ "states": [
+ {
+ "name": "icon",
+ "directions": 1
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Materials/phoron_gem.png b/Resources/Textures/Objects/Materials/phoron_gem.png
new file mode 100644
index 0000000000..d81e5f469b
Binary files /dev/null and b/Resources/Textures/Objects/Materials/phoron_gem.png differ
diff --git a/Resources/Textures/Objects/Materials/phoron_ore.png b/Resources/Textures/Objects/Materials/phoron_ore.png
new file mode 100644
index 0000000000..3a9537c129
Binary files /dev/null and b/Resources/Textures/Objects/Materials/phoron_ore.png differ
diff --git a/Resources/Textures/Objects/Materials/phoron_sheet.png b/Resources/Textures/Objects/Materials/phoron_sheet.png
new file mode 100644
index 0000000000..e226d3fdb7
Binary files /dev/null and b/Resources/Textures/Objects/Materials/phoron_sheet.png differ
diff --git a/Resources/Textures/Objects/Materials/plasma.png b/Resources/Textures/Objects/Materials/plasma.png
deleted file mode 100644
index 2827a828f5..0000000000
Binary files a/Resources/Textures/Objects/Materials/plasma.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/glass-inhand-left.png b/Resources/Textures/Objects/Materials/sheets.rsi/glass-inhand-left.png
new file mode 100644
index 0000000000..e19872eb4e
Binary files /dev/null and b/Resources/Textures/Objects/Materials/sheets.rsi/glass-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/glass-inhand-right.png b/Resources/Textures/Objects/Materials/sheets.rsi/glass-inhand-right.png
new file mode 100644
index 0000000000..f934c01194
Binary files /dev/null and b/Resources/Textures/Objects/Materials/sheets.rsi/glass-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/glass.png b/Resources/Textures/Objects/Materials/sheets.rsi/glass.png
new file mode 100644
index 0000000000..534d188b29
Binary files /dev/null and b/Resources/Textures/Objects/Materials/sheets.rsi/glass.png differ
diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/meta.json b/Resources/Textures/Objects/Materials/sheets.rsi/meta.json
new file mode 100644
index 0000000000..332abbb513
--- /dev/null
+++ b/Resources/Textures/Objects/Materials/sheets.rsi/meta.json
@@ -0,0 +1,129 @@
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "metal-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "metal-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "glass-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "glass-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "glass",
+ "directions": 1
+ },
+ {
+ "name": "phoron-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "phoron-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "phoron",
+ "directions": 1
+ },
+ {
+ "name": "metal",
+ "directions": 1
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/metal-inhand-left.png b/Resources/Textures/Objects/Materials/sheets.rsi/metal-inhand-left.png
new file mode 100644
index 0000000000..d2f2e95ad1
Binary files /dev/null and b/Resources/Textures/Objects/Materials/sheets.rsi/metal-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/metal-inhand-right.png b/Resources/Textures/Objects/Materials/sheets.rsi/metal-inhand-right.png
new file mode 100644
index 0000000000..9b1edbd43a
Binary files /dev/null and b/Resources/Textures/Objects/Materials/sheets.rsi/metal-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/metal.png b/Resources/Textures/Objects/Materials/sheets.rsi/metal.png
new file mode 100644
index 0000000000..999b6e2927
Binary files /dev/null and b/Resources/Textures/Objects/Materials/sheets.rsi/metal.png differ
diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/phoron-inhand-left.png b/Resources/Textures/Objects/Materials/sheets.rsi/phoron-inhand-left.png
new file mode 100644
index 0000000000..654701b1a8
Binary files /dev/null and b/Resources/Textures/Objects/Materials/sheets.rsi/phoron-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/phoron-inhand-right.png b/Resources/Textures/Objects/Materials/sheets.rsi/phoron-inhand-right.png
new file mode 100644
index 0000000000..0050c63ea6
Binary files /dev/null and b/Resources/Textures/Objects/Materials/sheets.rsi/phoron-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/sheets.rsi/phoron.png b/Resources/Textures/Objects/Materials/sheets.rsi/phoron.png
new file mode 100644
index 0000000000..e226d3fdb7
Binary files /dev/null and b/Resources/Textures/Objects/Materials/sheets.rsi/phoron.png differ
diff --git a/Resources/Textures/Objects/Materials/spent_phoron_gem.png b/Resources/Textures/Objects/Materials/spent_phoron_gem.png
new file mode 100644
index 0000000000..d12a706c8a
Binary files /dev/null and b/Resources/Textures/Objects/Materials/spent_phoron_gem.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/.png
diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/meta.json b/Resources/Textures/Objects/Tiles/cevtile.rsi/meta.json
new file mode 100644
index 0000000000..92e296e950
--- /dev/null
+++ b/Resources/Textures/Objects/Tiles/cevtile.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "", "directions": 1, "delays": [[1.0]]}, {"name": "tile", "directions": 1, "delays": [[1.0]]}, {"name": "tile-white-techfloor", "directions": 1, "delays": [[1.0]]}, {"name": "tile_bcarpet", "directions": 1, "delays": [[1.0]]}, {"name": "tile_blucarpet", "directions": 1, "delays": [[1.0]]}, {"name": "tile_cafe", "directions": 1, "delays": [[1.0]]}, {"name": "tile_carpet", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_bluecorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_brownperforated", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_brownplatform", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_cargo", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_cyancorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_danger", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_golden", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_grayperforated", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_grayplatform", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_monofloor", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_orangecorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_panels", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_techfloor", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_techfloor_grid", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_violetcorener", "directions": 1, "delays": [[1.0]]}, {"name": "tile_gaycarpet", "directions": 1, "delays": [[1.0]]}, {"name": "tile_grass", "directions": 1, "delays": [[1.0]]}, {"name": "tile_oracarpet", "directions": 1, "delays": [[1.0]]}, {"name": "tile_purcarpet", "directions": 1, "delays": [[1.0]]}, {"name": "tile_sblucarpet", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_bar_dance", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_bar_flat", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_bar_light", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_bluecorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_brownperforated", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_brownplatform", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_cargo", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_cyancorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_danger", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_golden", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_grayperforated", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_grayplatform", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_monofloor", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_orangecorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_panels", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_techfloor", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_techfloor_grid", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_violetcorener", "directions": 1, "delays": [[1.0]]}, {"name": "tile_techmaint", "directions": 1, "delays": [[1.0]]}, {"name": "tile_techmaint_cargo", "directions": 1, "delays": [[1.0]]}, {"name": "tile_techmaint_panels", "directions": 1, "delays": [[1.0]]}, {"name": "tile_techmaint_perforated", "directions": 1, "delays": [[1.0]]}, {"name": "tile_turcarpet", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_bluecorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_brownperforated", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_brownplatform", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_cargo", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_cyancorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_danger", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_golden", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_grayperforated", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_grayplatform", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_monofloor", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_orangecorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_panels", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_techfloor_grid", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_violetcorener", "directions": 1, "delays": [[1.0]]}, {"name": "tile_wood", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile-white-techfloor.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile-white-techfloor.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile-white-techfloor.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile-white-techfloor.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_bcarpet.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_bcarpet.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_bcarpet.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_bcarpet.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_blucarpet.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_blucarpet.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_blucarpet.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_blucarpet.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_cafe.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_cafe.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_cafe.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_cafe.png
diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_carpet.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_carpet.png
new file mode 100644
index 0000000000..e331cb0630
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_carpet.png differ
diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark.png
new file mode 100644
index 0000000000..cde5b73f98
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_bluecorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_bluecorner.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_bluecorner.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_bluecorner.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_brownperforated.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_brownperforated.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_brownperforated.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_brownperforated.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_brownplatform.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_brownplatform.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_brownplatform.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_brownplatform.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_cargo.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_cargo.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_cargo.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_cargo.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_cyancorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_cyancorner.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_cyancorner.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_cyancorner.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_danger.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_danger.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_danger.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_danger.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_golden.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_golden.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_golden.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_golden.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_grayperforated.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_grayperforated.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_grayperforated.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_grayperforated.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_grayplatform.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_grayplatform.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_grayplatform.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_grayplatform.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_monofloor.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_monofloor.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_monofloor.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_monofloor.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_orangecorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_orangecorner.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_orangecorner.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_orangecorner.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_panels.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_panels.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_panels.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_panels.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_techfloor.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_techfloor.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_techfloor.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_techfloor.png
diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_techfloor_grid.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_techfloor_grid.png
new file mode 100644
index 0000000000..c8192ff8b4
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_techfloor_grid.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_violetcorener.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_violetcorener.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_dark_violetcorener.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_violetcorener.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_gaycarpet.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_gaycarpet.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_gaycarpet.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_gaycarpet.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_grass.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_grass.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_grass.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_grass.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_oracarpet.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_oracarpet.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_oracarpet.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_oracarpet.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_purcarpet.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_purcarpet.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_purcarpet.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_purcarpet.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_sblucarpet.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_sblucarpet.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_sblucarpet.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_sblucarpet.png
diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel.png
new file mode 100644
index 0000000000..d8b9e774e8
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_bar_dance.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bar_dance.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_bar_dance.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bar_dance.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_bar_flat.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bar_flat.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_bar_flat.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bar_flat.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_bar_light.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bar_light.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_bar_light.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bar_light.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_bluecorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bluecorner.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_bluecorner.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bluecorner.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_brownperforated.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_brownperforated.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_brownperforated.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_brownperforated.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_brownplatform.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_brownplatform.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_brownplatform.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_brownplatform.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_cargo.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_cargo.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_cargo.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_cargo.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_cyancorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_cyancorner.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_cyancorner.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_cyancorner.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_danger.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_danger.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_danger.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_danger.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_golden.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_golden.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_golden.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_golden.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_grayperforated.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_grayperforated.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_grayperforated.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_grayperforated.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_grayplatform.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_grayplatform.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_grayplatform.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_grayplatform.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_monofloor.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_monofloor.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_monofloor.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_monofloor.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_orangecorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_orangecorner.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_orangecorner.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_orangecorner.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_panels.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_panels.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_panels.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_panels.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_techfloor.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_techfloor.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_techfloor.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_techfloor.png
diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_techfloor_grid.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_techfloor_grid.png
new file mode 100644
index 0000000000..fd2280da8e
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_techfloor_grid.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_violetcorener.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_violetcorener.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_steel_violetcorener.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_violetcorener.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_techmaint.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_techmaint.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_techmaint_cargo.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint_cargo.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_techmaint_cargo.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint_cargo.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_techmaint_panels.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint_panels.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_techmaint_panels.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint_panels.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_techmaint_perforated.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint_perforated.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_techmaint_perforated.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint_perforated.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_turcarpet.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_turcarpet.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_turcarpet.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_turcarpet.png
diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white.png
new file mode 100644
index 0000000000..d9f8cf2051
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_white_bluecorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_bluecorner.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_white_bluecorner.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_bluecorner.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_white_brownperforated.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_brownperforated.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_white_brownperforated.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_brownperforated.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_white_brownplatform.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_brownplatform.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_white_brownplatform.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_brownplatform.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_white_cargo.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_cargo.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_white_cargo.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_cargo.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_white_cyancorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_cyancorner.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_white_cyancorner.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_cyancorner.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_white_danger.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_danger.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_white_danger.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_danger.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_white_golden.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_golden.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_white_golden.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_golden.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_white_grayperforated.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_grayperforated.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_white_grayperforated.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_grayperforated.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_white_grayplatform.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_grayplatform.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_white_grayplatform.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_grayplatform.png
diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_monofloor.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_monofloor.png
new file mode 100644
index 0000000000..04a2f3ca67
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_monofloor.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_white_orangecorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_orangecorner.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_white_orangecorner.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_orangecorner.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_white_panels.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_panels.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_white_panels.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_panels.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_white_techfloor_grid.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_techfloor_grid.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_white_techfloor_grid.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_techfloor_grid.png
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_white_violetcorener.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_violetcorener.png
similarity index 100%
rename from Resources/Textures/Objects/Tiles/tile.rsi/tile_white_violetcorener.png
rename to Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_violetcorener.png
diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_wood.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_wood.png
new file mode 100644
index 0000000000..c862398894
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_wood.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
index 92e296e950..41e23286c5 100644
--- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
+++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
@@ -1 +1,630 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "", "directions": 1, "delays": [[1.0]]}, {"name": "tile", "directions": 1, "delays": [[1.0]]}, {"name": "tile-white-techfloor", "directions": 1, "delays": [[1.0]]}, {"name": "tile_bcarpet", "directions": 1, "delays": [[1.0]]}, {"name": "tile_blucarpet", "directions": 1, "delays": [[1.0]]}, {"name": "tile_cafe", "directions": 1, "delays": [[1.0]]}, {"name": "tile_carpet", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_bluecorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_brownperforated", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_brownplatform", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_cargo", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_cyancorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_danger", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_golden", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_grayperforated", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_grayplatform", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_monofloor", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_orangecorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_panels", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_techfloor", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_techfloor_grid", "directions": 1, "delays": [[1.0]]}, {"name": "tile_dark_violetcorener", "directions": 1, "delays": [[1.0]]}, {"name": "tile_gaycarpet", "directions": 1, "delays": [[1.0]]}, {"name": "tile_grass", "directions": 1, "delays": [[1.0]]}, {"name": "tile_oracarpet", "directions": 1, "delays": [[1.0]]}, {"name": "tile_purcarpet", "directions": 1, "delays": [[1.0]]}, {"name": "tile_sblucarpet", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_bar_dance", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_bar_flat", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_bar_light", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_bluecorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_brownperforated", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_brownplatform", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_cargo", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_cyancorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_danger", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_golden", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_grayperforated", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_grayplatform", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_monofloor", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_orangecorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_panels", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_techfloor", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_techfloor_grid", "directions": 1, "delays": [[1.0]]}, {"name": "tile_steel_violetcorener", "directions": 1, "delays": [[1.0]]}, {"name": "tile_techmaint", "directions": 1, "delays": [[1.0]]}, {"name": "tile_techmaint_cargo", "directions": 1, "delays": [[1.0]]}, {"name": "tile_techmaint_panels", "directions": 1, "delays": [[1.0]]}, {"name": "tile_techmaint_perforated", "directions": 1, "delays": [[1.0]]}, {"name": "tile_turcarpet", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_bluecorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_brownperforated", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_brownplatform", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_cargo", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_cyancorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_danger", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_golden", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_grayperforated", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_grayplatform", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_monofloor", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_orangecorner", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_panels", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_techfloor_grid", "directions": 1, "delays": [[1.0]]}, {"name": "tile_white_violetcorener", "directions": 1, "delays": [[1.0]]}, {"name": "tile_wood", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "tile_dark",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_dirty",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_gcircuit",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_hydro",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_plating",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_reinforced",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_rockvault",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_gold",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_showroom",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_snow",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_steel",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_steel_techfloor_grid",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_dark_techfloor_grid",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_white",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_white_monofloor",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_wood",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_carpet",
+ "directions": 1,
+ "delays": [
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_brown-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_brown-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_carpet-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_carpet-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_dark-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_dark-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_gcircuit-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_gcircuit-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_gold-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_gold-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_reinforced-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_reinforced-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_showroom-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_showroom-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_silver-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_silver-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_white-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_white-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_wood-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_wood-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_steel-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_steel-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_hydro-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "tile_hydro-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ ]
+}
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile-inhand-left.png
new file mode 100644
index 0000000000..02de8842aa
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile-inhand-right.png
new file mode 100644
index 0000000000..ebde6635d2
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_brown-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_brown-inhand-left.png
new file mode 100644
index 0000000000..dce587625e
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_brown-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_brown-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_brown-inhand-right.png
new file mode 100644
index 0000000000..85d5d99e08
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_brown-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_carpet-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_carpet-inhand-left.png
new file mode 100644
index 0000000000..070f34419e
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_carpet-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_carpet-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_carpet-inhand-right.png
new file mode 100644
index 0000000000..38806868bb
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_carpet-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_carpet.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_carpet.png
index e331cb0630..01ad59a896 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/tile_carpet.png and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_carpet.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark-inhand-left.png
new file mode 100644
index 0000000000..f13dac630c
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark-inhand-right.png
new file mode 100644
index 0000000000..aab893421c
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_dark-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_dirty.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_dirty.png
new file mode 100644
index 0000000000..bfcacab190
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_dirty.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_gcircuit-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_gcircuit-inhand-left.png
new file mode 100644
index 0000000000..4a49faba41
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_gcircuit-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_gcircuit-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_gcircuit-inhand-right.png
new file mode 100644
index 0000000000..98fe970f05
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_gcircuit-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_gcircuit.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_gcircuit.png
new file mode 100644
index 0000000000..c8059ec99e
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_gcircuit.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_gold-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_gold-inhand-left.png
new file mode 100644
index 0000000000..0c26bfaa94
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_gold-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_gold-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_gold-inhand-right.png
new file mode 100644
index 0000000000..7c894bbb54
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_gold-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_gold.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_gold.png
new file mode 100644
index 0000000000..80edabf429
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_gold.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_hydro-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_hydro-inhand-left.png
new file mode 100644
index 0000000000..a3e4e6f2c8
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_hydro-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_hydro-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_hydro-inhand-right.png
new file mode 100644
index 0000000000..7d78bb65e8
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_hydro-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_hydro.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_hydro.png
new file mode 100644
index 0000000000..b0c6d70751
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_hydro.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_plating.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_plating.png
new file mode 100644
index 0000000000..b9c6f09e90
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_plating.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_reinforced-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_reinforced-inhand-left.png
new file mode 100644
index 0000000000..ebbe431689
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_reinforced-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_reinforced-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_reinforced-inhand-right.png
new file mode 100644
index 0000000000..df04940866
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_reinforced-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_reinforced.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_reinforced.png
new file mode 100644
index 0000000000..ff50130028
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_reinforced.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_rockvault.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_rockvault.png
new file mode 100644
index 0000000000..22b4aa03e3
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_rockvault.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_showroom-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_showroom-inhand-left.png
new file mode 100644
index 0000000000..6bdece9677
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_showroom-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_showroom-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_showroom-inhand-right.png
new file mode 100644
index 0000000000..b536300d6b
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_showroom-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_showroom.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_showroom.png
new file mode 100644
index 0000000000..114070cd63
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_showroom.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_silver-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_silver-inhand-left.png
new file mode 100644
index 0000000000..91e4b8b9f9
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_silver-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_silver-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_silver-inhand-right.png
new file mode 100644
index 0000000000..b0f876b4f2
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_silver-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_snow.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_snow.png
new file mode 100644
index 0000000000..8742892b23
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_snow.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel-inhand-left.png
new file mode 100644
index 0000000000..0b245f52de
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel-inhand-right.png
new file mode 100644
index 0000000000..a7ca30bd3c
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_steel-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_white-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_white-inhand-left.png
new file mode 100644
index 0000000000..124182672f
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_white-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_white-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_white-inhand-right.png
new file mode 100644
index 0000000000..da055fd3be
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_white-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_wood-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_wood-inhand-left.png
new file mode 100644
index 0000000000..cd9f908b57
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_wood-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/tile_wood-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/tile_wood-inhand-right.png
new file mode 100644
index 0000000000..fd921cefc5
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/tile_wood-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json b/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json
index ba7d8a3bef..eab8fd1d32 100644
--- a/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json
@@ -7,8 +7,6 @@
"states": [
{
"name": "lantern_off",
- "select": [],
- "flags": {},
"directions": 1,
"delays": [
[
@@ -18,14 +16,84 @@
},
{
"name": "HandheldLightOnOverlay",
- "select": [],
- "flags": {},
"directions": 1,
"delays": [
[
1.0
]
]
- }
+ },
+ {
+ "name": "off-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "off-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "on-inhand-left",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
+ {
+ "name": "on-inhand-right",
+ "directions": 4,
+ "delays": [
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ],
+ [
+ 1
+ ]
+ ]
+ },
]
}
diff --git a/Resources/Textures/Objects/Tools/flashlight.rsi/off-inhand-left.png b/Resources/Textures/Objects/Tools/flashlight.rsi/off-inhand-left.png
new file mode 100644
index 0000000000..e4e6b42252
Binary files /dev/null and b/Resources/Textures/Objects/Tools/flashlight.rsi/off-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/flashlight.rsi/off-inhand-right.png b/Resources/Textures/Objects/Tools/flashlight.rsi/off-inhand-right.png
new file mode 100644
index 0000000000..42c9ca0060
Binary files /dev/null and b/Resources/Textures/Objects/Tools/flashlight.rsi/off-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/flashlight.rsi/on-inhand-left.png b/Resources/Textures/Objects/Tools/flashlight.rsi/on-inhand-left.png
new file mode 100644
index 0000000000..328bb38f7b
Binary files /dev/null and b/Resources/Textures/Objects/Tools/flashlight.rsi/on-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/flashlight.rsi/on-inhand-right.png b/Resources/Textures/Objects/Tools/flashlight.rsi/on-inhand-right.png
new file mode 100644
index 0000000000..812a0186fe
Binary files /dev/null and b/Resources/Textures/Objects/Tools/flashlight.rsi/on-inhand-right.png differ
diff --git a/Resources/Textures/Tiles/gold.png b/Resources/Textures/Tiles/gold.png
new file mode 100644
index 0000000000..de8e9b800c
Binary files /dev/null and b/Resources/Textures/Tiles/gold.png differ