Had a play around with a little bodyweight circuit today:
1min rope jump
10x pull ups
10x dips
20x squats
10x divebomber pushups
1min rest/stretch
repeat 5x
My shoulders feel great - I forgot how good divebombers made my shoulders feel. I've had a shoulder problem in the past and I think they help with the flexibility as I pause at the start of each rep to make sure I'm getting as full range as poss.