From 6f821874a11d30e6e4e1f7ab59c57f5c7cca7ddc Mon Sep 17 00:00:00 2001
From: juanjp600 <juanjprot@gmail.com>
Date: Tue, 21 Feb 2017 13:58:30 -0300
Subject: [PATCH] Fixed Scorpion + Fixed chat when controlling monsters +
 Shameless plug ;)

---
 Subsurface/Content/Characters/Scorpion/scorpion.xml | 4 +++-
 Subsurface/Source/Networking/NetworkMember.cs       | 1 +
 Subsurface/readme.txt                               | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Subsurface/Content/Characters/Scorpion/scorpion.xml b/Subsurface/Content/Characters/Scorpion/scorpion.xml
index 3629067c0..0d4243c94 100644
--- a/Subsurface/Content/Characters/Scorpion/scorpion.xml
+++ b/Subsurface/Content/Characters/Scorpion/scorpion.xml
@@ -6,7 +6,9 @@
   <sound file="Content/Characters/Scorpion/scorpionidle2.ogg" state="None" />
 
   <ragdoll waveamplitude="50.0" wavelength="2500" speed="1.5">
-
+    
+    <collider width="45" radius="22"/>
+    
     <!-- head -->
     <limb id = "0" radius="37" height="81"  mass="6" type="Head" steerforce="1.0">
       <sprite texture="Content/Characters/Scorpion/scorpion.png" sourcerect="11,12,74,155" depth="0.02"/>
diff --git a/Subsurface/Source/Networking/NetworkMember.cs b/Subsurface/Source/Networking/NetworkMember.cs
index 8ff348815..2dd25e651 100644
--- a/Subsurface/Source/Networking/NetworkMember.cs
+++ b/Subsurface/Source/Networking/NetworkMember.cs
@@ -243,6 +243,7 @@ namespace Barotrauma.Networking
             if (radio == null || !sender.HasEquippedItem(radio)) return false;
                        
             var radioComponent = radio.GetComponent<WifiComponent>();
+            if (radioComponent == null) return false;
             return radioComponent.HasRequiredContainedItems(false);
         }
 
diff --git a/Subsurface/readme.txt b/Subsurface/readme.txt
index 1bc527eb0..dfda77b12 100644
--- a/Subsurface/readme.txt
+++ b/Subsurface/readme.txt
@@ -47,6 +47,7 @@ Credits:
 Programming, graphics, sounds, game design	- Joonas Rikkonen ("Regalis")
 Graphics					- James Bear ("Moonsaber99")
 Programming					- Sebastian Broberg
+Programming					- Juan Pablo Arce ("juanjp600")
 
 ------------------------------------------------------------------------