cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #755

Browse Source
This commit is contained in:
Zuhayr
2016-01-13 23:51:45 +10:30
parent 004687abaa
commit a3e5649523
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/emergency_shuttle_controller.dm
View File

@@ -48,7 +48,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
if (evac) if (evac)
emergency_shuttle_docked.Announce("The Emergency Shuttle has docked with the station at docks one and two. You have approximately [round(estimate_launch_time()/60,1)] minutes to board the Emergency Shuttle.") emergency_shuttle_docked.Announce("The Emergency Shuttle has docked with the station at docks one and two. You have approximately [round(estimate_launch_time()/60,1)] minutes to board the Emergency Shuttle.")
else else
priority_announcement.Announce("The scheduled shuttle to the Vir Interstellar Spaceport has docked with the station at docks one and two. It will depart in approximately [round(emergency_shuttle.estimate_launch_time()/60,1)] minutes.") priority_announcement.Announce("The scheduled shuttle to the [dock_name] has docked with the station at docks one and two. It will depart in approximately [round(emergency_shuttle.estimate_launch_time()/60,1)] minutes.")
//arm the escape pods //arm the escape pods
if (evac) if (evac)
@@ -94,7 +94,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
//reset the shuttle transit time if we need to //reset the shuttle transit time if we need to
shuttle.move_time = SHUTTLE_TRANSIT_DURATION shuttle.move_time = SHUTTLE_TRANSIT_DURATION
priority_announcement.Announce("The regularly scheduled shuttle to the Vir Interstellar Spaceport will arrive in in approximately [round(estimate_arrival_time()/60)] minutes. Those leaving should proceed to docks one and two.") priority_announcement.Announce("The regularly scheduled shuttle to the [dock_name] will arrive in in approximately [round(estimate_arrival_time()/60)] minutes. Those leaving should proceed to docks one and two.")
//recalls the shuttle //recalls the shuttle
/datum/emergency_shuttle_controller/proc/recall() /datum/emergency_shuttle_controller/proc/recall()

1
code/global.dm
View File

@@ -27,6 +27,7 @@ var/diary = null
var/href_logfile = null var/href_logfile = null
var/station_name = "Northern Star" var/station_name = "Northern Star"
var/station_short = "Northern Star" var/station_short = "Northern Star"
var/const/dock_name = "Vir Interstellar Spaceport"
var/const/boss_name = "Central Command" var/const/boss_name = "Central Command"
var/const/boss_short = "Centcomm" var/const/boss_short = "Centcomm"
var/const/company_name = "NanoTrasen" var/const/company_name = "NanoTrasen"

6
code/modules/shuttles/shuttle_emergency.dm
View File

@@ -28,9 +28,9 @@
emergency_shuttle.departed = 1 emergency_shuttle.departed = 1
if (emergency_shuttle.evac) if (emergency_shuttle.evac)
priority_announcement.Announce("The Emergency Shuttle has left the station. Estimate [round(emergency_shuttle.estimate_arrival_time()/60,1)] minutes until the shuttle docks at [boss_name].") priority_announcement.Announce("The Emergency Shuttle has left the station. Estimate [round(emergency_shuttle.estimate_arrival_time()/60,1)] minutes until the shuttle docks at [dock_name].")
else else
priority_announcement.Announce("The Scheduled Transfer Shuttle has left the station. Estimate [round(emergency_shuttle.estimate_arrival_time()/60,1)] minutes until the shuttle docks at [boss_name].") priority_announcement.Announce("The Scheduled Transfer Shuttle has left the station. Estimate [round(emergency_shuttle.estimate_arrival_time()/60,1)] minutes until the shuttle docks at [dock_name].")
/datum/shuttle/ferry/emergency/can_launch(var/user) /datum/shuttle/ferry/emergency/can_launch(var/user)
if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) if (istype(user, /obj/machinery/computer/shuttle_control/emergency))
@@ -185,7 +185,7 @@
else if (!shuttle.location) else if (!shuttle.location)
shuttle_status = "Standing-by at [station_name]." shuttle_status = "Standing-by at [station_name]."
else else
shuttle_status = "Standing-by at [boss_name]." shuttle_status = "Standing-by at [dock_name]."
if(WAIT_LAUNCH, FORCE_LAUNCH) if(WAIT_LAUNCH, FORCE_LAUNCH)
shuttle_status = "Shuttle has recieved command and will depart shortly." shuttle_status = "Shuttle has recieved command and will depart shortly."
if(WAIT_ARRIVE) if(WAIT_ARRIVE)