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

Conflicts:
	_maps/map_files/MetaStation/MetaStation.v39k.dmm
	_maps/map_files/MetaStation/z2.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	_maps/map_files/MiniStation/z3.dmm
	_maps/map_files/MiniStation/z4.dmm
	_maps/map_files/MiniStation/z5.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/backup/MetaStation.v39K.dmm
	_maps/map_files/generic/z2.dmm
	_maps/map_files/generic/z3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/map_files/generic/z5.dmm
	_maps/map_files/generic/z6.dmm
	_maps/map_files/generic/z7.dmm
	code/__DEFINES/hud.dm
	code/__HELPERS/_string_lists.dm
	code/datums/hud.dm
	code/game/gamemodes/antag_hud.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/light_floor.dm
	code/game/turfs/simulated/floor/mineral_floor.dm
	code/game/turfs/simulated/floor/misc_floor.dm
	code/game/turfs/simulated/floor/plasteel_floor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/modules/admin/verbs/buildmode.dm
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/death.dm
	code/modules/mob/living/carbon/life.dm
	config/admins.txt
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	strings/ion_laws.txt
	tools/mapmerge/META-INF/MANIFEST.MF
Merge remote-tracking branch 'origin/wormholeProjector' into wormholeProjector