Merge branch 'master' into weapon-removal

code/modules/mining/machinery/machine_processing.dm

@@ -43,7 +43,7 @@
 	if(istype(I, /obj/item/card/id))
 		if(!powered())
 			return
-		if(!inserted_id && user.unEquip(I))
+		if(!inserted_id && (user.unEquip(I) || isrobot(user)))
 			I.forceMove(src)
 			inserted_id = I
 			SStgui.update_uis(src)
@@ -124,7 +124,7 @@
 			. = TRUE
 		if("claim")
 			if(istype(inserted_id))
-				if(access_mining_station in inserted_id.access)
+				if(access_mining_station in inserted_id.GetAccess())
 					inserted_id.mining_points += machine.points
 					machine.points = 0
 				else
@@ -347,4 +347,3 @@
 #undef PROCESS_SMELT
 #undef PROCESS_COMPRESS
 #undef PROCESS_ALLOY
-

code/modules/mining/ore_redemption_machine/equipment_vendor.dm

@@ -310,7 +310,7 @@
 	if(istype(I,/obj/item/card/id))
 		if(!powered())
 			return
-		else if(!inserted_id && user.unEquip(I))
+		else if(!inserted_id && (user.unEquip(I) || isrobot(user)))
 			I.forceMove(src)
 			inserted_id = I
 			tgui_interact(user)

code/modules/mining/shelter_atoms_vr.dm

@@ -104,7 +104,7 @@ GLOBAL_LIST_EMPTY(unique_deployable)
 
 /obj/item/survivalcapsule/luxurybar
 	name = "luxury surfluid bar capsule"
-	desc = "A luxury bar in a capsule. Bartender required and not included. There's a license for use printed on the bottom."
+	desc = "A luxury bar in a capsule. " + JOB_BARTENDER + " required and not included. There's a license for use printed on the bottom."
 	template_id = "shelter_gamma"
 
 /obj/item/survivalcapsule/military
@@ -124,6 +124,7 @@ GLOBAL_LIST_EMPTY(unique_deployable)
 	desc = "A cozy cabin; crammed into a survival capsule."
 	template_id = "shelter_cab"
 
+<<<<<<< HEAD
 /obj/item/survivalcapsule/dropship
 	name = "dropship surfluid shelter capsule"
 	desc = "A military dropship in a capsule. Contains everything an assault squad would need, minus the squad itself. This capsule is significantly larger than most. There's a license for use printed on the bottom."
@@ -132,6 +133,8 @@ GLOBAL_LIST_EMPTY(unique_deployable)
 	is_ship = TRUE
 	w_class = ITEMSIZE_SMALL
 
+=======
+>>>>>>> master
 //Custom Shelter Capsules
 /obj/item/survivalcapsule/tabiranth
 	name = "silver-trimmed surfluid shelter capsule"