cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 05:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

Browse Source 
Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm
This commit is contained in:
PsiOmega
2015-08-21 20:27:48 +02:00
parent 55d1bbf735 4396e5a5bc
commit e48fbdd1e6
118 changed files with 441 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttles/shuttle_emergency.dm
+3 -3
View File
@@ -28,9 +28,9 @@
emergency_shuttle.departed = 1
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 Central Command.")
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].")
else
priority_announcement.Announce("The Crew Transfer Shuttle has left the station. Estimate [round(emergency_shuttle.estimate_arrival_time()/60,1)] minutes until the shuttle docks at Central Command.")
priority_announcement.Announce("The Crew Transfer Shuttle has left the station. Estimate [round(emergency_shuttle.estimate_arrival_time()/60,1)] minutes until the shuttle docks at [boss_name].")
/datum/shuttle/ferry/emergency/can_launch(var/user)
if (istype(user, /obj/machinery/computer/shuttle_control/emergency))
@@ -185,7 +185,7 @@
else if (!shuttle.location)
shuttle_status = "Standing-by at [station_name]."
else
shuttle_status = "Standing-by at Central Command."
shuttle_status = "Standing-by at [boss_name]."
if(WAIT_LAUNCH, FORCE_LAUNCH)
shuttle_status = "Shuttle has recieved command and will depart shortly."
if(WAIT_ARRIVE)
code/modules/shuttles/shuttle_specops.dm
+3 -3
View File
@@ -62,7 +62,7 @@
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.")
C.visible_message("\blue [boss_name] will not allow the Special Operations shuttle to launch yet.")
if (((world.time - reset_time)/10) > 60)
C.visible_message("\blue [-((world.time - reset_time)/10)/60] minutes remain!")
else
@@ -93,12 +93,12 @@
if (!location) //just arrived home
for(var/turf/T in get_area_turfs(destination))
var/mob/M = locate(/mob) in T
M << "\red You have arrived at Central Command. Operation has ended!"
M << "<span class='danger'>You have arrived at [boss_name]. Operation has ended!</span>"
else //just left for the station
launch_mauraders()
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!"
M << "<span class='danger'>You have arrived at [station_name]. Commence operation!</span>"
var/obj/machinery/light/small/readylight/light = locate() in T
if(light) light.set_state(1)
code/modules/shuttles/shuttles_multi.dm
+2 -2
View File
@@ -59,14 +59,14 @@
if(cloaked || isnull(departure_message))
return
command_announcement.Announce(departure_message,(announcer ? announcer : "Central Command"))
command_announcement.Announce(departure_message,(announcer ? announcer : "[boss_name]"))
/datum/shuttle/multi_shuttle/proc/announce_arrival()
if(cloaked || isnull(arrival_message))
return
command_announcement.Announce(arrival_message,(announcer ? announcer : "Central Command"))
command_announcement.Announce(arrival_message,(announcer ? announcer : "[boss_name]"))
/obj/machinery/computer/shuttle_control/multi