Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix

code/modules/mining/aux_base_camera.dm

@@ -25,7 +25,6 @@
 	max_matter = 600 //Bigger container and faster speeds due to being specialized and stationary.
 	no_ammo_message = "<span class='warning'>Internal matter exhausted. Please add additional materials.</span>"
 	delay_mod = 0.5
-	adjacency_check = FALSE
 	upgrade = TRUE
 	var/obj/machinery/computer/camera_advanced/base_construction/console
 
@@ -207,19 +206,14 @@
 		to_chat(owner, "Build mode is now [buildmode].")
 
 /datum/action/innate/aux_base/airlock_type
-	name = "Change Airlock Settings"
+	name = "Select Airlock Type"
 	button_icon_state = "airlock_select"
 
 /datum/action/innate/aux_base/airlock_type/Activate()
 	if(..())
 		return
 
-	var/mode = alert("Modify Type or Access?", "Airlock Settings", "Type", "Access", "None")
-	switch(mode)
-		if("Type")
-			B.RCD.change_airlock_setting(usr)
-		if("Access")
-			B.RCD.change_airlock_access(usr)
+	B.RCD.change_airlock_access(usr)
 
 
 /datum/action/innate/aux_base/window_type

code/modules/mining/equipment/kinetic_crusher.dm

@@ -63,8 +63,7 @@
 
 /obj/item/twohanded/kinetic_crusher/attack(mob/living/target, mob/living/carbon/user)
 	if(!wielded)
-		to_chat(user, "<span class='warning'>[src] is too heavy to use with one hand. You fumble and drop everything.")
-		user.drop_all_held_items()
+		to_chat(user, "<span class='warning'>[src] is too heavy to use with one hand.")
 		return
 	var/datum/status_effect/crusher_damage/C = target.has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING)
 	var/target_health = target.health