From ae4e4d8f34bafeffec7234d6565355e8c1deb6be Mon Sep 17 00:00:00 2001
From: Regalis <regalis@undertowgames.com>
Date: Fri, 11 Mar 2016 19:12:07 +0200
Subject: [PATCH] - wiring tool bugfixes - new oxygen and welding fuel tank
 sprites - more reliable method of checking that the sub can pass through the
 level - moved the name of the highlighted item to the bottom of the screen

---
 Subsurface/Barotrauma.csproj                  |  19 +---------
 .../Content/Items/Diving/divinggear.xml       |   6 ++--
 .../Content/Items/Diving/oxygentank.png       | Bin 464 -> 0 bytes
 Subsurface/Content/Items/Tools/fueltank.png   | Bin 474 -> 0 bytes
 .../Content/Items/Tools/plasmacutter.png      | Bin 1067 -> 0 bytes
 .../Content/Items/Tools/screwdriver.png       | Bin 331 -> 0 bytes
 Subsurface/Content/Items/Tools/tools.png      | Bin 5189 -> 7762 bytes
 Subsurface/Content/Items/Tools/tools.xml      |   4 +--
 .../Content/Items/Tools/weldingtool.png       | Bin 307 -> 0 bytes
 Subsurface/Content/Items/Tools/wrench.png     | Bin 255 -> 0 bytes
 Subsurface/Source/Characters/Character.cs     |   2 ++
 Subsurface/Source/Characters/CharacterHUD.cs  |  33 +++++++++---------
 Subsurface/Source/DebugConsole.cs             |   4 ---
 .../Items/Components/Signal/LightComponent.cs |   3 ++
 Subsurface/Source/Map/Levels/Level.cs         |   9 +++--
 Subsurface/Source/Screens/EditMapScreen.cs    |  15 ++++----
 16 files changed, 40 insertions(+), 55 deletions(-)
 delete mode 100644 Subsurface/Content/Items/Diving/oxygentank.png
 delete mode 100644 Subsurface/Content/Items/Tools/fueltank.png
 delete mode 100644 Subsurface/Content/Items/Tools/plasmacutter.png
 delete mode 100644 Subsurface/Content/Items/Tools/screwdriver.png
 delete mode 100644 Subsurface/Content/Items/Tools/weldingtool.png
 delete mode 100644 Subsurface/Content/Items/Tools/wrench.png

diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj
index 8c149b2ae..7fde66839 100644
--- a/Subsurface/Barotrauma.csproj
+++ b/Subsurface/Barotrauma.csproj
@@ -734,12 +734,7 @@
     </Content>
     <Content Include="Content\Items\idcard.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Items\Tools\fueltank.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Items\Tools\plasmacutter.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
     </Content>
     <Content Include="Content\Items\Weapons\weapons.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -771,9 +766,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Content\Items\Diving\oxygentank.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Items\Electricity\poweritems.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <SubType>Designer</SubType>
@@ -803,12 +795,6 @@
     <Content Include="Content\Items\Weapons\rope.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Items\Tools\screwdriver.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Items\Tools\wrench.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Items\OxygenGenerator\vent.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -816,9 +802,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Content\Items\Tools\weldingtool.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Items\Weapons\stungrenade.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/Subsurface/Content/Items/Diving/divinggear.xml b/Subsurface/Content/Items/Diving/divinggear.xml
index 2b6146371..04bf10b3d 100644
--- a/Subsurface/Content/Items/Diving/divinggear.xml
+++ b/Subsurface/Content/Items/Diving/divinggear.xml
@@ -10,10 +10,10 @@
     <Deconstruct time="10">
       <Item name="Steel Bar"/>
     </Deconstruct>
-    
-    <Sprite texture ="oxygentank.png" depth="0.5"/>
 
-    <Body radius="6" height="22" density="5"/>
+    <Sprite texture ="Content/Items/Tools/tools.png" sourcerect="39,31,12,33" depth="0.5"/>
+
+    <Body width="12" height="33" density="5"/>
 
     <Pickable holdpos="30,-15" handle1="0,1" slots="RightHand,LeftHand,Any">
       <StatusEffect type="OnFire" target="This" Condition="-100.0" sound="Content/Items/Reactor/explosion.ogg" disabledeltatime="true">
diff --git a/Subsurface/Content/Items/Diving/oxygentank.png b/Subsurface/Content/Items/Diving/oxygentank.png
deleted file mode 100644
index 04cf31e5824f5a6b09c3fb1d8147c3759c507600..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq000aC001Hg1^@s6YtuNP00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ-R!KxbRCwByR7+07Fc5vuibMs;0xFi=fDLEh3VaU2t_Vdr1ZQB81N2U)rKL?#
zSUnafmF=<9){Df6J@aPXn;A+%yhsWFBr!g7IC0TO7(B<zM=IjOx~_xorfJd$Iqxw_
zF<ic#KVw>6<MR9p7iSfAzgw(+R#<kQ_+BqSQj+LM>gMDA9|gbwBku_S)Au`&RKya&
z11tpw@_h0b13=M5M(&J3>{sT@h1WG|?itAVQzAgmfF_91q~A7Ads3MUNqAX5dbLEN
z?jBIFLdg;nP0;r}x?P8Dx5aAng$0+Xq;oaRG_4xbSsty5DhLTRhK_Kf!O&v6;6LMb
zWbig2*}{<7yJL!4)E>q8xtfVX+a(TTNd(2JbU#?Z5<2AgKa4;#=1diY!YQj<C|njo
zGSRtQj-dm^2pYy=h9vGG3P~iXwrxjP5@xS6NaD%E_-_CQIF4)?^je7k0000<MNUMn
GLSTZuGPu3~

diff --git a/Subsurface/Content/Items/Tools/fueltank.png b/Subsurface/Content/Items/Tools/fueltank.png
deleted file mode 100644
index f26b70ebe31df319982a3b2336629306648538a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 474
zcmV<00VV#4P)<h;3K|Lk000e1NJLTq000aC001Hg1^@s6YtuNP00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ-U`a$lRCwByR69<?Kop!=Stvwy73D4zh?+}q3c654X*dKO9a65r4G<Cy2LSRZ
zY=wxzLqTlsKJPkY8+-SCX7;^#OG&VcqyRt?t<B-YMIWKbY?qIeS>t>@5B7`2B94&C
zZc(zv`R#U$@pOvw$pmLbj-Rr^_jZll#}`(gJCKwlI+A+6X#oM$hyS|!1@LtJmpH5v
zj~C7a$U|`d2&m1GZ&fV7Cao>q9)eW@6O?L$+Z;M20$hy8z@=X=9~v=*j*WzB;Qi_z
zUZ;VVi$@eifjrMK8jY~u?@?71%Cf{}vjx|y7%t<IW~!_M`cqKWW+syU0uM$vz@$4?
zw{yOUJsJ$YeM&aOe;^c4;<3SRQJjBQnOifct4E26HYieYm-H}9O&?O#KZ4MkhDb!v
zIALgh7}HX^4G5&s`ZJEulZM*o5YYte=w^~gQp@EsT_pi`vl%4u<j44T0RD!KgVJ)j
Qh5!Hn07*qoM6N<$f-<_mr2qf`

diff --git a/Subsurface/Content/Items/Tools/plasmacutter.png b/Subsurface/Content/Items/Tools/plasmacutter.png
deleted file mode 100644
index 25fdfaa601b23e5d4c3e94f3bb34c1195a38f2f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1067
zcmV+`1l0S9P)<h;3K|Lk000e1NJLTq001EX000jN1^@s6YC@(d00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ<u}MThRCwB)l}(5oMHq&ks_vQUp4r)*Iqb5FF@!<9=*^3{iAN8D2zrq<B$}Yc
zB>o%}b7=exiAcOiBGG^wNi>MCK?FT|@a{>xW|8d7&dm1AbXRvzSCxk)LpIsOP2OYo
zTlGEPPk$|<DB@naaN&YmTU)!QM=3=R1jKO+Kp2JyA<$Y=tJO%7gdhkgiUMmbQc9$h
zlw}Ek|9=2yPkoHBmU1#d2&h&RosBM`QVd5!W@l&V_j*`sQA)AV-JsQKp>@jU<|dx!
z5yvs-zPpUI7SHoA#vrA{tSY=`^PM50D01y~n=d~35Nj<jE+1rJet}N6L%ZE3djDN=
zogsy!$aAEWRI7@j$nkxjqR1J>F%{p(0Yy;&Ff%iQF@~}%vDSidJ69r#BKPCUMXWJc
zXVIzV`)|G`(<wp<e80jZFPKaw2q_r!2NaWnT392FH_5ULDd#9n$#68L)oN0$DjJOj
zk1Wpf&%f(vtpV_!Gx)y09b#o=#jRewjB}1jQBam8bIm4MsyTG@1OTm8i%PXhXMG(h
z<yJ<wNeF>+Zrd{{C1PoT(P%^zMdH?X+aPYN-ylmf{EEkDJfdE!)8FWE{JjruR!IPy
zKY!lcei6W#GoQQtk3Guo=dSbg;fMI`v%h)f<l|gB`4{`&*@H0#&-3np_HS*&&sQ#y
z=NZO87=*mAe2|5O1(GD0dX|=!ICA8O*lCuMWQ>#&vI5`paiv3N85qZ0W0sBn0O#!8
zApmrmqLd=bGE$wgZ{I!+95^7@rNS`87{j<XMg@vWtA<hv)u__#^$A0TweF5{@@9rt
zS1w|$B}o#bki2^It@{E1Fvd`?*LnWaC+H70dFqY5Xr1xovAt9)K7)9;<2nD<VN$9(
z-3fah-m~lAQ4~2TB}yrN`QuNFF?aO}A$EqS*J=!hLuO`X(5WT}Le{RYar*RWm!>HI
z^Yim`yIlZ+ARx;!gb?_?&zpx{Cd)ILb8~b$9g3pBImeaNU$+hP-Q)u_TP+%m264Q}
zq?k-Uud}B<qTlOpIh~_cuhH#v@T8<tRrGorXsxl%GTUg7rYTvL^TV~>1)o+2a939@
zG8puyJO8CuUgO)Zz9dN!#-kBZNQ^P0>6oIJY-MUKDhSY7#&9^~(od_?HtaU|v=Z%h
zd%DZD)+iM)*KBg|_2W}hy<Q_pw%X!(9-b#DiplinmFM|=2i^v;yu2(9AA8#gA&BFc
l#l=P5I&tEGFMJUFHvp(N)D4!-P{{xQ002ovPDHLkV1m<w@#X*k

diff --git a/Subsurface/Content/Items/Tools/screwdriver.png b/Subsurface/Content/Items/Tools/screwdriver.png
deleted file mode 100644
index 488e8d131feca5eac77865afe0a357e9aaf20fad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 331
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5q$1fP
z$d`ekN|k}3p_zf<=YJsml7XSrfPvvv0t1893<d`A{7Lag-GFK@db&7<RNPAX^Z&p7
zVFxC)Hb%C^d=jMxRxrEC8oX*?EN9?0I^H|IJ>l$@*Pq4RQnnh{9px){{Pbsjbm-Xy
z>(?Fp@b$L2h^u(sy_5&_|7JYA-uAVid+iOyC`n1l|3EN*q7wU#kDvaS>u4ld+_`qD
zU`7MmjH4$G+`1){f8yguZle#MKN=bs8X9icw8<zVGt+R&^y$V)E{ukX4!H+7vL_sH
zVw8U{$FB3?jq~;ziWh%;Q)X5TJkW7RNvgx;gvBitX}D7Z*?G1wGcYq;N%Q9xO_;kM
P=s5;YS3j3^P6<r_6Ow=D

diff --git a/Subsurface/Content/Items/Tools/tools.png b/Subsurface/Content/Items/Tools/tools.png
index 423e4025b25d1755f1609cfbea28acc9f0b5bd0a..a1b58f6490969802a30ce50c3a7a0cdbe87387ab 100644
GIT binary patch
literal 7762
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

delta 5159
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
VJSlz}r$hh%002ovPDHLkV1my<0TciL

diff --git a/Subsurface/Content/Items/Tools/tools.xml b/Subsurface/Content/Items/Tools/tools.xml
index 48a75f29f..560e8c436 100644
--- a/Subsurface/Content/Items/Tools/tools.xml
+++ b/Subsurface/Content/Items/Tools/tools.xml
@@ -110,9 +110,9 @@
       <Item name="Steel Bar"/>
     </Deconstruct>
 
-    <Sprite texture ="fueltank.png" depth="0.5"/>
+    <Sprite texture ="tools.png" sourcerect="52,31,12,33" depth="0.5"/>
 
-    <Body radius="6" height="22" density="5"/>
+    <Body width="12" height="33" density="5"/>
 
     <Holdable slots="RightHand,Any" holdpos="30,-15" handle1="0,5" handle2="0,-5">
       <StatusEffect type="OnFire" target="This" Condition="-100.0" sound="Content/Items/Reactor/explosion.ogg" disabledeltatime="true">
diff --git a/Subsurface/Content/Items/Tools/weldingtool.png b/Subsurface/Content/Items/Tools/weldingtool.png
deleted file mode 100644
index 02101925a52428f311a2ade8a14bd5e75f396c06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 307
zcmeAS@N?(olHy`uVBq!ia0vp^>Od^Y!3HFc3Vxpqq&N#aB8wRqxP?KOkzv*x380`t
zvPY0F14ET614BbI1H;e%K>8&EL#Y7+!>a@a2CEqi4C48d;*Yuk)$a6kaSW-r^=9fu
zzQYPUF14b<{|wL9Xc*hGt+o!_+OdRXB8zK9lEa6ReVZ4qGRfYX@o1LRxj(xZ5+d%0
zin_l`K3~jm#nPPROtrn+&NX3d+Vbxhw_U3{r@7Q_$E>KuSA+$*6iv2Y-?DAva$VD_
zZETOEb$$yUP%Jjy+~r{(<GVFTmmzkgb?%fH)=icz+e3B>=d4}-{N1&=Q<Ro(<~R}5
z*Ky*`+!LZ5#$4eNb7t1tbsCyQzT{<K`2U}oVdpV_%fLJTb^<-Y;OXk;vd$@?2>>2x
BZ$|(C

diff --git a/Subsurface/Content/Items/Tools/wrench.png b/Subsurface/Content/Items/Tools/wrench.png
deleted file mode 100644
index 531b41d09ade8ca58c1f0bfe2e143c88b08417c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 255
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNq$1fP
z$d`ekN|k}3p_zf<=YJsml7XSrfPvvv0t1893<d`A{7Lag-GFLaJzX3_DsH{GX3f{2
zAi#1#^6}or#}ShGPAhhtjdHx;)x+3*vn%g@ozS$jwwW6fiZ~P+7??N=L>w-8#M#X+
zO(}XFQ#)I7H$!=4{*)(*EG6X&I`)2FFKFq?;IQ(Kx%Y|X>?gyOPiQ9H?!U#^x2xk8
s(=EdQ^_f5;faYvwR0q1?|9@tNuZl*SyWTha0&*EVUHx3vIVCg!0MJuY;Q#;t

diff --git a/Subsurface/Source/Characters/Character.cs b/Subsurface/Source/Characters/Character.cs
index 4ef576e61..ee77fdbff 100644
--- a/Subsurface/Source/Characters/Character.cs
+++ b/Subsurface/Source/Characters/Character.cs
@@ -377,6 +377,8 @@ namespace Barotrauma
 
         public static Character Create(string file, Vector2 position, CharacterInfo characterInfo = null, bool isNetworkPlayer = false, bool hasAi=true)
         {
+            if (!System.IO.File.Exists(file)) return null;
+
             if (file != humanConfigFile)
             {
                 var enemyCharacter = new AICharacter(file, position, characterInfo, isNetworkPlayer);
diff --git a/Subsurface/Source/Characters/CharacterHUD.cs b/Subsurface/Source/Characters/CharacterHUD.cs
index 3d192d008..72d9fbd10 100644
--- a/Subsurface/Source/Characters/CharacterHUD.cs
+++ b/Subsurface/Source/Characters/CharacterHUD.cs
@@ -9,7 +9,6 @@ namespace Barotrauma
 {
     class CharacterHUD
     {
-
         private static Sprite statusIcons;
 
         private static Sprite noiseOverlay, damageOverlay;
@@ -22,7 +21,7 @@ namespace Barotrauma
         {
             healthBar.Flash();
 
-            damageOverlayTimer = MathHelper.Clamp(amount*0.1f, 0.2f, 5.0f);
+            damageOverlayTimer = MathHelper.Clamp(amount * 0.1f, 0.2f, 5.0f);
         }
 
         public static void Update(float deltaTime, Character character)
@@ -39,17 +38,17 @@ namespace Barotrauma
 
         public static void Draw(SpriteBatch spriteBatch, Character character, Camera cam)
         {
-            if (statusIcons==null)
+            if (statusIcons == null)
             {
                 statusIcons = new Sprite("Content/UI/statusIcons.png", Vector2.Zero);
             }
 
-            if (noiseOverlay==null)
+            if (noiseOverlay == null)
             {
-                noiseOverlay  = new Sprite("Content/UI/noise.png", Vector2.Zero);
+                noiseOverlay = new Sprite("Content/UI/noise.png", Vector2.Zero);
             }
 
-            if (damageOverlay==null)
+            if (damageOverlay == null)
             {
                 damageOverlay = new Sprite("Content/UI/damageOverlay.png", Vector2.Zero);
             }
@@ -71,26 +70,26 @@ namespace Barotrauma
                 Vector2 textPos = startPos;
                 textPos -= new Vector2(GUI.Font.MeasureString(character.ClosestCharacter.Info.Name).X / 2, 20);
 
-                GUI.DrawString(spriteBatch, textPos, character.ClosestCharacter.Info.Name, Color.Orange, Color.Black, 2);
+                GUI.DrawString(spriteBatch, textPos, character.ClosestCharacter.Info.Name, Color.White, Color.Black, 2);
             }
             else if (character.SelectedCharacter == null && character.ClosestItem != null && character.SelectedConstruction == null)
             {
+                var hudTexts = character.ClosestItem.GetHUDTexts(character);
 
-                Vector2 startPos = character.DrawPosition + (character.ClosestItem.DrawPosition - character.DrawPosition) * 0.7f;
-                startPos = cam.WorldToScreen(startPos);
+                Vector2 startPos = new Vector2((int)(GameMain.GraphicsWidth / 2.0f), (int)(GameMain.GraphicsHeight));
+                startPos.Y -= 50 + hudTexts.Count * 25;
 
                 Vector2 textPos = startPos;
-                textPos -= new Vector2(GUI.Font.MeasureString(character.ClosestItem.Name).X / 2, 20);
+                textPos -= new Vector2((int)GUI.Font.MeasureString(character.ClosestItem.Name).X / 2, 20);
 
-                GUI.DrawString(spriteBatch, textPos, character.ClosestItem.Name, Color.Orange, Color.Black * 0.7f, 2);
-
-
-                textPos.Y += 50.0f;
-                foreach (ColoredText coloredText in character.ClosestItem.GetHUDTexts(character))
+                GUI.DrawString(spriteBatch, textPos, character.ClosestItem.Name, Color.White, Color.Black * 0.7f, 2);
+                
+                textPos.Y += 30.0f;
+                foreach (ColoredText coloredText in hudTexts)
                 {
-                    textPos.X = startPos.X - GUI.Font.MeasureString(coloredText.Text).X / 2;
+                    textPos.X = (int)(startPos.X - GUI.SmallFont.MeasureString(coloredText.Text).X / 2);
 
-                    GUI.DrawString(spriteBatch, textPos, coloredText.Text, coloredText.Color, Color.Black*0.7f, 2);
+                    GUI.DrawString(spriteBatch, textPos, coloredText.Text, coloredText.Color, Color.Black*0.7f, 2, GUI.SmallFont);
                     
                     textPos.Y += 25;
                 }
diff --git a/Subsurface/Source/DebugConsole.cs b/Subsurface/Source/DebugConsole.cs
index 82db5a368..97242b3f2 100644
--- a/Subsurface/Source/DebugConsole.cs
+++ b/Subsurface/Source/DebugConsole.cs
@@ -219,10 +219,6 @@ namespace Barotrauma
                     if (spawnedCharacter != null && GameMain.Server != null) GameMain.Server.SendCharacterSpawnMessage(spawnedCharacter);
 
                     break;
-                //case "startserver":
-                //    if (Game1.Server==null)
-                //        Game1.NetworkMember = new GameServer();
-                //    break;
                 case "kick":
                     if (GameMain.Server == null) break;
                     GameMain.Server.KickPlayer(commands[1]);
diff --git a/Subsurface/Source/Items/Components/Signal/LightComponent.cs b/Subsurface/Source/Items/Components/Signal/LightComponent.cs
index da087e47d..30a21a9d8 100644
--- a/Subsurface/Source/Items/Components/Signal/LightComponent.cs
+++ b/Subsurface/Source/Items/Components/Signal/LightComponent.cs
@@ -164,6 +164,9 @@ namespace Barotrauma.Items.Components
                 case "set_state":           
                     IsActive = (signal != "0");                   
                     break;
+                case "set_color":
+                    LightColor = signal;
+                    break;
             }
         }
     }
diff --git a/Subsurface/Source/Map/Levels/Level.cs b/Subsurface/Source/Map/Levels/Level.cs
index a67d2bea2..69a73c480 100644
--- a/Subsurface/Source/Map/Levels/Level.cs
+++ b/Subsurface/Source/Map/Levels/Level.cs
@@ -162,7 +162,7 @@ namespace Barotrauma
             backgroundColor = new Color(backgroundColor, 1.0f);
 
             float minWidth = Submarine.Loaded == null ? 0.0f : Math.Max(Submarine.Borders.Width, Submarine.Borders.Height);
-            minWidth = Math.Max(minWidth, 3500.0f);
+            minWidth = Math.Max(minWidth, 6500.0f);
 
             startPosition = new Vector2((int)minWidth * 2, Rand.Range((int)minWidth * 2, borders.Height - (int)minWidth * 2, false));
             endPosition = new Vector2(borders.Width - (int)minWidth * 2, Rand.Range((int)minWidth * 2, borders.Height - (int)minWidth * 2, false));
@@ -628,12 +628,11 @@ namespace Barotrauma
                     if (tooClose && !tooCloseCells.Contains(cell)) tooCloseCells.Add(cell);
                 }
 
-                for (int x = -1; x <= 1; x++)
+                for (float x = -minDistance; x <= minDistance; x+=siteInterval)
                 {
-                    for (int y = -1; y <= 1; y++)
+                    for (float y = -minDistance; y <= minDistance; y += siteInterval)
                     {
-                        if (x == 0 && y == 0) continue;
-                        Vector2 cornerPos = position + new Vector2(x * minDistance, y * minDistance);
+                        Vector2 cornerPos = position + new Vector2(x,y);
 
                         int cellIndex = FindCellIndex(cornerPos);
                         if (cellIndex == -1) continue;
diff --git a/Subsurface/Source/Screens/EditMapScreen.cs b/Subsurface/Source/Screens/EditMapScreen.cs
index 96ede1c5f..abaff3ec6 100644
--- a/Subsurface/Source/Screens/EditMapScreen.cs
+++ b/Subsurface/Source/Screens/EditMapScreen.cs
@@ -516,8 +516,9 @@ namespace Barotrauma
         {
             if (dummyCharacter == null) return false;
 
+            //if the same type of wire has already been selected, deselect it and return
             Item existingWire = dummyCharacter.SelectedItems.FirstOrDefault(i => i != null && i.Prefab == userData as ItemPrefab);
-            if (existingWire!=null)
+            if (existingWire != null)
             {
                 existingWire.Drop();
                 existingWire.Remove();
@@ -526,12 +527,14 @@ namespace Barotrauma
 
             var wire = new Item(userData as ItemPrefab, Vector2.Zero, null);
 
-
             int slotIndex = dummyCharacter.Inventory.FindLimbSlot(LimbSlot.LeftHand);
-            if (dummyCharacter.Inventory.Items[slotIndex] != null && dummyCharacter.Inventory.Items[slotIndex].Prefab != userData as ItemPrefab)
+
+            //if there's some other type of wire in the inventory, remove it
+            existingWire = dummyCharacter.Inventory.Items[slotIndex];
+            if (existingWire != null && existingWire.Prefab != userData as ItemPrefab)
             {
-                dummyCharacter.Inventory.Items[slotIndex].Drop();
-                dummyCharacter.Inventory.Items[slotIndex].Remove();
+                existingWire.Drop();
+                existingWire.Remove();
             }
 
             dummyCharacter.Inventory.TryPutItem(wire, slotIndex, false, false);
@@ -663,7 +666,7 @@ namespace Barotrauma
 
             if (wiringMode)
             {
-                if (!dummyCharacter.SelectedItems.Any(it => it.HasTag("Wire")))
+                if (!dummyCharacter.SelectedItems.Any(it => it != null && it.HasTag("Wire")))
                 {
                     wiringToolPanel.GetChild<GUIListBox>().Deselect();
                 }