diff --git a/code/datums/shuttle_controller.dm b/code/datums/shuttle_controller.dm index 9ac038c4bdc..0e5626f0cfc 100644 --- a/code/datums/shuttle_controller.dm +++ b/code/datums/shuttle_controller.dm @@ -31,6 +31,12 @@ datum/shuttle_controller proc/recall() if(direction == 1) + var/timeleft = timeleft() + if(timeleft >= 600) + world << "\blue Shuttle is at Centcom. Unable to recall." + return + world << "\blue Alert: The shuttle is going back!" + world << sound('shuttlerecalled.ogg') setdirection(-1) online = 1 diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index aaef6b3cf03..4e135f06b90 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -42,6 +42,7 @@ access_qm = 41 access_court = 42 access_clown = 43 + access_mime = 44 /obj/var/list/req_access = null @@ -149,7 +150,7 @@ if("Clown") return list(access_maint_tunnels, access_clown) if("Mime") - return list(access_maint_tunnels) + return list(access_maint_tunnels, access_mime) if("Chef") return list(access_kitchen, access_morgue) if("Roboticist") @@ -182,7 +183,7 @@ access_teleporter, access_eva, access_heads, access_captain, access_all_personal_lockers, access_tech_storage, access_chapel_office, access_atmospherics, access_kitchen, access_bar, access_janitor, access_crematorium, access_robotics, access_cargo, access_cargo_bot, access_construction, - access_hydroponics, access_library, access_manufacturing, access_lawyer, access_virology, access_cmo, access_qm, access_clown) + access_hydroponics, access_library, access_manufacturing, access_lawyer, access_virology, access_cmo, access_qm, access_clown, access_mime) /proc/get_access_desc(A) switch(A) @@ -270,6 +271,8 @@ return "Quartermaster's Office" if(access_clown) return "HONK! Access" + if(access_mime) + return "Silent Access" /proc/get_all_jobs() return list("Assistant", "Station Engineer", "Detective", "Medical Doctor", "Captain", "Security Officer", "Warden", diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 3dfc70eeed1..339a38bbae4 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -413,9 +413,6 @@ if( ticker.mode.name == "blob" ) return - world << "\blue Alert: The shuttle is going back!" //marker4 - world << sound('shuttlerecalled.ogg') - emergency_shuttle.recall() return diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 33204cdd1d0..c4f9ecddb89 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -546,9 +546,6 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is src << "Only administrators may use this command." return - world << "\blue Alert: The shuttle is going back!" - world << sound('shuttlerecalled.ogg') - emergency_shuttle.recall() return