Merge branch 'master' into development

code/modules/mob/living/carbon/human/human_attackhand.dm

@@ -402,6 +402,7 @@
 		admin_attack_log(user, src, "dislocated [organ.joint].", "had his [organ.joint] dislocated.", "dislocated [organ.joint] of")
 		src.visible_message("<span class='danger'>[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!</span>")
 		return 1
+	user.visible_message("<span class='warning'>[user] fails to dislocate [src]'s [organ.joint]!</span>")
 	return 0
 
 //Breaks all grips and pulls that the mob currently has.

code/modules/mob/living/simple_animal/hostile/bear.dm

@@ -19,7 +19,7 @@
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/bearmeat
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
-	response_harm   = "pokes"
+	response_harm   = "hits"
 	stop_automated_movement_when_pulled = 0
 	maxHealth = 80
 	melee_damage_lower = 16

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -33,8 +33,8 @@
 	//Interaction
 	var/response_help   = "tries to help"
 	var/response_disarm = "tries to disarm"
-	var/response_harm   = "tries to hurt"
-	var/harm_intent_damage = 3
+	var/response_harm   = "hurts"
+	var/harm_intent_damage = 5
 
 	//Temperature effect
 	var/minbodytemp = 250