Merge remote-tracking branch 'upstream/master' into wormholeProjector

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi