cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 16:44:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Emagproofs CC, adds admin warning if ert shuttle is moved by non-ert (#12795)

Browse Source 
* Increased security

* Increased security

* Fixes little oversight.

* Added admin warning

* Spelling
This commit is contained in:
TDSSS
2020-05-18 02:47:18 +02:00
committed by GitHub
parent 630251a0ff
commit 19d5c945bf
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/cyberiad/z2.dmm
+22 -8
View File
@@ -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
code/modules/shuttle/ert.dm
+8
View File
@@ -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."