Merge branch 'master' into upstream-merge-8298

code/modules/overmap/ships/computers/computer_shims.dm

@@ -50,6 +50,7 @@
 //
 /obj/machinery/computer/ship
 	var/core_skill = /datum/skill/devices //The skill used for skill checks for this machine (mostly so subtypes can use different skills).
+	var/ai_control = TRUE	//VOREStation Edit
 
 //
 // Topic
@@ -70,6 +71,11 @@
 	return TRUE
 
 /obj/machinery/computer/ship/attack_ai(mob/user)
+	//VOREStation Addition Start
+	if(!ai_control && issilicon(user))
+		to_chat(user, "<span class='warning'>Access Denied.</span>")
+		return
+	//VOREStation Addition End
 	if(tgui_status(user, tgui_state()) > STATUS_CLOSE)
 		return interface_interact(user)
 
@@ -82,6 +88,11 @@
 /obj/machinery/computer/ship/attack_hand(mob/user)
 	if((. = ..()))
 		return
+	//VOREStation Addition Start
+	if(!ai_control && issilicon(user))
+		to_chat(user, "<span class='warning'>Access Denied.</span>")
+		return TRUE
+	//VOREStation Addition End
 	if(!allowed(user))
 		to_chat(user, "<span class='warning'>Access Denied.</span>")
 		return TRUE

code/modules/overmap/ships/computers/helm.dm

@@ -29,6 +29,7 @@ GLOBAL_LIST_EMPTY(all_waypoints)
 	var/speedlimit = 1/(20 SECONDS) //top speed for autopilot, 5
 	var/accellimit = 0.001 //manual limiter for acceleration
 	req_one_access = list(access_pilot) //VOREStation Edit
+	ai_control = FALSE	//VOREStation Edit - AI/Borgs shouldn't really be flying off in ships without crew help
 
 // fancy sprite
 /obj/machinery/computer/ship/helm/adv