Fixed AIObjectiveGoto terminating if previous path was unreachable, BackGroundSpriteManager won't place a sprite if a suitable position isn't found, StatusEffect fire position fix, UI improvements, door convexhull fix, progress on Fabricators & Deconstructors, mapentities sorted by category in edit mode, item descriptions, TutorialMode refactoring to make it easier to add new types of tutorials

2015-12-28 13:21:24 +02:00
parent 8c032d8368
commit 92d396e6b2
69 changed files with 1264 additions and 455 deletions
@@ -6,6 +6,14 @@

    <Sprite texture="artifact.png" depth="0.8" sourcerect="0,0,38,60"/>

+    <Deconstruct time="30">
+      <Item name="Steel Bar"/>
+      <Item name="Copper Bar"/>
+      <Item name="Uranium Bar"/>
+      <Item name="Uranium Bar"/>
+    </Deconstruct>
+    
+    
    <Body width="36" height="60" density="5"/>

    <Holdable slots="RightHand+LeftHand" holdpos="30,-15" handle1="0,10" handle2="0,-10"/>
@@ -17,6 +25,13 @@

    <Sprite texture="artifact.png" depth="0.8" sourcerect="74,0,44,61"/>

+    <Deconstruct time="30">
+      <Item name="Steel Bar"/>
+      <Item name="Incendium Bar"/>
+      <Item name="Incendium Bar"/>
+      <Item name="Incendium Bar"/>
+    </Deconstruct>
+    
    <Body radius="20" height="20" density="5"/>

    <Holdable slots="RightHand+LeftHand" holdpos="30,-15" handle1="0,10" handle2="0,-10">
@@ -1,6 +1,6 @@
 <Item
  name="Button"
-  type="Controller"  
+  category="Electrical"
  linkable="true"
  tags="smallitem"
  pickdistance="150.0"
@@ -1,8 +1,10 @@
 <Items>
  <Item
    name="Captain's Cap"
+    category="Equipment"
    pickdistance="150"
-    tags="smallitem">
+    tags="smallitem"
+    description="A token of the Captain's unquestionable authority.">

    <Sprite texture ="captainhat.png" depth="0.6"/>

@@ -15,6 +17,7 @@

  <Item
    name="Captain's Jacket"
+    category="Equipment"
    pickdistance="150"
    tags="smallitem">

@@ -35,6 +38,7 @@

  <Item
    name="Captain's Trousers"
+    category="Equipment"
    pickdistance="150"
    tags="smallitem">

@@ -54,8 +58,10 @@

  <Item
    name="Body Armor"
+    category="Equipment"
    pickdistance="150"
-    tags="smallitem">
+    tags="smallitem"
+    description="While the body armor won't offer adequate protection against most of the inhabitants of the subsurface ocean, it can be extremely useful if there are traitors on board.">

    <Sprite texture ="securitygear.png" sourcerect="68,0,60,31" depth="0.6"/>

@@ -70,8 +76,10 @@

  <Item
    name="Ballistic Helmet"
+    category="Equipment"
    pickdistance="150"
-    tags="smallitem">
+    tags="smallitem"
+    description="While the helmet won't offer adequate protection against most of the inhabitants of the subsurface ocean, it can be extremely useful if there are traitors on board.">

    <Sprite texture ="securitygear.png" sourcerect="40,32,34,25" depth="0.6"/>

@@ -84,9 +92,11 @@

  <Item
    name="Orange Jumpsuit"
+    category="Equipment"
    pickdistance="150"
    tags="smallitem"
-    fireproof="true">
+    fireproof="true"
+    description="The fire-resistant fabric offers some protection against fires. Plenty of pockets for carrying any extra gear an engineer might need.">

    <Sprite texture = "engigear.png" sourcerect="0,52,50,25" depth="0.6"/>

@@ -110,9 +120,11 @@

  <Item
    name="Blue Jumpsuit"
+    category="Equipment"
    pickdistance="150"
    tags="smallitem"
-    fireproof="true">
+    fireproof="true"
+    description="The fire-resistant fabric offers some protection against fires. Plenty of pockets for carrying any extra gear a mechanic might need.">

    <Sprite texture = "engigear.png" sourcerect="53,50,51,25" depth="0.6"/>

@@ -19,9 +19,11 @@
  
  <Item
    name="Diving Mask"
+    category="Equipment"
    Tags="smallitem,diving"
    pickdistance="200"
-    price="50">
+    price="50"
+    description="Small enough to carry around in case of need, but won't protect you from the water pressure in the event of a full-blown hull breach.">

    <Sprite texture ="DivingMask.png" depth="0.5"/>
  
@@ -46,10 +48,12 @@

  <Item
    name="Diving Suit"
+    category="Equipment"
    tags="diving"
    pickdistance="200"
    price="200"
-    fireproof="true">
+    fireproof="true"
+    description="An atmospheric diving suit capable of withstanding the immense pressure under Europa's crust.">

    <Sprite texture ="DivingSuit.png" sourcerect="82,0,46,128" depth="0.55"/>

@@ -90,9 +94,11 @@

  <Item
    name="Underwater Scooter"
+    category="Equipment"
    Tags="smallitem"
    pickdistance="200"
-    price="50">
+    price="50"
+    description="A battery-powered underwater propulsion device.">

    <Sprite texture ="DivingSuit.png" depth="0.5" sourcerect="22,98,59,32" origin="0.6,0.66"/>

@@ -4,6 +4,7 @@
  
  <Item
    name="Lamp"
+    category="Electrical"
    Tags="smallitem"
    pickdistance="150">

@@ -2,8 +2,10 @@
 <Items>
  <Item
    name="Junction Box"
+    category="Electrical"
    linkable="true"
-    pickdistance="150">
+    pickdistance="150"
+    description="Serves as a hub for power distribution and relaying signals between devices.">
    
    <Sprite texture ="junctionbox.png" depth="0.8"/>

@@ -35,8 +37,10 @@

  <Item
    name="Battery"
+    category="Electrical"
    linkable="true"
-    pickdistance="150">
+    pickdistance="150"
+    description="Generally used for storing backup power in case of a reactor failure.">

    <Sprite texture ="battery.png" depth="0.8"/>

@@ -60,8 +64,10 @@

  <Item
    name="Supercapacitor"
+    category="Electrical"
    linkable="true"
-    pickdistance="150">
+    pickdistance="150"
+    description="Can accept and deliver charge much faster than batteries.">

    <Sprite texture ="supercapacitor.png" depth="0.8"/>

@@ -4,12 +4,17 @@

  <Item
    name="Wire"
+    category="Electrical"
    Tags="smallitem,wire"
    pickdistance="150"
    linkable="true"
    canbepicked="true"
    price="10">

+    <Deconstruct time="5">
+      <Item name="Copper Bar"/>
+    </Deconstruct>
+
    <Sprite texture ="wire.png" depth="0.55"/>

    <Body radius="15"/>
@@ -21,6 +26,7 @@

  <Item
    name="Red Wire"
+    category="Electrical"
    Tags="smallitem,wire"
    spritecolor="1.0,0.0,0.0,1.0"
    pickdistance="150"
@@ -28,6 +34,10 @@
    canbepicked="true"
    price="10">

+    <Deconstruct time="5">
+      <Item name="Copper Bar"/>
+    </Deconstruct>
+
    <Sprite texture ="wire.png" depth="0.55"/>
    <Body radius="15"/>
    <Holdable slots="Any,RightHand,LeftHand" handle1="0,0"/>
@@ -37,6 +47,7 @@

  <Item
    name="Blue Wire"
+    category="Electrical"
    Tags="smallitem,wire"
    spritecolor="0.0,0.6,1.0,1.0"
    pickdistance="150"
@@ -44,6 +55,10 @@
    canbepicked="true"
    price="10">

+    <Deconstruct time="5">
+      <Item name="Copper Bar"/>
+    </Deconstruct>
+
    <Sprite texture ="wire.png" depth="0.55"/>
    <Body radius="15"/>
    <Holdable slots="Any,RightHand,LeftHand" handle1="0,0"/>
@@ -53,6 +68,7 @@

  <Item
    name="Orange Wire"
+    category="Electrical"
    Tags="smallitem,wire"
    spritecolor="1.0,0.5,0.0,1.0"
    pickdistance="150"
@@ -60,6 +76,10 @@
    canbepicked="true"
    price="10">

+    <Deconstruct time="5">
+      <Item name="Copper Bar"/>
+    </Deconstruct>
+
    <Sprite texture ="wire.png" depth="0.55"/>
    <Body radius="15"/>
    <Holdable slots="Any,RightHand,LeftHand" handle1="0,0"/>
@@ -68,13 +88,36 @@
  </Item>

  <Item
-    name="And Component"
+    name="FPGA Circuit"
+    category="Electrical"
    Tags="smallitem"
    pickdistance="150"
    linkable="true"
-    price="10">
+    price="100"
+    description="Field-programmable gate array - a multi-purpose circuit which can be reconfigured for use in a large variety of electrical devices.">

-    <Sprite texture ="and.png"  depth="0.8"/>
+    <Sprite texture="signalcomp.png" depth="0.8" sourcerect="32,16,16,16"/>
+
+    <Body width="16" height="16"/>
+
+    <Holdable selectkey="Action" slots="Any,RightHand,LeftHand"/>
+  </Item>
+
+  <Item
+    name="And Component"
+    category="Electrical"
+    Tags="smallitem"
+    pickdistance="150"
+    linkable="true"
+    price="10"
+    description="Sends a signal when both inputs receive a signal within a set period of each other.">
+
+    <Deconstruct time="10">
+      <Item name="Steel Bar"/>
+      <Item name="FPGA Circuit"/> 
+    </Deconstruct>
+
+    <Sprite texture="signalcomp.png" depth="0.8" sourcerect="0,0,16,16"/>

    <AndComponent canbeselected = "true"/>

@@ -97,10 +140,17 @@

  <Item
    name="Or Component"
+    category="Electrical"
    Tags="smallitem"
    pickdistance="150"
    linkable="true"
-    price="10">
+    price="10"
+    description="Sends a signal if either of the inputs receive a signal.">
+
+    <Deconstruct time="10">
+      <Item name="Steel Bar"/>
+      <Item name="FPGA Circuit"/>
+    </Deconstruct>

    <Sprite texture="signalcomp.png" depth="0.8" sourcerect="16,0,16,16"/>

@@ -124,10 +174,17 @@
  
  <Item
    name="Not Component"
+    category="Electrical"
    Tags="smallitem"
    pickdistance="150"
    linkable="true"
-    price="10">
+    price="10"
+    description="Sends a signal when the input is NOT receiving a signal.">
+
+    <Deconstruct time="10">
+      <Item name="Steel Bar"/>
+      <Item name="FPGA Circuit"/>
+    </Deconstruct>

    <Sprite texture="signalcomp.png" depth="0.8" sourcerect="32,0,16,16"/>

@@ -150,11 +207,17 @@
  
  <Item
    name="Light Component"
+    category="Electrical"
    Tags="smallitem"
    pickdistance="150"
    linkable="true"
    price="10">

+    <Deconstruct time="10">
+      <Item name="Steel Bar"/>
+      <Item name="FPGA Circuit"/>
+    </Deconstruct>
+
    <Sprite texture="signalcomp.png" depth="0.8" sourcerect="48,0,16,16"/>

    <LightComponent canbeselected = "true" color="1.0,0.0,0.0,1.0">
@@ -177,10 +240,17 @@

  <Item
    name="Oxygen Detector"
+    category="Electrical"
    Tags="smallitem"
    pickdistance="150"
    linkable="true"
-    price="10">
+    price="10"
+    description="Sends out a value between 0-100 depending on the quality of the surrounding air.">
+
+    <Deconstruct time="10">
+      <Item name="Steel Bar"/>
+      <Item name="FPGA Circuit"/>
+    </Deconstruct>

    <Sprite texture="signalcomp.png" depth="0.8" sourcerect="96,0,31,24"/>

@@ -201,10 +271,17 @@

  <Item
    name="Water Detector"
+    category="Electrical"
    Tags="smallitem"
    pickdistance="150"
    linkable="true"
-    price="10">
+    price="10"
+    description="Sends out a signal when the detector is submerged.">
+
+    <Deconstruct time="10">
+      <Item name="Steel Bar"/>
+      <Item name="FPGA Circuit"/>
+    </Deconstruct>

    <Sprite texture="signalcomp.png" depth="0.8" sourcerect="64,0,31,25"/>

@@ -225,10 +302,17 @@

  <Item
    name="Signal Check Component"
+    category="Electrical"
    Tags="smallitem"
    pickdistance="150"
    linkable="true"
-    price="10">
+    price="10"
+    description="Sends a signal when a signal matching a specific value is received.">
+
+    <Deconstruct time="10">
+      <Item name="Steel Bar"/>
+      <Item name="FPGA Circuit"/>
+    </Deconstruct>

    <Sprite texture="signalcomp.png" depth="0.8" sourcerect="0,16,16,16"/>

@@ -252,10 +336,17 @@

  <Item
    name="RegEx Find Component"
+    category="Electrical"
    Tags="smallitem"
    pickdistance="150"
    linkable="true"
-    price="10">
+    price="10"
+    description="Sends a signal if the received signal matches a specific regular expression pattern.">
+
+    <Deconstruct time="10">
+      <Item name="Steel Bar"/>
+      <Item name="FPGA Circuit"/>
+    </Deconstruct>

    <Sprite texture="signalcomp.png" depth="0.8" sourcerect="16,16,16,16"/>

@@ -277,10 +368,17 @@

  <Item
    name="Wifi Component"
+    category="Electrical"
    Tags="smallitem"
    pickdistance="150"
    linkable="true"
-    price="20">
+    price="20"
+    description="Allows remote communication between other Wifi Components that are using the same channel.">
+
+    <Deconstruct time="10">
+      <Item name="Steel Bar"/>
+      <Item name="FPGA Circuit"/>
+    </Deconstruct>

    <Sprite texture="signalcomp.png" depth="0.8" sourcerect="0,32,15,19"/>

@@ -4,6 +4,7 @@
  <Item
    name="Engine"
    linkable="true"
+    category="Machine"
    pickdistance="150">

    <Sprite texture ="engine.png" depth="0.8"/>
@@ -23,6 +24,7 @@
  <Item
    name="Navigation Terminal"
    linkable="true"
+    category="Machine"
    pickdistance="150">

    <Sprite texture ="fabricator.png" depth="0.8"/>
@@ -50,6 +52,7 @@
  <Item
    name="Sonar Monitor"
    linkable="true"
+    category="Machine"
    pickdistance="150">

    <Sprite texture ="fabricator.png" depth="0.8"/>
@@ -3,14 +3,35 @@
 	<Item
 		name="Fabricator"
 		linkable="true"
-		pickdistance="150">
+		pickdistance="150"
+    category="Machine"
+    description="A machine capable of manufacturing a wide range of items out of basic raw materials.">
 		
 		<Sprite texture ="fabricator.png" depth="0.8"/>

 		<Fabricator canbeselected = "true">
-			<fabricableitem name="Harpoon Gun" requireditems="ID Card, Spear"/>
-			<fabricableitem name="Plasma Cutter" requireditems="Wrench, Spear"/>
-		</Fabricator>
+
+      <GuiFrame rect="0,0,600,400" alignment="Center" color="0.0,0.0,0.0,0.6"/>
+
+      <sound file="fabricator.ogg" type="OnActive" range="1000.0" loop="true"/>
+      
+			<fabricableitem name="Harpoon Gun" requireditems="Steel Bar" requiredtime="20"/>
+			<fabricableitem name="Plasma Cutter" requireditems="Steel Bar" requiredtime="20"/>
+
+      <fabricableitem name="And Component" requireditems="Steel Bar, FPGA Circuit" requiredtime="10"/>
+      <fabricableitem name="Or Component" requireditems="Steel Bar, FPGA Circuit" requiredtime="10"/>
+      <fabricableitem name="Not Component" requireditems="Steel Bar, FPGA Circuit" requiredtime="10"/>
+      <fabricableitem name="Light Component" requireditems="Steel Bar, FPGA Circuit" requiredtime="10"/>
+      <fabricableitem name="Oxygen Detector" requireditems="Steel Bar, FPGA Circuit" requiredtime="10"/>
+      <fabricableitem name="Water Detector" requireditems="Steel Bar, FPGA Circuit" requiredtime="10"/>  
+      <fabricableitem name="Signal Check Component" requireditems="Steel Bar, FPGA Circuit" requiredtime="10"/>      
+      <fabricableitem name="RegEx Find Component" requireditems="Steel Bar, FPGA Circuit" requiredtime="10"/>  
+      <fabricableitem name="Wifi Component" requireditems="Steel Bar, FPGA Circuit" requiredtime="10"/>
+
+      <fabricableitem name="Fuel Rod" requireditems="Steel Bar, Uranium Bar"/>
+
+      <fabricableitem name="Incendium Fuel Rod" requireditems="Steel Bar, Incendium Bar"/>
+    </Fabricator>
 		
 		<ConnectionPanel canbeselected = "true">
 			<requireditem name="Screwdriver" type="Equipped"/>
@@ -21,4 +42,27 @@
 		<ItemContainer capacity="5" canbeselected="true" hideitems="true" hudpos="0.8, 0.7" slotsperrow="1"/>
 	</Item>

+  <Item
+    name="Deconstructor"
+    linkable="true"
+    pickdistance="150"
+    category="Machine"
+    description="Disassembles and breaks down items to reusable components and material bars.">
+
+    <Sprite texture ="fabricator.png" depth="0.8"/>
+
+    <Deconstructor canbeselected = "true">
+      <sound file="deconstructor.ogg" type="OnActive" range="1000.0" loop="true"/>
+      
+      <GuiFrame rect="0,0,300,200" alignment="Center" color="0.0,0.0,0.0,0.6"/>
+    </Deconstructor>
+
+    <ConnectionPanel canbeselected = "true">
+      <requireditem name="Screwdriver" type="Equipped"/>
+      <output name="power_in"/>
+    </ConnectionPanel>
+
+    <ItemContainer capacity="5" canbeselected="true" hideitems="true" hudpos="0.5, 0.4" slotsperrow="5"/>
+    <ItemContainer capacity="10" canbeselected="true" hideitems="true" hudpos="0.5, 0.8" slotsperrow="5"/>
+  </Item>
 </Items>
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Items>
+  <Item
+    name="Steel Bar"
+    category="Material"
+    Tags="smallitem"
+    pickdistance="150"
+    canbepicked="true"
+    price="10">
+
+    <Sprite texture ="materials.png" sourcerect="0,0,24,12" depth="0.55"/>
+
+    <Body width="24" height="12"/>
+
+    <Holdable slots="Any,RightHand,LeftHand" handle1="0,0"/>
+  </Item>
+
+  <Item
+     name="Uranium Bar"
+     category="Material"
+     Tags="smallitem"
+     pickdistance="150"
+     spritecolor="0.2,0.35,0.06,1.0"
+     canbepicked="true"
+     price="50">
+
+    <Sprite texture ="materials.png" sourcerect="0,0,24,12" depth="0.55"/>
+
+    <Body width="24" height="12"/>
+
+    <Holdable slots="Any,RightHand,LeftHand" handle1="0,0"/>
+  </Item>
+
+  <Item
+   name="Copper Bar"
+   category="Material"
+   Tags="smallitem"
+   pickdistance="150"
+   spritecolor="0.78,0.55,0.2,1.0"
+   canbepicked="true"
+   price="50">
+
+    <Sprite texture ="materials.png" sourcerect="0,0,24,12" depth="0.55"/>
+
+    <Body width="24" height="12"/>
+
+    <Holdable slots="Any,RightHand,LeftHand" handle1="0,0"/>
+  </Item>
+  
+  <Item
+   name="Incendium Bar"
+   category="Material"
+   Tags="smallitem"
+   pickdistance="150"
+   spritecolor="0.5,0.0,0.0,1.0"
+   canbepicked="true"
+   price="50">
+
+    <Sprite texture ="materials.png" sourcerect="0,0,24,12" depth="0.55"/>
+
+    <Body width="24" height="12"/>
+
+    <Holdable slots="Any,RightHand,LeftHand" handle1="0,0"/>
+  </Item>
+
+  <Item
+   name="Fulgurium Bar"
+   category="Material"
+   Tags="smallitem"
+   pickdistance="150"
+   spritecolor="1.0,0.7,0.05,1.0"
+   canbepicked="true"
+   price="50">
+
+    <Sprite texture ="materials.png" sourcerect="0,0,24,12" depth="0.55"/>
+
+    <Body width="24" height="12"/>
+
+    <Holdable slots="Any,RightHand,LeftHand" handle1="0,0"/>
+  </Item>
+  
+  
+</Items>
@@ -2,9 +2,11 @@
 <Items>
  <Item
    name="Medical Syringe"
+    category="Equipment"
    Tags="smallitem"
    pickdistance="150"
-    price="50">
+    price="50"
+    description="A syringe filled with a potent general-purpose medical compound.">

    <Sprite texture ="med.png" sourcerect="0,0,24,5" depth="0.6"/>

@@ -17,9 +19,11 @@

  <Item
    name="Bandage"
+    category="Equipment"
    Tags="smallitem"
    pickdistance="150"
-    price="20">
+    price="20"
+    description="Treated with a hemostatic agent that quickly seals most minor wounds.">

    <Sprite texture ="med.png" sourcerect="0,14,14,18" depth="0.6"/>

@@ -1,5 +1,6 @@
 <Item
  name="MiniMap"
+  category="Machine"
  linkable="true">

  <Sprite texture ="fabricator.png" depth="0.8"/>
@@ -1,6 +1,7 @@
 <Items>
  <Item
    name="Oxygen Generator"
+    category="Machine"
    linkable="true">


@@ -25,6 +26,7 @@

  <Item
    name="Vent"
+    category="Machine"
    linkable="true">

    <Sprite texture ="vent.png" depth="0.91"/>
@@ -1,6 +1,7 @@
 <Item
  name="Pump"
  linkable="true"
+  category="Machine"
  pickdistance="200">

  <Sprite texture ="pump.png" depth="0.8"/>
@@ -2,7 +2,8 @@
  <Item
    name="Nuclear Reactor"
    type ="Reactor"
-    linkable="true">
+    linkable="true"
+    category="Machine">
    
    <trigger/>

@@ -42,6 +43,9 @@
      <Containable name="Fuel Rod">
        <StatusEffect type="OnContaining" target="This" AvailableFuel="2000.0" disabledeltatime="true"/>
      </Containable>
+      <Containable name="Incendium Fuel Rod">
+        <StatusEffect type="OnContaining" target="This" AvailableFuel="5000.0" disabledeltatime="true"/>
+      </Containable>
      <Containable name="Heat Absorber"/>
      <Containable name="Temperature Control Circuit"/>  
    </ItemContainer>
@@ -61,6 +65,22 @@
    <Pickable slots="RightHand,Any"/>
  </Item>

+  <Item
+    name="Incendium Fuel Rod"
+    Tags="smallitem"
+    pickdistance="150"
+    spritecolor="0.5,0.0,0.0,1.0"
+    price="200">
+
+    <Sprite texture ="fuelrod.png"/>
+
+    <Body radius="6" height="22" density="5"/>
+
+    <Holdable handle1="0,0"/>
+    <Pickable slots="RightHand,Any"/>
+  </Item>
+  
+
  <Item
    name="Heat Absorber"
    Tags="smallitem"
@@ -2,9 +2,11 @@
 <Items>
  <Item
    name="Welding Tool"
+    category="Equipment"
    Tags="smallitem"
    pickdistance="200"
-    price="100">
+    price="100"
+    description="One of the most crucial tools on board the submarine. Also works underwater.">

    <Sprite texture ="weldingtool.png"  depth="0.5"/>

@@ -48,9 +50,11 @@

  <Item
    name="Plasma Cutter"
+    category="Equipment"
    Tags="smallitem"
    pickdistance="200"
-    price="100">
+    price="100"
+    description="Cuts through various materials using a jet of ionized oxygen.">

    <Sprite texture ="plasmacutter.png"  depth="0.5"/>

@@ -85,6 +89,7 @@

  <Item
    name="Welding Fuel Tank"
+    category="Equipment"
    Tags="smallitem"
    pickdistance="150"
    price="50">
@@ -102,9 +107,11 @@
  
  <Item
    name="Fire Extinguisher"
+    category="Equipment"
    Tags="smallitem"
    pickdistance="200"
-    price="100">
+    price="100"
+    description="A handheld carbon dioxide extinguisher.">

    <Sprite texture ="extinguisher.png"  depth="0.5" sourcerect="0,0,34,64" origin="0.4,0.5"/>

@@ -124,6 +131,7 @@

  <Item
    name="Screwdriver"
+    category="Equipment"
    Tags="smallitem"
    pickdistance="200"
    price="10">
@@ -139,6 +147,7 @@

  <Item
    name="Wrench"
+    category="Equipment"
    Tags="smallitem"
    pickdistance="200"
    price="10">
@@ -2,6 +2,7 @@
 <Items>
  <Item
    name="C-4 Block"
+    category="Equipment"
    Tags="smallitem,explosive"
    pickdistance="150"
    price="100">
@@ -19,6 +20,7 @@

  <Item
    name="Detonator"
+    category="Equipment"
    Tags="smallitem"
    pickdistance="150"
    price="50">
@@ -1,6 +1,7 @@
 <Items>
  <Item
    name="Railgun"
+    category="Machine"
    focusonselected="true"
    offsetonselected="700"
    linkable="true"
@@ -26,6 +27,7 @@

  <Item
    name="Railgun Controller"
+    category="Machine"
    type="Controller"
    linkable="true"
    pickdistance="150">
@@ -48,6 +50,7 @@

  <Item
    name="Railgun Loader"
+    category="Machine"
    linkable="true"
    pickdistance="150">

@@ -61,6 +64,7 @@
  
  <Item
    name="Railgun Shell"
+    category="Equipment"
    pickdistance="200"
    price="100">

@@ -3,10 +3,15 @@
 <Items>
  <Item
    name="Spear"
+    category="Equipment"
    pickdistance="200"
    pickthroughwalls="true"
    price="50">

+    <Deconstruct time="5">
+      <Item name="Steel Bar"/>
+    </Deconstruct>
+
    <Sprite texture="weapons.png" sourcerect="0,50,65,7" depth="0.55"/>

    <Body width="64" height="5" density="20"/>
@@ -19,9 +24,14 @@
  
  <Item
    name="Harpoon Gun"
+    category="Equipment"
    pickdistance="200"
    price="500"
    tags="weapon">
+
+    <Deconstruct time="10">
+      <Item name="Steel Bar"/>
+    </Deconstruct>
  
    <Sprite texture="weapons.png" sourcerect="0,25,98,25" depth="0.5"/>

@@ -44,6 +54,7 @@

  <Item
    name="Stun Grenade"
+    category="Equipment"
    pickdistance="200"
    price="200"
    tags="smallitem,weapon">
@@ -61,9 +72,11 @@

  <Item
    name="Stun Baton"
+    category="Equipment"
    Tags="smallitem,weapon"
    pickdistance="150"
-    price="100">
+    price="100"
+    description="If verbal orders are insufficient, a high-voltage shock from a Stun Baton may be enough to beat an unruly crew member into submission.">

    <Sprite texture="weapons.png" sourcerect="20,0,77,23" depth="0.5"/>
    
@@ -85,9 +98,11 @@

  <Item
    name="Battery Cell"
+    category="Equipment"
    pickdistance="150"
    tags="smallitem,loadable"
-    price="50">
+    price="50"
+    description="Used as a power source for various handheld devices. Most submarines have several stationary backup batteries with recharge docks for battery cells.">

    <Sprite texture="weapons.png" sourcerect="0,0,20,9" depth="0.8"/>

@@ -2,6 +2,7 @@

 <Item
 	name="ID Card"
+  category="Equipment"
 	Tags="smallitem"
 	pickdistance="150">

@@ -2,7 +2,7 @@
 <style>
  <GUIFrame
    padding="40.0, 40.0, 40.0, 40.0"
-    color="0.0, 0.0, 0.0, 0.7"
+    color="0.8, 0.8, 0.8, 0.85"
  
    textcolor="0.0, 0.0, 0.0, 1.0"
  
@@ -10,15 +10,21 @@
    selectedcolor="1.0, 0.82, 0.05, 1.0"    
    
    outlinecolor="0.5, 0.57, 0.6, 1.0">
+
+    <Sprite texture="Content/UI/uiBackground.png" size="0.0, 0.0" sourcerect ="0.0, 90.0, 0.0, 100.0"/>
  </GUIFrame>

  <GUIButton
-    color="0.88, 0.25, 0.15, 0.3"
+    color="0.88, 0.25, 0.15, 0.8"
  
    textcolor="1.0, 1.0, 1.0, 1.0"
  
    hovercolor="0.88, 0.25, 0.15, 1.0"
-    selectedcolor="1.0, 0.0, 0.0, 1.0"/>
+    selectedcolor="1.0, 0.0, 0.0, 1.0">
+
+    <Sprite texture="Content/UI/uiButton.png" size="1.0, 1.0" tile="false" maintainaspectratio="false" sourcerect ="0.0, 0.0, 0.0, 71.0"/>
+
+  </GUIButton>

  <GUITextBlock
    textcolor="1.0, 1.0, 1.0, 1.0"
@@ -27,11 +33,9 @@
    padding="10.0, 0.0, 10.0, 0.0"/>
  
  <GUIListBox
-    color="0.5, 0.5, 0.5, 1.0"
+    color="0.0, 0.0, 0.0, 1.0"
    textcolor="1.0, 1.0, 1.0, 1.0"
    outlinecolor="0.5, 0.57, 0.6, 1.0">
-    <Sprite texture="Content/UI/uiBackground.png" size="0.0, 0.0" sourcerect ="0.0, 90.0, 0.0, 100.0"/>
-    <Sprite texture="Content/UI/uiBackground.png" size="0.0, 1.0" sourcerect ="0.0, 0.0, 0.0, 90.0"/>
  </GUIListBox>

  <GUIScrollBar
@@ -50,11 +54,10 @@
  </GUIDropDown>

  <GUITextBox
-    color="0.5, 0.5, 0.5, 1.0"  
+    color="0.0, 0.0, 0.0, 1.0"  
    hovercolor="0.8, 0.8, 0.8, 1.0"
    textcolor="1.0, 1.0, 1.0, 1.0"
    outlinecolor="0.5, 0.57, 0.6, 1.0">
-    <Sprite texture="Content/UI/uiBackground.png" size="0.0, 0.0" sourcerect ="0.0, 90.0, 0.0, 100.0"/>
  </GUITextBox>

  <GUITickBox