Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cloner

Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm

code/modules/mining/equipment_locker.dm

@@ -10,13 +10,7 @@
 	anchored = 1.0
 	input_dir = NORTH
 	output_dir = SOUTH
-	req_one_access = list(
-		access_mining_station,
-		access_chemistry,
-		access_bar,
-		access_research,
-		access_ce
-	)
+	req_access = list(access_mineral_storeroom)
 	var/stk_types = list()
 	var/stk_amt   = list()
 	var/stack_list[0] //Key: Type.  Value: Instance of type.