Merge branch 'feature' of github.com:CIB/Baystation12 into feature

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

@@ -211,7 +211,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 					continue
 				for(var/datum/wound/W in temp.wounds) if(W.bleeding())
 					blood_max += W.damage / 4
-				if(temp.status & ORGAN_DESTROYED && !(temp.status & ORGAN_GAUZED))
+				if(temp.status & ORGAN_DESTROYED && !(temp.status & ORGAN_GAUZED) && !temp.amputated)
 					blood_max += 20 //Yer missing a fucking limb.
 			drip(blood_max)
 

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

@@ -13,10 +13,9 @@
 	response_help = "pets the"
 	response_disarm = "gently pushes aside the"
 	response_harm = "hits the"
-	speed = -1
+	speed = 4
 	maxHealth = 25
 	health = 25
-	destroy_surroundings = 0
 
 	harm_intent_damage = 8
 	melee_damage_lower = 15
@@ -35,6 +34,8 @@
 	max_n2 = 0
 	minbodytemp = 0
 
+	break_stuff_probability = 2
+
 	faction = "carp"
 
 /mob/living/simple_animal/hostile/carp/Process_Spacemove(var/check_drift = 0)

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

@@ -13,3 +13,4 @@
 	attacktext = "chomps"
 	attack_sound = 'sound/weapons/bite.ogg'
 	faction = "creature"
+	speed = 4

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

@@ -28,6 +28,7 @@
 	min_n2 = 0
 	max_n2 = 0
 	minbodytemp = 0
+	speed = 4
 
 	faction = "faithless"
 

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

@@ -33,7 +33,7 @@
 	var/busy = 0
 	pass_flags = PASSTABLE
 	move_to_delay = 6
-	destroy_surroundings = 0
+	speed = 3
 
 //nursemaids - these create webs and eggs
 /mob/living/simple_animal/hostile/giant_spider/nurse

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

@@ -26,6 +26,7 @@
 	min_n2 = 0
 	max_n2 = 0
 	minbodytemp = 0
+	speed = 4
 
 /mob/living/simple_animal/hostile/hivebot/range
 	name = "Hivebot"

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

@@ -10,6 +10,7 @@
 	var/casingtype
 	var/move_to_delay = 2 //delay for the automated movement.
 	var/list/friends = list()
+	var/break_stuff_probability = 10
 	stop_automated_movement_when_pulled = 0
 	var/destroy_surroundings = 1
 
@@ -173,7 +174,8 @@
 	return
 
 /mob/living/simple_animal/hostile/proc/DestroySurroundings()
-	for(var/dir in cardinal) // North, South, East, West
-		var/obj/structure/obstacle = locate(/obj/structure, get_step(src, dir))
-		if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille))
-			obstacle.attack_animal(src)
+	if(prob(break_stuff_probability))
+		for(var/dir in cardinal) // North, South, East, West
+			var/obj/structure/obstacle = locate(/obj/structure, get_step(src, dir))
+			if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille))
+				obstacle.attack_animal(src)

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

@@ -13,7 +13,7 @@
 	response_help = "touches the"
 	response_disarm = "pushes the"
 	response_harm = "hits the"
-	speed = -1
+	speed = 4
 	maxHealth = 250
 	health = 250
 

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

@@ -9,7 +9,7 @@
 	response_help = "pushes the"
 	response_disarm = "shoves"
 	response_harm = "hits the"
-	speed = -1
+	speed = 4
 	stop_automated_movement_when_pulled = 0
 	maxHealth = 100
 	health = 100

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

@@ -10,7 +10,7 @@
 	response_help = "pokes the"
 	response_disarm = "shoves the"
 	response_harm = "hits the"
-	speed = -1
+	speed = 4
 	stop_automated_movement_when_pulled = 0
 	maxHealth = 100
 	health = 100

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

@@ -10,7 +10,7 @@
 	response_help = "pokes the"
 	response_disarm = "shoves the"
 	response_harm = "hits the"
-	speed = -1
+	speed = 4
 	stop_automated_movement_when_pulled = 0
 	maxHealth = 100
 	health = 100

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

@@ -444,7 +444,7 @@
 /mob/living/simple_animal/proc/SA_attackable(target_mob)
 	if (isliving(target_mob))
 		var/mob/living/L = target_mob
-		if(!L.stat)
+		if(!L.stat || L.health <= 0)
 			return (0)
 	if (istype(target_mob,/obj/mecha))
 		var/obj/mecha/M = target_mob