Merge remote-tracking branch 'upstream/master' into dev-freeze

code/modules/client/preferences_factions.dm

@@ -24,7 +24,7 @@ var/global/list/home_system_choices = list(
 	"Sol",
 	"Nyx",
 	"Tau Ceti",
-	"Epsilon Ursae Majoris",
+	"Epsilon Ursae Minoris",
 	"S'randarr"
 	)
 

code/modules/hydroponics/trays/tray.dm

@@ -357,12 +357,15 @@
 	set category = "Object"
 	set src in view(1)
 
-	if(labelled)
-		usr << "You remove the label."
-		labelled = null
-		update_icon()
-	else
-		usr << "There is no label to remove."
+	if(!usr.canmove || usr.stat || usr.restrained())
+		return
+	if(ishuman(usr) || istype(usr, /mob/living/silicon/robot))
+		if(labelled)
+			usr << "You remove the label."
+			labelled = null
+			update_icon()
+		else
+			usr << "There is no label to remove."
 	return
 
 /obj/machinery/portable_atmospherics/hydroponics/verb/setlight()
@@ -370,10 +373,14 @@
 	set category = "Object"
 	set src in view(1)
 
-	var/new_light = input("Specify a light level.") as null|anything in list(0,1,2,3,4,5,6,7,8,9,10)
-	if(new_light)
-		tray_light = new_light
-		usr << "You set the tray to a light level of [tray_light] lumens."
+	if(!usr.canmove || usr.stat || usr.restrained())
+		return
+	if(ishuman(usr) || istype(usr, /mob/living/silicon/robot))
+		var/new_light = input("Specify a light level.") as null|anything in list(0,1,2,3,4,5,6,7,8,9,10)
+		if(new_light)
+			tray_light = new_light
+			usr << "You set the tray to a light level of [tray_light] lumens."
+	return
 
 /obj/machinery/portable_atmospherics/hydroponics/proc/check_level_sanity()
 	//Make sure various values are sane.
@@ -626,12 +633,14 @@
 	set name = "Toggle Tray Lid"
 	set category = "Object"
 	set src in view(1)
-	close_lid(usr)
+	if(!usr.canmove || usr.stat || usr.restrained())
+		return
+	
+	if(ishuman(usr) || istype(usr, /mob/living/silicon/robot))
+		close_lid(usr)
+	return
 
 /obj/machinery/portable_atmospherics/hydroponics/proc/close_lid(var/mob/living/user)
-	if(!user || user.stat || user.restrained())
-		return
-
 	closed_system = !closed_system
 	user << "You [closed_system ? "close" : "open"] the tray's lid."
 	update_icon()

code/modules/shuttles/shuttle_console.dm

@@ -15,7 +15,7 @@
 	if(!allowed(user))
 		user << "\red Access Denied."
 		return 1
-	
+
 	ui_interact(user)
 
 /obj/machinery/computer/shuttle_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
@@ -92,4 +92,10 @@
 		return 1
 
 /obj/machinery/computer/shuttle_control/bullet_act(var/obj/item/projectile/Proj)
-	visible_message("[Proj] ricochets off [src]!")
+	visible_message("\The [Proj] ricochets off \the [src]!")
+
+/obj/machinery/computer/shuttle_control/ex_act()
+	return
+
+/obj/machinery/computer/shuttle_control/emp_act()
+	return