Merge pull request #1515 from caelaislinn/master

map tweaks
This commit is contained in:
Albert Iordache
2012-07-25 04:58:50 -07:00
5 changed files with 7688 additions and 7641 deletions
@@ -6,6 +6,8 @@
#define AIRLOCK_STATE_OUTOPEN 2
#define AIRLOCK_STATE_BOTHOPEN 3
//todo: add an internal and external sensor, so that the pressure is actually equalised, rather than just toggled between 1atm and 0atm
datum/computer/file/embedded_program/airlock_controller
var/id_tag
var/exterior_door_tag
+2 -2
View File
@@ -80,7 +80,7 @@ var/specops_shuttle_timeleft = 0
for(var/turf/T in get_area_turfs(end_location) )
var/mob/M = locate(/mob) in T
M << "\red You have arrived at Central Command. Operation has ended!"
M << "\red You have returned to Central Command."
specops_shuttle_at_station = 0
@@ -223,7 +223,7 @@ var/specops_shuttle_timeleft = 0
for(var/turf/T in get_area_turfs(end_location) )
var/mob/M = locate(/mob) in T
M << "\red You have arrived to [station_name]. Commence operation!"
M << "\red You have arrived to [station_name]."
for(var/obj/machinery/computer/specops_shuttle/S in world)
S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY