diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj
index 62de4f09e..e324edba1 100644
--- a/Subsurface/Barotrauma.csproj
+++ b/Subsurface/Barotrauma.csproj
@@ -361,6 +361,10 @@
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Characters\Fractalguardian2\fractalguardian2.xml">
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Characters\Fractalguardian\fractalguardian.xml">
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -670,6 +674,9 @@
     <Content Include="Content\Lights\light.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Lights\lightcone.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Lights\penumbra.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1041,6 +1048,9 @@
     <None Include="Content\effects.mgfx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Content\Items\Artifacts\alienweapon.ogg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Items\Button\beep.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -1197,6 +1207,9 @@
     <None Include="Content\Sounds\Music\amb_JD_drone_clattering_machine.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Content\Sounds\Music\Controlled Chaos 2.ogg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Sounds\Music\Controlled Chaos.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/Subsurface/Content/Characters/Fractalguardian/fractalguardian.png b/Subsurface/Content/Characters/Fractalguardian/fractalguardian.png
index 3f5fec6e5..dc9d4eddb 100644
Binary files a/Subsurface/Content/Characters/Fractalguardian/fractalguardian.png and b/Subsurface/Content/Characters/Fractalguardian/fractalguardian.png differ
diff --git a/Subsurface/Content/Characters/Fractalguardian/fractalguardian.xml b/Subsurface/Content/Characters/Fractalguardian/fractalguardian.xml
index 41762ff4f..164d3d575 100644
--- a/Subsurface/Content/Characters/Fractalguardian/fractalguardian.xml
+++ b/Subsurface/Content/Characters/Fractalguardian/fractalguardian.xml
@@ -4,16 +4,17 @@
   <sound file="Content/Characters/Fractalguardian/guardian1.ogg" state="Attack" range="3000" />
   <sound file="Content/Characters/Fractalguardian/guardian2.ogg" state="Attack" range="3000" />
   
-  <ragdoll waveamplitude="100.0" wavelength="1000" speed="2.5" flip="false" canentersubmarine="false">
+  <ragdoll waveamplitude="50.0" wavelength="500" swimspeed="3.0" walkspeed="0.3" flip="false" canentersubmarine="false">
 
     <!-- head -->
     <limb id = "0" radius="65" type="Head" steerforce="3.0">
-      <sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="0,0,129,128" depth="0.05"/>
+      <sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="0,0,129,128" depth="0.04"/>
+      <attack type="Hit" range="120" duration="0.2" damage="50" stun="2" force="20" damagetype="blunt"/>
     </limb>
 
     <!-- body -->
     <limb id = "1" radius="50" type="Torso">
-      <sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="0,125,108,105" depth="0.01" origin="0.5,0.5"/>
+      <sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="0,125,108,105" depth="0.03" origin="0.5,0.5"/>
     </limb>
 
     <!-- body -->
@@ -22,17 +23,17 @@
     </limb>
 
     <limb id = "3" width="30" height="175" type="Tail">
-      <sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="131,0,36,175" depth="0.04" origin="0.5,0.5"/>
+      <sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="131,0,36,175" depth="0.01" origin="0.5,0.5"/>
     </limb>
 
     <limb id = "4" width="30" height="239" impacttolerance="100.0">
-      <sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="183,0,53,238" depth="0.08" origin="0.5,0.5"/>
-      <attack type="PinchCCW" range="150" duration="0.5" damage="30" stun="5.0" damagetype="slash"/>
+      <sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="183,0,53,238" depth="0.05" origin="0.5,0.5"/>
+      <attack type="PinchCCW" range="150" duration="0.5" damage="30" stun="1.0" damagetype="slash"/>
     </limb>
 
     <limb id = "5" width="30" height="239" impacttolerance="100.0">
-      <sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="236,0,53,238" size="-1,1" depth="0.08" origin="0.5,0.5"/>
-      <attack type="PinchCW" range="150" duration="0.5" damage="30" stun="5.0" damagetype="slash"/>
+      <sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="236,0,53,238" size="-1,1" depth="0.05" origin="0.5,0.5"/>
+      <attack type="PinchCW" range="150" duration="0.5" damage="30" stun="1.0" damagetype="slash"/>
     </limb>
         
 
@@ -47,6 +48,6 @@
     <joint limb1="0" limb1anchor="-30,10" limb2="5" limb2anchor="0,-110" lowerlimit="90" upperlimit="180"/>
   </ragdoll>
 
-  <ai attackrooms="0.0" attackhumans="100" sight="1.0" hearing="2.0"/>
+  <ai attackrooms="0.0" attackhumans="100" sight="1.0" hearing="2.0" attackcooldown="1"/>
 </Character>
 
diff --git a/Subsurface/Content/Characters/Fractalguardian2/fractalguardian2.xml b/Subsurface/Content/Characters/Fractalguardian2/fractalguardian2.xml
new file mode 100644
index 000000000..b1901152c
--- /dev/null
+++ b/Subsurface/Content/Characters/Fractalguardian2/fractalguardian2.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Character name="fractalguardian" humanoid="false" health="800.0" doesbleed="false">
+
+  <sound file="Content/Characters/Fractalguardian/guardian1.ogg" state="Attack" range="3000" />
+  <sound file="Content/Characters/Fractalguardian/guardian2.ogg" state="Attack" range="3000" />
+  
+  <ragdoll waveamplitude="0.0" swimspeed="1.0" walkspeed="0.3" flip="false" canentersubmarine="false" rotatetowardsmovement="false">
+
+    <!-- head -->
+    <limb id = "0" radius="80" height="30" type="Head" steerforce="3.0">
+      <sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="299,0,171,208" depth="0.05"/>
+      <attack type="Hit" range="120" duration="0.2" damage="50" stun="2" force="20" damagetype="blunt"/>
+    </limb>
+
+
+    <limb id = "1" width="30" height="178" impacttolerance="100.0">
+      <sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="183,60,53,178" depth="0.08" origin="0.5,0.5"/>
+    </limb>
+    <limb id = "2" width="30" height="175">
+      <sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="131,0,36,175" depth="0.1" origin="0.5,0.5"/>
+      <attack type="PinchCCW" range="150" duration="0.5" damage="30" stun="1.0" damagetype="slash"/>      
+    </limb>
+    
+    <limb id = "3" width="30" height="178" impacttolerance="100.0">
+      <sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="236,60,53,178" size="-1,1" depth="0.08" origin="0.5,0.5"/>
+    </limb>
+
+    <limb id = "4" width="30" height="175">
+      <sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="131,0,36,175" depth="0.1" origin="0.5,0.5"/>
+      <attack type="PinchCW" range="150" duration="0.5" damage="30" stun="1.0" damagetype="slash"/>            
+    </limb>
+        
+
+    <!-- head to body -->
+    <joint limb1="0" limb1anchor="-37,-40" limb2="1" limb2anchor="0,80" lowerlimit="-60" upperlimit="0"/>
+    <joint limb1="1" limb1anchor="0,-80" limb2="2" limb2anchor="0,80" lowerlimit="0" upperlimit="120"/>
+    
+    <joint limb1="0" limb1anchor="37,-40" limb2="3" limb2anchor="0,80" lowerlimit="0" upperlimit="60"/>
+    <joint limb1="3" limb1anchor="0,-80" limb2="4" limb2anchor="0,80" lowerlimit="-120" upperlimit="0"/>
+    
+    
+  </ragdoll>
+
+  <ai attackrooms="0.0" attackhumans="100" sight="1.0" hearing="2.0" attackcooldown="1"/>
+</Character>
+
diff --git a/Subsurface/Content/Items/Artifacts/alienweapon.ogg b/Subsurface/Content/Items/Artifacts/alienweapon.ogg
new file mode 100644
index 000000000..65544a850
Binary files /dev/null and b/Subsurface/Content/Items/Artifacts/alienweapon.ogg differ
diff --git a/Subsurface/Content/Items/Artifacts/artifacts.xml b/Subsurface/Content/Items/Artifacts/artifacts.xml
index 07df4083e..4d733d6e2 100644
--- a/Subsurface/Content/Items/Artifacts/artifacts.xml
+++ b/Subsurface/Content/Items/Artifacts/artifacts.xml
@@ -2,6 +2,7 @@
 <Items>
   <Item
     name="Skyholder Artifact"
+    category="Alien"
     pickdistance="150">
 
     <Sprite texture="artifact.png" depth="0.7" sourcerect="59,0,60,61"/>
@@ -21,8 +22,9 @@
   </Item>
 
   <Item
-     name="Thermal Artifact"
-     pickdistance="150">
+    name="Thermal Artifact"
+    category="Alien"
+    pickdistance="150">
 
     <Sprite texture="artifact.png" depth="0.7" sourcerect="0,0,58,56"/>
 
@@ -61,10 +63,11 @@
   </Item>
 
   <Item
-   name="Oxygenite Shard"
-   pickdistance="150"
-   tags="smallitem"
-   impacttolerance="8">
+    name="Oxygenite Shard"
+    category="Alien"
+    pickdistance="150"
+    tags="smallitem"
+    impacttolerance="8">
 
     <Sprite texture="artifact.png" depth="0.7" sourcerect="119,96,9,32"/>
 
@@ -81,6 +84,7 @@
 
   <Item
    name="Sulphurite Shard"
+   category="Alien"
    pickdistance="150"
    tags="smallitem"
    impacttolerance="8"
@@ -104,7 +108,7 @@
 
   <Item
    name="Ancient Weapon"
-   category="Equipment"
+   category="Alien"
    Tags="smallitem"
    pickdistance="200">
 
@@ -118,12 +122,14 @@
 
     <Body width="85" height="40" density="15"/>
 
-    <Holdable slots="Any,RightHand+LeftHand" aimpos="100,50" handle1="0,11" handle2="2,11"/>
+    <Holdable slots="Any,RightHand+LeftHand" aimpos="100,0" handle1="0,11" handle2="2,11"/>
 
-    <RepairTool structurefixamount="-5.0" limbfixamount="-3.0" range="600" barrelpos="30,15" particles="largeplasma">
+    <RepairTool structurefixamount="-5.0" limbfixamount="-2.0" range="600" barrelpos="30,15" particles="largeplasma">
       <Fixable name="structure"/>
 
-      <StatusEffect type="OnUse" target="This" Condition="-0.5"/>
+      <StatusEffect type="OnUse" target="This" Condition="-1.0"/>
+
+      <sound file="alienweapon.ogg" type="OnUse" range="800.0" loop="true"/>
       
       <LightComponent LightColor="0.8,0.7,1.0,1.0" Flicker="0.5" range="500">
         <sprite texture="Content/Items/Electricity/lightsprite.png" origin="0.5,0.5"/>
diff --git a/Subsurface/Content/Map/StructurePrefabs.xml b/Subsurface/Content/Map/StructurePrefabs.xml
index 31af55b35..1c3b75238 100644
--- a/Subsurface/Content/Map/StructurePrefabs.xml
+++ b/Subsurface/Content/Map/StructurePrefabs.xml
@@ -109,32 +109,32 @@
   <bunk sprite="Content/Map/testroom.png" fliphorizontal="true" sourcerect="0,546,173,129"
     width="173" height="129" depth = "0.9"/>
 
-  <RuinWallHorizontal sprite="Content/Map/ruins.png" sourcerect="0,896,832,128" depth ="0.95" castshadow="true"
+  <RuinWallHorizontal category="Alien"  sprite="Content/Map/ruins.png" sourcerect="0,896,832,128" depth ="0.95" castshadow="true"
     width = "128" height ="128" resizehorizontal="true" body="true" health="500"/>
 
-  <RuinWallVertical sprite="Content/Map/ruins.png" sourcerect="896,0,128,832" depth ="0.94" castshadow="true"
+  <RuinWallVertical category="Alien"  sprite="Content/Map/ruins.png" sourcerect="896,0,128,832" depth ="0.94" castshadow="true"
     width = "128" height ="128" resizevertical="true" body="true" health="500"/>
 
-  <RuinWallHorizontalSmall sprite="Content/Map/ruins.png" sourcerect="0,842,832,54" depth ="0.95" castshadow="true"
+  <RuinWallHorizontalSmall category="Alien"  sprite="Content/Map/ruins.png" sourcerect="0,842,832,54" depth ="0.95" castshadow="true"
     width = "128" height ="54" resizehorizontal="true" body="true" health="500"/>
 
-  <RuinWallVerticalSmall sprite="Content/Map/ruins.png" sourcerect="842,0,54,832" depth ="0.96" castshadow="true"
+  <RuinWallVerticalSmall category="Alien"  sprite="Content/Map/ruins.png" sourcerect="842,0,54,832" depth ="0.96" castshadow="true"
     width = "54" height ="128" resizevertical="true" body="true" health="500"/>
   
 
-  <RuinBack sprite="Content/Map/ruins.png" sourcerect="0,0,512,512" depth ="0.98"
+  <RuinBack category="Alien" sprite="Content/Map/ruins.png" sourcerect="0,0,512,512" depth ="0.98"
     width="64" height="64" resizehorizontal="true" resizevertical="true"/>
 
-  <RuinBackCarvings sprite="Content/Map/ruins.png" sourcerect="512,0,233,512" depth ="0.98"
+  <RuinBackCarvings category="Alien"  sprite="Content/Map/ruins.png" sourcerect="512,0,233,512" depth ="0.98"
     width="64" height="64" resizehorizontal="true" resizevertical="true"/>
 
-  <RuinBlock sprite="Content/Map/ruins.png" sourcerect="0,513,514,296" depth ="0.99"
+  <RuinBlock category="Alien"  sprite="Content/Map/ruins.png" sourcerect="0,513,514,296" depth ="0.99"
     width="514" height="296"/>
 
-  <RuinFractalBall sprite="Content/Map/ruins2.png" sourcerect="0,0,512,512" depth ="0.97"
+  <RuinFractalBall category="Alien"  sprite="Content/Map/ruins2.png" sourcerect="0,0,512,512" depth ="0.97"
     width="512" height="512"/>
 
-  <RuinClaw sprite="Content/Map/ruins2.png" sourcerect="512,517,126,270" depth ="0.97"
+  <RuinClaw category="Alien"  sprite="Content/Map/ruins2.png" sourcerect="512,517,126,270" depth ="0.97"
     width="126" height="270"/>
 
 </prefabs>
\ No newline at end of file
diff --git a/Subsurface/Content/Sounds/Music/Controlled Chaos 2.ogg b/Subsurface/Content/Sounds/Music/Controlled Chaos 2.ogg
new file mode 100644
index 000000000..bd5ab5802
Binary files /dev/null and b/Subsurface/Content/Sounds/Music/Controlled Chaos 2.ogg differ
diff --git a/Subsurface/Content/Sounds/sounds.xml b/Subsurface/Content/Sounds/sounds.xml
index 25a3b1433..43114cba9 100644
--- a/Subsurface/Content/Sounds/sounds.xml
+++ b/Subsurface/Content/Sounds/sounds.xml
@@ -47,4 +47,5 @@
   
   <music file="Content/Sounds/Music/amb_JD_drone_clattering_machine.ogg" type="deep"/>
   <music file="Content/Sounds/Music/Controlled Chaos.ogg" type="ruins"/>
+  <music file="Content/Sounds/Music/Controlled Chaos 2.ogg" type="ruins"/>
 </sounds>
\ No newline at end of file
diff --git a/Subsurface/Content/randomevents.xml b/Subsurface/Content/randomevents.xml
index 13a9857e5..083f4dc49 100644
--- a/Subsurface/Content/randomevents.xml
+++ b/Subsurface/Content/randomevents.xml
@@ -67,8 +67,16 @@
 
   <MonsterEvent name="Under attack" description=""
     characterfile="Content/Characters/Fractalguardian/fractalguardian.xml"
-    commonness="5"
-    difficulty="10"
+    commonness="3"
+    difficulty="1"
+    minamount="1" maxamount="1"
+    spawntype="ruin"
+    musictype="monster"/>
+
+  <MonsterEvent name="Under attack" description=""
+    characterfile="Content/Characters/Fractalguardian2/fractalguardian2.xml"
+    commonness="3"
+    difficulty="1"
     minamount="1" maxamount="1"
     spawntype="ruin"
     musictype="monster"/>
diff --git a/Subsurface/Source/Map/MapEntityPrefab.cs b/Subsurface/Source/Map/MapEntityPrefab.cs
index 384cc5a11..f4056f461 100644
--- a/Subsurface/Source/Map/MapEntityPrefab.cs
+++ b/Subsurface/Source/Map/MapEntityPrefab.cs
@@ -10,7 +10,7 @@ namespace Barotrauma
     [Flags]
     enum MapEntityCategory
     {
-        Structure = 1, Machine = 2, Equipment = 4, Electrical = 8, Material = 16, Misc = 32
+        Structure = 1, Machine = 2, Equipment = 4, Electrical = 8, Material = 16, Misc = 32, Alien = 64
     }
 
     class MapEntityPrefab
diff --git a/Subsurface/Source/Map/StructurePrefab.cs b/Subsurface/Source/Map/StructurePrefab.cs
index e421982ac..03f683c42 100644
--- a/Subsurface/Source/Map/StructurePrefab.cs
+++ b/Subsurface/Source/Map/StructurePrefab.cs
@@ -92,6 +92,15 @@ namespace Barotrauma
                 if (ToolBox.GetAttributeBool(element, "flipvertical", false)) sp.sprite.effects = SpriteEffects.FlipVertically;
             }
 
+            MapEntityCategory category;
+
+            if (!Enum.TryParse(ToolBox.GetAttributeString(element, "category", "Misc"), true, out category))
+            {
+                category = MapEntityCategory.Structure;
+            }
+
+            sp.Category = category;
+
             sp.Description = ToolBox.GetAttributeString(element, "description", "");
 
             sp.size = Vector2.Zero;