ARES Change Holder

code/__DEFINES/ARES.dm

@@ -1,21 +1,22 @@
+#define ARES_ACCESS_LOGOUT 0
 /// Generic access for 1:1 conversations with ARES and unrestricted commands.
-#define ARES_ACCESS_BASIC 0
+#define ARES_ACCESS_BASIC 1
 /// Secure Access, can read ARES Announcements and Bioscans.
-#define ARES_ACCESS_COMMAND 1
-#define ARES_ACCESS_JOE 2
+#define ARES_ACCESS_COMMAND 2
+#define ARES_ACCESS_JOE 3
 /// CL, can read Apollo Log and also Delete Announcements.
-#define ARES_ACCESS_CORPORATE 3
+#define ARES_ACCESS_CORPORATE 4
 /// Senior Command, can Delete Bioscans.
-#define ARES_ACCESS_SENIOR 4
+#define ARES_ACCESS_SENIOR 5
 /// Synth, CE & Commanding Officer, can read the access log.
-#define ARES_ACCESS_CE 5
-#define ARES_ACCESS_SYNTH 6
-#define ARES_ACCESS_CO 7
+#define ARES_ACCESS_CE 6
+#define ARES_ACCESS_SYNTH 7
+#define ARES_ACCESS_CO 8
 /// High Command, can read the deletion log.
-#define ARES_ACCESS_HIGH 8
-#define ARES_ACCESS_WY_COMMAND 9
+#define ARES_ACCESS_HIGH 9
+#define ARES_ACCESS_WY_COMMAND 10
 /// Debugging. Allows me to view everything without using a high command rank. Unlikely to stay in a full merge.
-#define ARES_ACCESS_DEBUG 10
+#define ARES_ACCESS_DEBUG 11
 
 #define ARES_RECORD_ANNOUNCE "Announcement Record"
 #define ARES_RECORD_ANTIAIR "AntiAir Control Log"
@@ -26,6 +27,7 @@
 #define ARES_RECORD_SECURITY "Security Update"
 #define ARES_RECORD_MAINTENANCE "Maintenance Ticket"
 #define ARES_RECORD_ACCESS "Access Ticket"
+#define ARES_RECORD_FLIGHT "Flight Record"
 
 /// Not by ARES logged through marine_announcement()
 #define ARES_LOG_NONE 0
@@ -34,13 +36,14 @@
 /// Logged in the security updates
 #define ARES_LOG_SECURITY 2
 
-/// Access levels specifically for Working Joe management console
-#define APOLLO_ACCESS_REQUEST 0
-#define APOLLO_ACCESS_REPORTER 1
-#define APOLLO_ACCESS_TEMP 2
-#define APOLLO_ACCESS_AUTHED 3
-#define APOLLO_ACCESS_JOE 4
-#define APOLLO_ACCESS_DEBUG 5
+// Access levels specifically for Working Joe management console
+#define APOLLO_ACCESS_LOGOUT 0
+#define APOLLO_ACCESS_REQUEST 1
+#define APOLLO_ACCESS_REPORTER 2
+#define APOLLO_ACCESS_TEMP 3
+#define APOLLO_ACCESS_AUTHED 4
+#define APOLLO_ACCESS_JOE 5
+#define APOLLO_ACCESS_DEBUG 6
 
 /// Ticket statuses, both for Access and Maintenance
 /// Pending assignment/rejection
@@ -54,6 +57,13 @@
 /// Completed by WJs
 #define TICKET_COMPLETED "completed"
 
+/// Granted Access Ticket
+#define TICKET_GRANTED "granted"
+/// Revoked Access Ticket
+#define TICKET_REVOKED "revoked"
+/// Self-Returned Access Ticket
+#define TICKET_RETURNED "returned"
+
 /// Checks for if buttons can be used, these may yet be removed and internalised to the UI programming
 #define TICKET_OPEN "OPEN"
 #define TICKET_CLOSED "CLOSED"

code/__DEFINES/atmospherics.dm

@@ -41,3 +41,4 @@ var/MAX_EXPLOSION_RANGE = 14
 /// Used in /obj/structure/pipes/vents/proc/create_gas
 #define VENT_GAS_SMOKE "Smoke"
 #define VENT_GAS_CN20 "CN20 Nerve Gas"
+#define VENT_GAS_CN20_XENO "CN20-X Nerve Gas"

code/__DEFINES/vv.dm

@@ -134,3 +134,6 @@
 #define VV_HK_TOGGLEPOWER "togglepower"
 
 #define VV_HK_ADD_ITEMS_TO_VENDOR "add_items_to_vendor"
+
+// /obj/structure/pipes/vents
+#define VV_HK_GAS "release_gas"

code/game/machinery/ARES/ARES.dm

@@ -121,10 +121,10 @@
 	var/current_menu = "login"
 	var/last_menu = ""
 
-	var/authentication = ARES_ACCESS_BASIC
+	var/authentication = ARES_ACCESS_LOGOUT
 
 	/// The last person to login.
-	var/last_login
+	var/last_login = "No User"
 	/// The person pretending to be last_login
 	var/sudo_holder
 	/// A record of who logged in and when.
@@ -149,8 +149,10 @@
 	var/list/records_talking = list()
 	/// Holds all (/datum/ares_record/requisition_log)s
 	var/list/records_asrs = list()
-	/// Holds all (/datum/ares_record/security)s and (/datum/ares_record/antiair)s
+	/// Holds all (/datum/ares_record/security)s (including AA)
 	var/list/records_security = list()
+	/// Holds all (/datum/ares_record/flight)s
+	var/list/records_flight = list()
 	/// Is nuke request usable or not?
 	var/nuke_available = TRUE
 
@@ -199,19 +201,13 @@
 	var/current_menu = "login"
 	var/last_menu = ""
 
-	var/authentication = ARES_ACCESS_BASIC
+	var/authentication = APOLLO_ACCESS_LOGOUT
 	/// The last person to login.
-	var/last_login
+	var/last_login = "No User"
 	/// A record of who logged in and when.
 	var/list/login_list = list()
 
 
-	/// If this is used to create AI Core access tickets
-	var/ticket_console = FALSE
-	var/obj/item/card/id/authenticator_id
-	var/ticket_authenticated = FALSE
-	var/obj/item/card/id/target_id
-
 /obj/structure/machinery/computer/working_joe/proc/link_systems(datum/ares_link/new_link = GLOB.ares_link, override)
 	if(link && !override)
 		return FALSE