Merge branch 'master' of git://github.com/Abi79/tgstation13-git

Conflicts:
	baystation12.dme
	code/defines/mob/mob.dm
	code/defines/obj/vending.dm
	code/game/atom_procs.dm
	code/game/dna.dm
	code/game/machinery/computer/aifixer.dm
	code/game/vote.dm
	code/modules/chemical/Chemistry-Machinery.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/metroid/life.dm
	html/changelog.html
	icons/obj/stationobjs.dmi
	interface/skin.dmf
	maps/tgstation.2.0.8.dmm

code/modules/mining/mine_items.dm

@@ -9,7 +9,7 @@
 
 /**********************Miner Lockers**************************/
 
-/obj/structure/secure_closet/miner
+/obj/structure/closet/secure_closet/miner
 	name = "Miner's Equipment"
 	icon_state = "miningsec1"
 	icon_closed = "miningsec"
@@ -18,7 +18,7 @@
 	icon_off = "miningsecoff"
 	req_access = list(access_mining)
 
-/obj/structure/secure_closet/miner/New()
+/obj/structure/closet/secure_closet/miner/New()
 	..()
 	sleep(2)
 	new /obj/item/device/analyzer(src)
@@ -220,14 +220,14 @@ proc/move_mining_shuttle()
 
 /**********************Mining car (Crate like thing, not the rail car)**************************/
 
-/obj/structure/crate/miningcar
+/obj/structure/closet/crate/miningcar
 	desc = "A mining car. This one doesn't work on rails, but has to be dragged."
 	name = "Mining car (not for rails)"
 	icon = 'storage.dmi'
 	icon_state = "miningcar"
 	density = 1
-	openicon = "miningcaropen"
-	closedicon = "miningcar"
+	icon_opened = "miningcaropen"
+	icon_closed = "miningcar"