From 97d2a54ee48dee1019f05876eeaf0de410e4c68b Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Mon, 10 Jul 2017 14:08:54 -0300
Subject: [PATCH] Fixes canes (#2996)

Canes and concealed canes have the same size, also fixes and re-adds their old update icon proc. And also, probably fixes beepsky attacking the hos dog.
---
 code/defines/obj/weapon.dm            | 16 +++++++++++++---
 code/modules/mob/living/bot/secbot.dm |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 22a83d947d9..c03e5cd606d 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -81,14 +81,13 @@
 	icon_state = "cane"
 	item_state = "stick"
 	flags = CONDUCT
-	force = 5.0
+	force = 10
 	throwforce = 7.0
-	w_class = 2.0
+	w_class = 4
 	matter = list(DEFAULT_WALL_MATERIAL = 50)
 	attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
 
 /obj/item/weapon/cane/concealed
-	w_class = 4
 	var/concealed_blade
 
 /obj/item/weapon/cane/concealed/New()
@@ -108,6 +107,7 @@
 		user.update_inv_l_hand(0)
 		user.update_inv_r_hand()
 		concealed_blade = null
+		update_icon()
 	else
 		..()
 
@@ -122,6 +122,16 @@
 	else
 		..()
 
+/obj/item/weapon/cane/concealed/update_icon()
+	if(concealed_blade)
+		name = initial(name)
+		icon_state = initial(icon_state)
+		item_state = initial(item_state)
+	else
+		name = "cane shaft"
+		icon_state = "nullrod"
+		item_state = "foldcane"
+
 /obj/item/weapon/disk
 	name = "disk"
 	icon = 'icons/obj/items.dmi'
diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm
index 6500e57964b..97f508526e8 100644
--- a/code/modules/mob/living/bot/secbot.dm
+++ b/code/modules/mob/living/bot/secbot.dm
@@ -300,7 +300,7 @@
 					C.update_inv_handcuffed()
 				if(preparing_arrest_sounds.len)
 					playsound(loc, pick(preparing_arrest_sounds), 50, 0)
-	else if(istype(M, /mob/living/simple_animal))
+	else if(istype(M, /mob/living/simple_animal) && !istype(M, /mob/living/simple_animal/hostile/commanded))
 		var/mob/living/simple_animal/S = M
 		S.AdjustStunned(10)
 		S.adjustBruteLoss(15)