From 77753debeb2bb1a6a9ca6d6515c99c3ad0c0dc87 Mon Sep 17 00:00:00 2001
From: PrPleGoo <PrPleGoo@users.noreply.github.com>
Date: Sat, 6 Apr 2019 17:11:51 +0200
Subject: [PATCH] Leather gloves and an LED tube light. (#187)

Added BurnTemperature to bulbs.
Added HeatResistance to clothing and species.
Added HeatResistanceComponent which resolves armor vs skin.
Made the hand burn on lamps only happen when heat resistance is too poor.
---
 Content.Server/Content.Server.csproj          |   3 +-
 Content.Server/EntryPoint.cs                  |   1 +
 .../Components/GUI/InventoryComponent.cs      |  12 ++++-
 .../Items/Clothing/ClothingComponent.cs       |   8 +--
 .../Mobs/HeatResistanceComponent.cs           |  21 ++++++++
 .../Components/Mobs/SpeciesComponent.cs       |   4 ++
 .../Components/Power/LightBulbComponent.cs    |  10 +++-
 .../Components/Power/PoweredLightComponent.cs |  50 +++++++++++-------
 Content.Server/GameObjects/ContainerSlot.cs   |   4 --
 Resources/Maps/stationstation.yml             |  46 +++++++++++++---
 .../Prototypes/Entities/Clothing/gloves.yml   |  25 +++++++--
 Resources/Prototypes/Entities/Lights.yml      |  19 ++++++-
 Resources/Prototypes/Entities/Mobs.yml        |   2 +
 .../black.png                                 | Bin
 .../Clothing/glove_icons.rsi/leather.png      | Bin 0 -> 2772 bytes
 .../Clothing/glove_icons.rsi/meta.json        |  26 +++++++++
 .../yellow.png                                | Bin
 .../Clothing/gloves_black.rsi/meta.json       |  42 ++++++++++++++-
 .../gloves_leather.rsi/equipped-HAND.png      | Bin 0 -> 2097 bytes
 .../gloves_leather.rsi/inhand-left.png        | Bin 0 -> 1611 bytes
 .../gloves_leather.rsi/inhand-right.png       | Bin 0 -> 1662 bytes
 .../Clothing/gloves_leather.rsi/meta.json     |  41 ++++++++++++++
 .../Clothing/gloves_yellow.rsi/meta.json      |  42 ++++++++++++++-
 23 files changed, 312 insertions(+), 44 deletions(-)
 create mode 100644 Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs
 rename Resources/Textures/Clothing/{gloves_black.rsi => glove_icons.rsi}/black.png (100%)
 create mode 100644 Resources/Textures/Clothing/glove_icons.rsi/leather.png
 create mode 100644 Resources/Textures/Clothing/glove_icons.rsi/meta.json
 rename Resources/Textures/Clothing/{gloves_yellow.rsi => glove_icons.rsi}/yellow.png (100%)
 create mode 100644 Resources/Textures/Clothing/gloves_leather.rsi/equipped-HAND.png
 create mode 100644 Resources/Textures/Clothing/gloves_leather.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/gloves_leather.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/gloves_leather.rsi/meta.json

diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj
index 2aa95b10b7..42cfb7a73b 100644
--- a/Content.Server/Content.Server.csproj
+++ b/Content.Server/Content.Server.csproj
@@ -69,6 +69,7 @@
     <Compile Include="GameObjects\Components\CatwalkComponent.cs" />
     <Compile Include="GameObjects\Components\Damage\DamageThreshold.cs" />
     <Compile Include="GameObjects\Components\Doors\ServerDoorComponent.cs" />
+    <Compile Include="GameObjects\Components\Mobs\HeatResistanceComponent.cs" />
     <Compile Include="GameObjects\Components\Interactable\HandheldLightComponent.cs" />
     <Compile Include="GameObjects\Components\Interactable\Tools\BaseTool.cs" />
     <Compile Include="GameObjects\Components\Interactable\Tools\CrowbarComponent.cs" />
@@ -194,4 +195,4 @@
     <Compile Include="GameObjects\Components\Construction\ConstructorComponent.cs" />
     <Compile Include="GameObjects\Components\Construction\ConstructionComponent.cs" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint.cs
index 500ca70c25..d4d2118c6e 100644
--- a/Content.Server/EntryPoint.cs
+++ b/Content.Server/EntryPoint.cs
@@ -130,6 +130,7 @@ namespace Content.Server
 
             factory.Register<MindComponent>();
             factory.Register<SpeciesComponent>();
+            factory.Register<HeatResistanceComponent>();
 
             factory.Register<SpawnPointComponent>();
             factory.RegisterReference<SpawnPointComponent, SharedSpawnPointComponent>();
diff --git a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs b/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs
index 8e202296ba..2443bd55b6 100644
--- a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs
+++ b/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs
@@ -78,7 +78,17 @@ namespace Content.Server.GameObjects
         /// <returns>Null if the slot is empty, otherwise the item.</returns>
         public ItemComponent GetSlotItem(Slots slot)
         {
-            return SlotContainers[slot].ContainedEntity?.GetComponent<ItemComponent>();
+            return GetSlotItem<ItemComponent>(slot);
+        }
+        public T GetSlotItem<T>(Slots slot) where T : ItemComponent
+        {
+            return SlotContainers[slot].ContainedEntity?.GetComponent<T>();
+        }
+
+        public bool TryGetSlotItem<T>(Slots slot, out T itemComponent) where T : ItemComponent
+        {
+            itemComponent = GetSlotItem<T>(slot);
+            return itemComponent != null;
         }
 
         /// <summary>
diff --git a/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs b/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs
index 30fb384630..6bd553fe75 100644
--- a/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs
+++ b/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs
@@ -1,9 +1,6 @@
 using SS14.Shared.Serialization;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
 
 namespace Content.Server.GameObjects
@@ -13,6 +10,9 @@ namespace Content.Server.GameObjects
         public override string Name => "Clothing";
         public SlotFlags SlotFlags = SlotFlags.PREVENTEQUIP; //Different from None, NONE allows equips if no slot flags are required
 
+        private int _heatResistance;
+        public int HeatResistance => _heatResistance;
+
         public override void ExposeData(ObjectSerializer serializer)
         {
             base.ExposeData(serializer);
@@ -25,6 +25,8 @@ namespace Content.Server.GameObjects
                     SlotFlags |= (SlotFlags)Enum.Parse(typeof(SlotFlags), slotflagsloaded.ToUpper());
                 }
             });
+
+            serializer.DataFieldCached(ref _heatResistance, "HeatResistance", 323);
         }
     }
 }
diff --git a/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs b/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs
new file mode 100644
index 0000000000..4d5bec36aa
--- /dev/null
+++ b/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs
@@ -0,0 +1,21 @@
+using System;
+using SS14.Shared.GameObjects;
+using Content.Shared.GameObjects.Components.Inventory;
+
+namespace Content.Server.GameObjects
+{
+    public class HeatResistanceComponent : Component
+    {
+        public override string Name => "HeatResistance";
+
+        public int GetHeatResistance()
+        {
+            if (Owner.GetComponent<InventoryComponent>().TryGetSlotItem(EquipmentSlotDefines.Slots.GLOVES, itemComponent: out ClothingComponent gloves)
+             | Owner.TryGetComponent(out SpeciesComponent speciesComponent))
+            {
+                return Math.Max(gloves?.HeatResistance ?? int.MinValue, speciesComponent?.HeatResistance ?? int.MinValue);
+            }
+            return int.MinValue;
+        }
+    }
+}
diff --git a/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs b/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs
index f8a335e301..223210dac5 100644
--- a/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs
+++ b/Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs
@@ -34,6 +34,9 @@ namespace Content.Server.GameObjects
         /// </summary>
         private string templatename;
 
+        private int _heatResistance;
+        public int HeatResistance => _heatResistance;
+
         public override void ExposeData(ObjectSerializer serializer)
         {
             base.ExposeData(serializer);
@@ -43,6 +46,7 @@ namespace Content.Server.GameObjects
             Type type = AppDomain.CurrentDomain.GetAssemblyByName("Content.Server")
                 .GetType("Content.Server.GameObjects." + templatename);
             DamageTemplate = (DamageTemplates) Activator.CreateInstance(type);
+            serializer.DataFieldCached(ref _heatResistance, "HeatResistance", 323);
         }
 
         public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
diff --git a/Content.Server/GameObjects/Components/Power/LightBulbComponent.cs b/Content.Server/GameObjects/Components/Power/LightBulbComponent.cs
index d7ab69e8c8..b9aae3a803 100644
--- a/Content.Server/GameObjects/Components/Power/LightBulbComponent.cs
+++ b/Content.Server/GameObjects/Components/Power/LightBulbComponent.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using SS14.Shared.GameObjects;
 using SS14.Shared.Maths;
 using SS14.Shared.Serialization;
@@ -49,6 +49,12 @@ namespace Content.Server.GameObjects.Components.Power
 
         public LightBulbType Type = LightBulbType.Tube;
 
+        private int _burningTemperature;
+        public int BurningTemperature => _burningTemperature;
+
+        private float _powerUse;
+        public float PowerUse => _powerUse;
+
         /// <summary>
         ///     The current state of the light bulb. Invokes the OnLightBulbStateChange event when set.
         ///     It also updates the bulb's sprite accordingly.
@@ -82,6 +88,8 @@ namespace Content.Server.GameObjects.Components.Power
         {
             serializer.DataField(ref Type, "bulb", LightBulbType.Tube);
             serializer.DataField(ref _color, "color", Color.White);
+            serializer.DataFieldCached(ref _burningTemperature, "BurningTemperature", 1400);
+            serializer.DataFieldCached(ref _powerUse, "PowerUse", 40);
         }
 
         public void UpdateColor()
diff --git a/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs b/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs
index 91b9065086..10db5dbd24 100644
--- a/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs
+++ b/Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs
@@ -1,20 +1,15 @@
 using System;
 using Content.Server.GameObjects.Components.Sound;
 using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Interfaces.GameObjects;
 using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Inventory;
 using SS14.Server.GameObjects;
 using SS14.Server.GameObjects.Components.Container;
-using SS14.Server.GameObjects.EntitySystems;
 using SS14.Shared.Audio;
 using SS14.Shared.Enums;
 using SS14.Shared.GameObjects;
 using SS14.Shared.Interfaces.GameObjects;
 using SS14.Shared.Interfaces.Timing;
 using SS14.Shared.IoC;
-using SS14.Shared.Log;
-using SS14.Shared.Map;
 using SS14.Shared.Serialization;
 using SS14.Shared.ViewVariables;
 
@@ -33,8 +28,6 @@ namespace Content.Server.GameObjects.Components.Power
 
         private LightBulbType BulbType = LightBulbType.Tube;
 
-        [ViewVariables] private float Load = 40;
-
         [ViewVariables] private ContainerSlot _lightBulbContainer;
 
         [ViewVariables]
@@ -50,23 +43,44 @@ namespace Content.Server.GameObjects.Components.Power
             }
         }
 
-        bool IAttackBy.AttackBy(AttackByEventArgs eventArgs)
+        public bool AttackBy(AttackByEventArgs eventArgs)
         {
             return InsertBulb(eventArgs.AttackWith);
         }
 
-        bool IAttackHand.AttackHand(AttackHandEventArgs eventArgs)
+        public bool AttackHand(AttackHandEventArgs eventArgs)
         {
-            if (eventArgs.User.GetComponent<InventoryComponent>().GetSlotItem(EquipmentSlotDefines.Slots.GLOVES) != null)
+            if (!eventArgs.User.TryGetComponent(out DamageableComponent damageableComponent))
+            {
+                Eject();
+                return false;
+            }
+            if(eventArgs.User.TryGetComponent(out HeatResistanceComponent heatResistanceComponent))
+            {
+                if(CanBurn(heatResistanceComponent.GetHeatResistance()))
+                {
+                    Burn();
+                    return true;
+                }
+            }
+            Eject();
+            return true;
+
+            bool CanBurn(int heatResistance)
+            {
+                return _lightState == LightState.On && heatResistance < LightBulb.BurningTemperature;
+            }
+
+            void Burn()
+            {
+                damageableComponent.TakeDamage(DamageType.Heat, 20);
+            }
+
+            void Eject()
             {
                 EjectBulb(eventArgs.User);
                 UpdateLight();
-                return true;
             }
-
-            if (!eventArgs.User.TryGetComponent(out DamageableComponent damageableComponent)) return false;
-            damageableComponent.TakeDamage(DamageType.Heat, 20);
-            return true;
         }
 
         /// <summary>
@@ -110,7 +124,6 @@ namespace Content.Server.GameObjects.Components.Power
 
         public override void ExposeData(ObjectSerializer serializer)
         {
-            serializer.DataField(ref Load, "load", 40);
             serializer.DataField(ref BulbType, "bulb", LightBulbType.Tube);
         }
 
@@ -122,6 +135,8 @@ namespace Content.Server.GameObjects.Components.Power
             UpdateLight();
         }
 
+        private LightState _lightState => Owner.GetComponent<PointLightComponent>().State;
+            
         /// <summary>
         ///     Updates the light's power drain, sprite and actual light state.
         /// </summary>
@@ -141,7 +156,7 @@ namespace Content.Server.GameObjects.Components.Power
             switch (LightBulb.State)
             {
                 case LightBulbState.Normal:
-                    device.Load = Load;
+                    device.Load = LightBulb.PowerUse;
                     if (device.Powered)
                     {
                         sprite.LayerSetState(0, "on");
@@ -159,7 +174,6 @@ namespace Content.Server.GameObjects.Components.Power
                         sprite.LayerSetState(0, "off");
                         light.State = LightState.Off;
                     }
-
                     break;
                 case LightBulbState.Broken:
                     device.Load = 0;
diff --git a/Content.Server/GameObjects/ContainerSlot.cs b/Content.Server/GameObjects/ContainerSlot.cs
index dee9a283c6..0d939a58dc 100644
--- a/Content.Server/GameObjects/ContainerSlot.cs
+++ b/Content.Server/GameObjects/ContainerSlot.cs
@@ -1,11 +1,7 @@
 using SS14.Server.GameObjects.Components.Container;
 using SS14.Server.Interfaces.GameObjects;
 using SS14.Shared.Interfaces.GameObjects;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using SS14.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects
diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml
index f9093e2180..a7bfcfe5d3 100644
--- a/Resources/Maps/stationstation.yml
+++ b/Resources/Maps/stationstation.yml
@@ -5,10 +5,10 @@ meta:
 tilemap:
   0: space
   1: floor
-  2: plating
-  3: underplating
-  4: floor_white
-  5: floor_techmaint
+  2: floor_techmaint
+  3: floor_white
+  4: plating
+  5: underplating
 grids:
 - settings:
     chunksize: 16
@@ -17,17 +17,17 @@ grids:
     worldpos: 0,0
   chunks:
   - ind: "-1,0"
-    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAwAAAAEAAAABAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAUAAAABAAAAAQAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAQAAAAEAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAwAAAAEAAAABAAAAAwAAAAMAAAADAAAAAwAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAADAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAABQAAAAEAAAABAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAIAAAABAAAAAQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAFAAAAAQAAAAEAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAABQAAAAEAAAABAAAABQAAAAUAAAAFAAAABQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAUAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAFAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAUAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAFAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
   - ind: "-1,-1"
-    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAMAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAMAAAAFAAAAAwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAAAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAQAAAAEAAAABAAAAAQAAAAAAAAADAAAAAwAAAAMAAAADAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAAAwAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAwAAAAUAAAAFAAAAAwAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAAMAAAABAAAAAQAAAAEAAAABAAAAAAAAAAMAAAAFAAAABQAAAAMAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAADAAAAAQAAAAEAAAABAAAAAQAAAAAAAAADAAAABQAAAAMAAAADAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAAAwAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAwAAAAUAAAAFAAAAAwAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAAMAAAABAAAAAQAAAAEAAAABAAAAAAAAAAMAAAAFAAAABQAAAAMAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAADAAAAAQAAAAEAAAABAAAAAQAAAA==
+    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAAAAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAACAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAAAAAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAFAAAABQAAAAUAAAAFAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAABQAAAAEAAAABAAAAAQAAAAEAAAAAAAAABQAAAAIAAAACAAAABQAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAUAAAABAAAAAQAAAAEAAAABAAAAAAAAAAUAAAACAAAAAgAAAAUAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAAFAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAFAAAAAgAAAAUAAAAFAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAABQAAAAEAAAABAAAAAQAAAAEAAAAAAAAABQAAAAIAAAACAAAABQAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAUAAAABAAAAAQAAAAEAAAABAAAAAAAAAAUAAAACAAAAAgAAAAUAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAAFAAAAAQAAAAEAAAABAAAAAQAAAA==
   - ind: "-1,1"
     tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
   - ind: "0,1"
     tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
   - ind: "0,0"
-    tiles: AQAAAAMAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAADAAAAAwAAAAMAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAgAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAACAAAAAwAAAAIAAAAAAAAAAAAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+    tiles: AQAAAAUAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAFAAAABQAAAAUAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAFAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAABQAAAAUAAAAFAAAABQAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAABAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAEAAAABQAAAAQAAAAAAAAAAAAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
   - ind: "0,-1"
-    tiles: AAAAAAMAAAAFAAAABQAAAAMAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAADAAAAAQAAAAEAAAABAAAAAQAAAAAAAAADAAAABQAAAAMAAAADAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAAAwAAAAMAAAABAAAAAQAAAAEAAAAAAAAAAwAAAAUAAAAFAAAAAwAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAABAAAAAQAAAAEAAAABAAAAAAAAAAMAAAAFAAAABQAAAAMAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAAAQAAAAEAAAABAAAAAQAAAAAAAAADAAAAAwAAAAMAAAADAAAAAwAAAAMAAAADAAAABQAAAAUAAAAFAAAAAwAAAAMAAAADAAAAAwAAAAMAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAMAAAADAAAABQAAAAMAAAAFAAAABQAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAUAAAADAAAAAwAAAAMAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAFAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+    tiles: AAAAAAUAAAACAAAAAgAAAAUAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAAFAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAFAAAAAgAAAAUAAAAFAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAABQAAAAUAAAABAAAAAQAAAAEAAAAAAAAABQAAAAIAAAACAAAABQAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAABAAAAAQAAAAEAAAABAAAAAAAAAAUAAAACAAAAAgAAAAUAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAFAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAAAgAAAAIAAAACAAAABQAAAAUAAAAFAAAABQAAAAUAAAAAAAAABQAAAAUAAAAFAAAABQAAAAUAAAAFAAAAAgAAAAUAAAACAAAAAgAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAFAAAABQAAAAUAAAAFAAAABQAAAAIAAAAFAAAABQAAAAUAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAACAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
   - ind: "1,-1"
     tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
 entities:
@@ -37,12 +37,16 @@ entities:
     pos: -1.47174,4.550247
     rot: -1.5707963267949 rad
     type: Transform
+  - charge: 1000
+    type: HitscanWeaponCapacitor
 - type: LaserItem
   components:
   - grid: 0
     pos: -0.6748645,4.487747
     rot: -1.5707963267949 rad
     type: Transform
+  - charge: 1000
+    type: HitscanWeaponCapacitor
 - type: Brutepack
   components:
   - grid: 0
@@ -2779,4 +2783,30 @@ entities:
     pos: -7.5,5.5
     rot: -1.5707963267949 rad
     type: Transform
+- type: LeatherGloves
+  components:
+  - grid: 0
+    pos: -4.332221,4.64238
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: LeatherGloves
+  components:
+  - grid: 0
+    pos: -3.519721,4.64238
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: LeatherGloves
+  components:
+  - grid: 0
+    pos: -2.597846,4.61113
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: LedLightTube
+  components:
+  - grid: 0
+    pos: -3.511025,-10.35149
+    rot: -1.5707963267949 rad
+    type: Transform
+  - color: '#EEEEFFFF'
+    type: Sprite
 ...
diff --git a/Resources/Prototypes/Entities/Clothing/gloves.yml b/Resources/Prototypes/Entities/Clothing/gloves.yml
index 8036c1b19e..a47c382c76 100644
--- a/Resources/Prototypes/Entities/Clothing/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/gloves.yml
@@ -14,10 +14,10 @@
   description: Electrical gloves that keep you from frying
   components:
   - type: Sprite
-    sprite: Clothing/gloves_yellow.rsi
+    sprite: Clothing/glove_icons.rsi
     state: yellow
   - type: Icon
-    sprite: Clothing/gloves_yellow.rsi
+    sprite: Clothing/glove_icons.rsi
     state: yellow
   - type: Clothing
     sprite: Clothing/gloves_yellow.rsi
@@ -30,10 +30,27 @@
   description: Regular gloves that do not keep you from frying
   components:
   - type: Sprite
-    sprite: Clothing/gloves_black.rsi
+    sprite: Clothing/glove_icons.rsi
     state: black
   - type: Icon
-    sprite: Clothing/gloves_black.rsi
+    sprite: Clothing/glove_icons.rsi
     state: black
   - type: Clothing
     sprite: Clothing/gloves_black.rsi
+    HeatResistance: 500
+    
+- type: entity
+  parent: GlovesBase
+  id: LeatherGloves
+  name: Botanist's leather gloves
+  description: These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin. They're also quite warm.
+  components:
+  - type: Sprite
+    sprite: Clothing/glove_icons.rsi
+    state: leather
+  - type: Icon
+    sprite: Clothing/glove_icons.rsi
+    state: leather
+  - type: Clothing
+    sprite: Clothing/gloves_leather.rsi
+    HeatResistance: 1500
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Lights.yml b/Resources/Prototypes/Entities/Lights.yml
index 7a94c3f73d..ce44c3087d 100644
--- a/Resources/Prototypes/Entities/Lights.yml
+++ b/Resources/Prototypes/Entities/Lights.yml
@@ -45,7 +45,6 @@
     priority: Low
 
   - type: PoweredLight
-    load: 40
     bulb: Tube
     
 - type: entity
@@ -71,7 +70,6 @@
     priority: Low
 
   - type: PoweredLight
-    load: 40
     bulb: Bulb
 
 - type: entity
@@ -97,6 +95,23 @@
     sprite: Objects/light_tube.rsi
     state: normal
     
+- type: entity
+  parent: BaseLightbulb
+  name: LED Light Tube
+  id: LedLightTube
+  components:
+  - type: LightBulb
+    bulb: Tube
+    color: "#EEEEFF"
+    BurningTemperature: 350
+    PowerUse: 9
+  - type: Sprite
+    sprite: Objects/light_tube.rsi
+    state: normal
+  - type: Icon
+    sprite: Objects/light_tube.rsi
+    state: normal
+    
 - type: entity
   parent: BaseLightbulb
   name: Light Bulb
diff --git a/Resources/Prototypes/Entities/Mobs.yml b/Resources/Prototypes/Entities/Mobs.yml
index b6a8f9e4e5..8523ceb11f 100644
--- a/Resources/Prototypes/Entities/Mobs.yml
+++ b/Resources/Prototypes/Entities/Mobs.yml
@@ -50,6 +50,8 @@
     
   - type: Species
     Template: Human
+    HeatResistance: 323
+  - type: HeatResistance
   - type: Damageable
 
   - type: Eye
diff --git a/Resources/Textures/Clothing/gloves_black.rsi/black.png b/Resources/Textures/Clothing/glove_icons.rsi/black.png
similarity index 100%
rename from Resources/Textures/Clothing/gloves_black.rsi/black.png
rename to Resources/Textures/Clothing/glove_icons.rsi/black.png
diff --git a/Resources/Textures/Clothing/glove_icons.rsi/leather.png b/Resources/Textures/Clothing/glove_icons.rsi/leather.png
new file mode 100644
index 0000000000000000000000000000000000000000..74cadf937cea88d7717c3692c5cfef86f0edc879
GIT binary patch
literal 2772
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
a9^gBKJzc5Z@n+}%0000<MNUMnLSTa3@-^iE

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/glove_icons.rsi/meta.json b/Resources/Textures/Clothing/glove_icons.rsi/meta.json
new file mode 100644
index 0000000000..37a51a4162
--- /dev/null
+++ b/Resources/Textures/Clothing/glove_icons.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+    "states": [
+        {
+            "name": "black",
+            "directions": 1,
+            "delays": [ [ 1.0 ] ]
+        },
+        {
+            "name": "yellow",
+            "directions": 1,
+            "delays": [ [ 1.0 ] ]
+        },
+        {
+            "name": "leather",
+            "directions": 1,
+            "delays": [ [ 1.0 ] ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/gloves_yellow.rsi/yellow.png b/Resources/Textures/Clothing/glove_icons.rsi/yellow.png
similarity index 100%
rename from Resources/Textures/Clothing/gloves_yellow.rsi/yellow.png
rename to Resources/Textures/Clothing/glove_icons.rsi/yellow.png
diff --git a/Resources/Textures/Clothing/gloves_black.rsi/meta.json b/Resources/Textures/Clothing/gloves_black.rsi/meta.json
index 44c5631182..525c5d6586 100644
--- a/Resources/Textures/Clothing/gloves_black.rsi/meta.json
+++ b/Resources/Textures/Clothing/gloves_black.rsi/meta.json
@@ -1 +1,41 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "black", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-HAND", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+    "states": [
+        {
+            "name": "equipped-HAND",
+            "directions": 4,
+            "delays": [
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/gloves_leather.rsi/equipped-HAND.png b/Resources/Textures/Clothing/gloves_leather.rsi/equipped-HAND.png
new file mode 100644
index 0000000000000000000000000000000000000000..f828923efdb2b1a19c3759bce798a85874ce925e
GIT binary patch
literal 2097
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
WH0o3oH*|4a|6mwPoCOo<PWdkrqRv17

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/gloves_leather.rsi/inhand-left.png b/Resources/Textures/Clothing/gloves_leather.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..59529751b31f08141e3a0e86578a09f6bab8a348
GIT binary patch
literal 1611
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
JPDHLkV1h5?@X-JO

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/gloves_leather.rsi/inhand-right.png b/Resources/Textures/Clothing/gloves_leather.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..21334fdda68ba9b52b128d79cce47561a199a5cf
GIT binary patch
literal 1662
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
IM6N<$f?)pp5&!@I

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/gloves_leather.rsi/meta.json b/Resources/Textures/Clothing/gloves_leather.rsi/meta.json
new file mode 100644
index 0000000000..525c5d6586
--- /dev/null
+++ b/Resources/Textures/Clothing/gloves_leather.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+    "states": [
+        {
+            "name": "equipped-HAND",
+            "directions": 4,
+            "delays": [
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/gloves_yellow.rsi/meta.json b/Resources/Textures/Clothing/gloves_yellow.rsi/meta.json
index 5008a3259f..525c5d6586 100644
--- a/Resources/Textures/Clothing/gloves_yellow.rsi/meta.json
+++ b/Resources/Textures/Clothing/gloves_yellow.rsi/meta.json
@@ -1 +1,41 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "equipped-HAND", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "yellow", "directions": 1, "delays": [[1.0]]}]}
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5",
+    "states": [
+        {
+            "name": "equipped-HAND",
+            "directions": 4,
+            "delays": [
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ],
+                [ 1.0 ]
+            ]
+        }
+    ]
+}