From 3d5c11d6df2c02be76453bb0e532ce31e7ebaaeb Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sun, 31 Jan 2021 22:24:27 -0500
Subject: [PATCH] Merge pull request #9629 from Novacat/nova-basicfixes

Shuttle Console ID Stuff
---
 code/game/machinery/computer/guestpass.dm       |  4 ++--
 code/modules/overmap/ships/computers/ship_vr.dm | 13 +++++++++++++
 maps/tether/tether_shuttles.dm                  |  2 --
 vorestation.dme                                 |  1 +
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 code/modules/overmap/ships/computers/ship_vr.dm

diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm
index c2876572d7..0090d03b7a 100644
--- a/code/game/machinery/computer/guestpass.dm
+++ b/code/game/machinery/computer/guestpass.dm
@@ -168,9 +168,9 @@
 			if(reas)
 				reason = reas
 		if("duration")
-			var/dur = input("Duration (in minutes) during which pass is valid (up to 120 minutes).", "Duration") as num|null
+			var/dur = input("Duration (in minutes) during which pass is valid (up to 360 minutes).", "Duration") as num|null //VOREStation Edit
 			if(dur)
-				if(dur > 0 && dur <= 120)
+				if(dur > 0 && dur <= 360) //VOREStation Edit
 					duration = dur
 				else
 					to_chat(usr, "<span class='warning'>Invalid duration.</span>")
diff --git a/code/modules/overmap/ships/computers/ship_vr.dm b/code/modules/overmap/ships/computers/ship_vr.dm
new file mode 100644
index 0000000000..b317eb3c1e
--- /dev/null
+++ b/code/modules/overmap/ships/computers/ship_vr.dm
@@ -0,0 +1,13 @@
+/*
+Ships can now be hijacked!
+*/
+/obj/machinery/computer/ship
+	var/hacked = 0   // Has been emagged, no access restrictions.
+
+/obj/machinery/computer/ship/emag_act(var/remaining_charges, var/mob/user)
+	if (!hacked)
+		req_access = list()
+		req_one_access = list()
+		hacked = 1
+		to_chat(user, "You short out the console's ID checking system. It's now available to everyone!")
+		return 1
diff --git a/maps/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm
index 7ad7472fc6..8f459766c7 100644
--- a/maps/tether/tether_shuttles.dm
+++ b/maps/tether/tether_shuttles.dm
@@ -259,7 +259,6 @@
 /obj/machinery/computer/shuttle_control/explore/medivac
 	name = "short jump console"
 	shuttle_tag = "Medivac Shuttle"
-	req_one_access = list(access_cmo, access_pilot)
 
 ////////////////////////////////////////
 ////////      Securiship   /////////////
@@ -285,4 +284,3 @@
 /obj/machinery/computer/shuttle_control/explore/securiship
 	name = "short jump console"
 	shuttle_tag = "Securiship Shuttle"
-	req_one_access = list(access_pilot, access_hos)
diff --git a/vorestation.dme b/vorestation.dme
index b14250f9dd..6c2e2a5a6e 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3332,6 +3332,7 @@
 #include "code\modules\overmap\ships\computers\helm.dm"
 #include "code\modules\overmap\ships\computers\sensors.dm"
 #include "code\modules\overmap\ships\computers\ship.dm"
+#include "code\modules\overmap\ships\computers\ship_vr.dm"
 #include "code\modules\overmap\ships\computers\shuttle.dm"
 #include "code\modules\overmap\ships\engines\engine.dm"
 #include "code\modules\overmap\ships\engines\gas_thruster.dm"