Merge branch 'master' into new-netcode

Conflicts:
	Subsurface/Source/GUI/GUITextBlock.cs
	Subsurface/Source/GameMain.cs
	Subsurface/Source/Items/Components/Machines/Radar.cs
	Subsurface/Source/Networking/GameClient.cs

Subsurface/Content/Items/Artifacts/artifacts.xml

@@ -141,6 +141,18 @@
     
     <Propulsion force="-40" usablein="both"/>
 
+    <Projectile launchimpulse="80.0">
+      <Attack damage="1000" bleedingdamage="10" structuredamage="500" damagetype="Blunt"/>
+
+      <StatusEffect type="OnUse" Condition="-100.0" stun="10.0" disabledeltatime="true" sound="Content/Items/Artifacts/alienweapon.ogg">
+        <Explosion range="1000.0" structuredamage="5000" damage="1000" stun="10" force="50.0"/>
+      </StatusEffect>
+
+      <StatusEffect type="OnActive" target="This">
+        <ParticleEmitter particle="bubbles" anglemin="0" anglemax="360" particleamount="10" velocitymin="0" velocitymax="50" scalemin="2" scalemax="5"/>
+      </StatusEffect>
+    </Projectile>
+
     <ItemContainer capacity="1" hideitems="false" itempos="9,-15">
       <Containable name="Welding Fuel Tank"/>
       <Containable name="Oxygen Tank"/>

Subsurface/Content/Items/Engine/engine.xml

@@ -75,11 +75,12 @@
       <GuiFrame rect="0,0,0.5,0.5" alignment="Center" style="ItemUI"/>
     </Steering>
 
-    <Radar canbeselected = "true" powerconsumption="100">
+    <Radar canbeselected = "true" powerconsumption="100" displaybordersize="0.2">
       <sound file="radarPing.ogg" type="OnUse" range="4000.0"/>
       <GuiFrame rect="0,0,0.5,0.5" alignment="Center" style="ItemUI" color="0.0,0.0,0.0,0.0"/>
       <PingCircle texture="Content/Items/Engine/pingCircle.png" origin="0.5,0.5"/>
       <ScreenOverlay texture="Content/Items/Engine/radarOverlay.png" origin="0.5,0.5"/>
+      <Blip texture="Content/Items/Engine/radarBlip.png" origin="0.5,0.5"/>
     </Radar>
 
     <ConnectionPanel selectkey="Action" canbeselected = "true" msg="Rewire [Screwdriver]">
@@ -105,11 +106,12 @@
       <item name="Screwdriver"/>
     </fixrequirement>
 
-    <Radar canbeselected = "true" powerconsumption="100">
+    <Radar canbeselected = "true" powerconsumption="100" displaybordersize="0.2">
       <StatusEffect type="InWater" target="This" condition="-1.0"/>
       <GuiFrame rect="0,0,0.5,0.5" alignment="Center" style="ItemUI"/>
       <PingCircle texture="Content/Items/Engine/pingCircle.png" origin="0.5,0.5"/>
       <ScreenOverlay texture="Content/Items/Engine/radarOverlay.png" origin="0.5,0.5"/>
+      <Blip texture="Content/Items/Engine/radarBlip.png" origin="0.5,0.5"/>
     </Radar>
 
     <ConnectionPanel selectkey="Action" canbeselected = "true" msg="Rewire [Screwdriver]">

Subsurface/Content/Items/Tools/tools.xml

@@ -198,12 +198,13 @@
     <Holdable slots="Any,RightHand,LeftHand"
               holdangle="30" handle1="-10,0"/>
 
-    <Radar range="6000.0" powerconsumption="10" drawhudwhenequipped="true" detectsubmarinewalls="true">
+    <Radar range="6000.0" powerconsumption="10" drawhudwhenequipped="true" detectsubmarinewalls="true" displaybordersize="0.2">
       <StatusEffect type="OnUse" target="Contained" Condition="-1.0" disabledeltatime="true"/>
       <sound file="Content/Items/Engine/radarPing.ogg" type="OnUse" range="1000.0"/>
       <GuiFrame rect="0,0,0.5,0.5" alignment="Center" style="ItemUI"/>
       <PingCircle texture="Content/Items/Engine/pingCircle.png" origin="0.5,0.5"/>
       <ScreenOverlay texture="Content/Items/Engine/radarOverlay.png" origin="0.5,0.5"/>
+      <Blip texture="Content/Items/Engine/radarBlip.png" origin="0.5,0.5"/>
     </Radar>
 
     <ItemContainer capacity="1" hideitems="true">

Subsurface/Content/Items/Weapons/railgun.xml

@@ -60,6 +60,7 @@
     <ItemContainer hideitems="false" drawinventory="true" capacity="6" slotsperrow="6" itempos="24,-75" iteminterval="26,0" itemrotation="90" canbeselected = "true">
       <Containable name="Railgun Shell"/>
       <Containable name="Nuclear Shell"/>
+      <Containable name="Ancient Weapon"/>
     </ItemContainer>      
   </Item>