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

View File

@@ -1279,6 +1279,10 @@ proc/process_ghost_teleport_locs()
//Anomaly
/area/anomaly/hallway
name = "Anomaly Hallway"
icon_state = "anomaly"
/area/anomaly/lab
name = "Anomaly Lab"
icon_state = "anomaly"

View File

@@ -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

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

View File

@@ -68,8 +68,8 @@ proc/move_research_shuttle()
/obj/machinery/computer/research_shuttle/attack_hand(user as mob)
src.add_fingerprint(usr)
var/dat
dat = text("<center>research shuttle:<br> <b><A href='?src=\ref[src];move=[1]'>Send</A></b></center>")
var/dat = "<center>Research shuttle: <b><A href='?src=\ref[src];move=1'>Send</A></b></center><br>"
user << browse("[dat]", "window=researchshuttle;size=200x100")
/obj/machinery/computer/research_shuttle/Topic(href, href_list)

File diff suppressed because it is too large Load Diff