Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature

Conflicts:
	baystation12.dme
	code/modules/mob/living/simple_animal/hostile/giant_spider.dm

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

@@ -24,6 +24,7 @@
 	min_oxy = 16 //Require atleast 16kPA oxygen
 	minbodytemp = 223		//Below -50 Degrees Celcius
 	maxbodytemp = 323	//Above 50 Degrees Celcius
+	universal_speak = 0
 
 /mob/living/simple_animal/mouse/Life()
 	..()
@@ -168,4 +169,4 @@ mob/living/simple_animal/mouse/restrained() //Hotfix to stop mice from doing thi
 	desc = "Jerry the cat is not amused."
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
-	response_harm   = "splats"
+	response_harm   = "splats"

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

@@ -12,6 +12,7 @@
 	var/list/friends = list()
 	var/break_stuff_probability = 10
 	stop_automated_movement_when_pulled = 0
+	var/destroy_surroundings = 1
 
 /mob/living/simple_animal/hostile/proc/FindTarget()
 
@@ -117,11 +118,13 @@
 				target_mob = FindTarget()
 
 			if(HOSTILE_STANCE_ATTACK)
-				DestroySurroundings()
+				if(destroy_surroundings)
+					DestroySurroundings()
 				MoveToTarget()
 
 			if(HOSTILE_STANCE_ATTACKING)
-				DestroySurroundings()
+				if(destroy_surroundings)
+					DestroySurroundings()
 				AttackTarget()
 
 /mob/living/simple_animal/hostile/proc/OpenFire(target_mob)