Merge remote-tracking branch 'origin/master' into bay_examine

# Conflicts:
#	code/game/objects/structures/displaycase.dm

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -200,7 +200,6 @@
 	desc = "A high-tech nitrogen tank designed specifically for Vox."
 	icon_state = "emergency_vox"
 	item_state = "emergency_vox"
-	icon_override = 'icons/mob/in-hand/tools.dmi'
 	volume = 25
 
 

code/game/objects/items/weapons/tanks/watertank.dm

@@ -108,7 +108,6 @@
 	icon = 'icons/obj/watertank.dmi'
 	icon_state = "mister"
 	item_state = "mister"
-	icon_override = 'icons/mob/in-hand/tools.dmi'
 	w_class = 4.0
 	amount_per_transfer_from_this = 50
 	possible_transfer_amounts = list(25,50,100)
@@ -210,7 +209,6 @@
 	icon = 'icons/obj/watertank.dmi'
 	icon_state = "atmos_nozzle"
 	item_state = "nozzleatmos"
-	icon_override = 'icons/mob/in-hand/tools.dmi'
 	safety = 0
 	max_water = 200
 	power = 8