From d3ef5ecd58290d79e3422913d00c904f6d4f2e59 Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Fri, 7 Oct 2016 11:44:40 -0300
Subject: [PATCH] Fixing bears attacking SSD people (#1038)

Fixes #1037
fixing at last the wrong laser cannon sprite in hand
---
 .../mob/living/simple_animal/hostile/bear.dm  |   5 ++++-
 html/changelogs/alberky-PR-1038.yml           |   6 ++++++
 icons/mob/items/lefthand_guns.dmi             | Bin 36627 -> 36622 bytes
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/alberky-PR-1038.yml

diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index 3092a47a5fa..66a8e473ef3 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -202,6 +202,9 @@
 				continue
 			else
 
+				if(!L.client)
+					continue
+					
 				if(L.stat == CONSCIOUS)
 					if (dist < nearest_dist)
 						nearest_target = L
@@ -562,4 +565,4 @@
 
 
 #undef BEARMODE_INDOORS
-#undef BEARMODE_SPACE
\ No newline at end of file
+#undef BEARMODE_SPACE
diff --git a/html/changelogs/alberky-PR-1038.yml b/html/changelogs/alberky-PR-1038.yml
new file mode 100644
index 00000000000..3da991262eb
--- /dev/null
+++ b/html/changelogs/alberky-PR-1038.yml
@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - tweak: "Space bears should not attack ssd players anymore."
diff --git a/icons/mob/items/lefthand_guns.dmi b/icons/mob/items/lefthand_guns.dmi
index 1942fc57a092b051b2ee3d86e745c937c51a54a7..03ba3f85b1a795f764c291076d5b00ac04160f17 100644
GIT binary patch
delta 653
zcmV;80&@M6o&t`Z0+1wsWqMRtbVOxyV{&P5bZKvH004NLmDkOV8Zit9@H6ui(eAZW
zz<%|@rD9d>VfP(O#tac58O08iK79`(6r^_L{~nQkSlEu^aPNM;{(AdxoA<Zw#6?0*
zZtWhwFS^+|^tyLz_ps__dk({1rw^i}?AGqCr=mkm^QXIR)`ud0ZtWhs*{;x$#jV})
zU-<~j2UxCPxrF5cmV6xbVrnn@tV2yEL|u=<F^J|kmk>F5E}%ErS)ZQlB5h-3rNMNC
zdxXiQgfuXccA+u!U+|vBNCMQSu$FAMhkeWm2)B#5&?Ru}F?y_O!rz7L6De9#;Zu$$
zC}|M-)xt(p!Y(p@$iM;n^TSiwhGd5=*&o<0qKx6dx-a>R3{8!~_Bf0+3a{+ja;#Ap
z7_YHL;TJI8asdW3RjPid$&NNTAm0fB2~QBnc!EgElQbD8F2m&zVzfgx3*_D~kblEK
z4H`!3&@@Ozku%UNTnka?EHn()LKHg_O`9}6`<R9MBe1@I;&UE3VRDL^G9DMRW8!)w
z4IY<srF5`w{*pzu`3%Fk<QVL&hYTmUxdZqFqjN%ESKFOk@_{slWV?`jNL)y>oy#_o
zD3G&~aIp`(l5hbAR7to1v#BIpfU#5(F33bG)ZsnT=^`nNfIa3Qn(8nBZvmf^XNr7t
zT9=>nFemeW)w1elJx98@wR`yXpYH;FxKf}MR|<6FN|A<KtvyXxJ9zrv0WR2vk*(4+
zvR0Z#_Da*xVrd+;;F@h1uL!zmo5m{wuiD13Yu-~z`AZi088;lr@kRsnyU{>zZuF<2
n@7?Ri#%<o;y1!k5E4anF%qjo?AOJ~3K~#90?A?2_qyle@!YM*Z

delta 653
zcmV;80&@M1o&uAe0+1wsYI;;ybVOxyV{&P5bZKvH004NLmDkN~+b|3V@N@hWLVI0?
ze6`ypm!ZYbL;DVl%s4_6$q=bz+0*Y}1PZVf{O=gx7aAl*Q+{+mUVpxQxR>|0?#x9(
zPHyWqUl-l%5_&zjty{0U*@44w(CLRLDZ8zE=&9&X)BNe7oAsf8h}*hNH`^CFvAC^U
z{w+7KT*Gn&%Oxxqu;kOIS5tdAWF2ZUA?kV*jzKiXxrE5ca{;}{F8cIj7ikwOD-EVA
z+#^h`C8U9ov<r=){}1nJj3hvP3Tw%Bd)UXEfN=Ym3ta=p9;2tKCj3>%K9Qm|6+Y*9
zhLQ%MUoC7zCF~=AgA5$7-`_ozT}XD=lKqkGBFY$!tcQ{>$k5a%Y>&fOqwvapTaGmf
z1LHN;DEtkKw_Jb$O_i!2YO<qE4#;<cK*AFQGM*rk@+3{hiOX<3h8XRT%>ubM4CLQ1
zP=kh%Iy4PZQRECX3)eyvItvZMwGhS5MAIgX&pu}1{sgRlulSrtPMDmcri{nM?3lQo
zNQ1}aTqzyxH-E_@yL^G+TyhNd)<cF9+}r`Yg3%?Rx2xUWF8M$jL$X~+J|r%r+0JDb
zNfgLgNx0YtUP-tB1F9rkfZ0?MF2GnS2^VA{73%PT>3o$GM!=qO5KVO$fV+Ut$umX1
zJFUx4dYF@cd23m9vz{Ye-PWzY{NuksA8r(A#f<{pxKX4bH)~H5)()P&JHQ3oFtSye
zM%GHx$X;n0S}cvD7F@Fp;}t;{ZPR!~;8okWX_rg;13r>)@sv`A9)HJy-0n0`w>u5=
n<W7GY`q909yttS5x9$%~7bmwdN2T5X03ZNKL_t)ungVo;o3c2(