From 0aebd8afa3c58d0f66dc5583cc8089b6df7927e4 Mon Sep 17 00:00:00 2001 From: Bone White Date: Sun, 27 Jul 2014 17:30:22 +0100 Subject: [PATCH 1/2] Spec Ops Shuttle Computer Access Fix Gives the shuttle controller the correct access for the ERT --- code/modules/shuttles/shuttle_specops.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm index 2027252d05f..326fa0d31e0 100644 --- a/code/modules/shuttles/shuttle_specops.dm +++ b/code/modules/shuttles/shuttle_specops.dm @@ -1,7 +1,7 @@ /obj/machinery/computer/shuttle_control/specops name = "special operations shuttle console" shuttle_tag = "Special Operations" - req_access = list(access_cent_specops) + req_access = list(access_cent_general) //for shuttles that may use a different docking port at each location /datum/shuttle/ferry/multidock @@ -20,7 +20,7 @@ /datum/shuttle/ferry/multidock/specops var/specops_return_delay = 6000 //After moving, the amount of time that must pass before the shuttle may move again var/specops_countdown_time = 600 //Length of the countdown when moving the shuttle - + var/obj/item/device/radio/intercom/announcer = null var/reset_time = 0 //the world.time at which the shuttle will be ready to move again. var/launch_prep = 0 @@ -41,7 +41,7 @@ if (istype(user, /obj/machinery/computer)) var/obj/machinery/computer/C = user - + if(world.time <= reset_time) C.visible_message("\blue Central Command will not allow the Special Operations shuttle to launch yet.") if (((world.time - reset_time)/10) > 60) @@ -58,7 +58,7 @@ radio_announce("THE SPECIAL OPERATIONS SHUTTLE IS PREPARING FOR LAUNCH") sleep_until_launch() - + //launch radio_announce("ALERT: INITIATING LAUNCH SEQUENCE") ..(user) @@ -74,21 +74,21 @@ for(var/turf/T in get_area_turfs(destination)) var/mob/M = locate(/mob) in T M << "\red You have arrived at [station_name]. Commence operation!" - + reset_time = world.time + specops_return_delay //set the timeout /datum/shuttle/ferry/multidock/specops/cancel_launch() if (!can_cancel()) return - + cancel_countdown = 1 radio_announce("ALERT: LAUNCH SEQUENCE ABORTED") if (istype(in_use, /obj/machinery/computer)) var/obj/machinery/computer/C = in_use C.visible_message("\red Launch sequence aborted.") - + ..() - + /datum/shuttle/ferry/multidock/specops/can_launch() @@ -110,7 +110,7 @@ var/launch_time = world.time + specops_countdown_time var/time_until_launch - + cancel_countdown = 0 launch_prep = 1 while(!cancel_countdown && (launch_time - world.time) > 0) @@ -128,7 +128,7 @@ //Should call all the numbers but lag could mean some issues. Oh well. Not much I can do about that. sleep(5) - + launch_prep = 0 From d15d6bb742539b3665d7c9ac747f8f8d97ced7a5 Mon Sep 17 00:00:00 2001 From: Bone White Date: Sun, 27 Jul 2014 21:37:33 +0100 Subject: [PATCH 2/2] Minor surgery typo "exposing the brain help within" Fixed a typo in organ_external --- code/modules/organs/organ_external.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index cda609d37d9..ae2d1ace05d 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -1015,7 +1015,7 @@ Note that amputating the affected organ does in fact remove the infection from t /datum/organ/external/head/proc/breakskull() if(brained) return - owner.visible_message("\red The top of \the [owner]'s skull breaks, exposing the brain help within.", \ + owner.visible_message("\red The top of \the [owner]'s skull breaks, exposing the brain within.", \ "\red Unbearable pain hits you as the top of your skull breaks and exposes your brain!", \ "\red You hear a sickening crack.") owner.expose_brain()