From 19d5c945bf85dc577fe804c0bc9535950ff24abc Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Mon, 18 May 2020 02:47:18 +0200
Subject: [PATCH] Emagproofs CC, adds admin warning if ert shuttle is moved by
 non-ert (#12795)

* Increased security

* Increased security

* Fixes little oversight.

* Added admin warning

* Spelling
---
 _maps/map_files/cyberiad/z2.dmm | 30 ++++++++++++++++++++++--------
 code/modules/shuttle/ert.dm     |  8 ++++++++
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/_maps/map_files/cyberiad/z2.dmm b/_maps/map_files/cyberiad/z2.dmm
index 684365ada39..999be71a118 100644
--- a/_maps/map_files/cyberiad/z2.dmm
+++ b/_maps/map_files/cyberiad/z2.dmm
@@ -5006,6 +5006,20 @@
 	name = "grass"
 	},
 /area/centcom/control)
+"nc" = (
+/obj/machinery/door/airlock/centcom{
+	name = "Gamma Armory";
+	opacity = 1;
+	req_access_txt = "114"
+	},
+/obj/machinery/door/poddoor/impassable{
+	id_tag = "CCGAMMA";
+	name = "Gamma Security"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/centcom/gamma)
 "nd" = (
 /obj/structure/flora/ausbushes/lavendergrass,
 /turf/unsimulated/floor{
@@ -5381,7 +5395,7 @@
 	},
 /area/syndicate_mothership)
 "nQ" = (
-/obj/machinery/door/poddoor{
+/obj/machinery/door/poddoor/impassable{
 	id_tag = "GRAVPULTS";
 	name = "Gravity Catapults"
 	},
@@ -5391,7 +5405,7 @@
 	},
 /area/centcom/specops)
 "nR" = (
-/obj/machinery/door/poddoor{
+/obj/machinery/door/poddoor/impassable{
 	id_tag = "GRAVPULTS";
 	name = "Gravity Catapults"
 	},
@@ -5408,7 +5422,7 @@
 	},
 /area/syndicate_mothership)
 "nT" = (
-/obj/machinery/door/poddoor{
+/obj/machinery/door/poddoor/impassable{
 	id_tag = "ASSAULT";
 	name = "Assault Armor"
 	},
@@ -5854,7 +5868,7 @@
 	},
 /area/centcom/gamma)
 "oR" = (
-/obj/machinery/door/poddoor{
+/obj/machinery/door/poddoor/impassable{
 	id_tag = "SPECOPS";
 	name = "Ready Room"
 	},
@@ -5979,7 +5993,7 @@
 	opacity = 1;
 	req_access_txt = "114"
 	},
-/obj/machinery/door/poddoor{
+/obj/machinery/door/poddoor/impassable{
 	id_tag = "specopsoffice";
 	name = "Super Privacy Shutters"
 	},
@@ -6118,7 +6132,7 @@
 /turf/simulated/floor/mech_bay_recharge_floor,
 /area/shuttle/gamma/space)
 "pv" = (
-/obj/machinery/door/poddoor{
+/obj/machinery/door/poddoor/impassable{
 	id_tag = "CCTELE";
 	name = "Specops Teleporter"
 	},
@@ -6365,7 +6379,7 @@
 /area/centcom/specops)
 "pX" = (
 /obj/machinery/door_control{
-	desc = "A remote control switch to block view of the singularity.";
+	desc = "A remote control switch to connect the ready room to the rest of Centcom.";
 	icon_state = "doorctrl0";
 	id = "SPECOPS";
 	name = "Ready Room";
@@ -29642,7 +29656,7 @@ fm
 fm
 md
 md
-oO
+nc
 fm
 pv
 sX
diff --git a/code/modules/shuttle/ert.dm b/code/modules/shuttle/ert.dm
index 1f664a69c8f..356ca9687dc 100644
--- a/code/modules/shuttle/ert.dm
+++ b/code/modules/shuttle/ert.dm
@@ -6,6 +6,14 @@
 	resistance_flags = INDESTRUCTIBLE
 	flags = NODECONSTRUCT
 
+/obj/machinery/computer/shuttle/ert/Topic(href, href_list)
+	if(href_list["move"])
+		var/authorized_roles = list(SPECIAL_ROLE_ERT, SPECIAL_ROLE_DEATHSQUAD)
+		if(!((usr.mind.assigned_role in authorized_roles) || is_admin(usr)))
+			message_admins("Potential ERT shuttle hijack, ERT shuttle moved by unauthorized user: [key_name_admin(usr)]")
+	..()
+	
+
 /obj/machinery/computer/camera_advanced/shuttle_docker/ert
 	name = "specops navigation computer"
 	desc = "Used to designate a precise transit location for the specops shuttle."