cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 12:37:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert Tether shuttles to Overmap Landable Ships

Browse Source
This commit is contained in:
Aronai Sieyes
2020-03-11 11:11:41 -04:00
committed by Leshana
parent d0bf576ad8
commit 07a5e8e86d
33 changed files with 15578 additions and 13139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/tether/submaps/_tether_submaps.dm
+6
View File
@@ -440,3 +440,9 @@
mobs_to_pick_from = list(
/mob/living/simple_mob/shadekin
)
//////////////////////////////////////////////////////////////////////////////
//Overmap ship spawns
#include "om_ships/hybridshuttle.dm"
#include "om_ships/screebarge.dm"
maps/tether/submaps/aerostat/_aerostat.dm
+9 -36
View File
@@ -1,34 +1,20 @@
#include "submaps/virgo2.dm"
/obj/effect/overmap/visitable/sector/virgo2
name = "Virgo 2"
desc = "Includes the Remmi Aerostat and associated ground mining complexes."
icon_state = "globe"
color = "#dfff3f" //Bright yellow
initial_generic_waypoints = list("aerostat_west","aerostat_east","aerostat_south","aerostat_northwest","aerostat_northeast")
// -- Datums -- //
/datum/shuttle_destination/excursion/virgo2orbit
name = "Virgo 2 Orbit"
my_landmark = "tether_excursion_space"
preferred_interim_tag = "tether_excursion_transit_space"
skip_me = TRUE
routes_to_make = list(
/datum/shuttle_destination/excursion/bluespace = 30 SECONDS,
/datum/shuttle_destination/excursion/virgo2orbit = 30 SECONDS
)
/datum/shuttle_destination/excursion/aerostat
name = "Remmi Aerostat"
my_landmark = "tether_excursion_aerostat"
preferred_interim_tag = "tether_excursion_transit_space"
skip_me = TRUE
routes_to_make = list(
/datum/shuttle_destination/excursion/virgo2orbit = 30 SECONDS
)
/datum/shuttle/autodock/ferry/aerostat
name = "Aerostat Ferry"
shuttle_area = /area/shuttle/aerostat
warmup_time = 10 //want some warmup time so people can cancel.
landmark_station = "aerostat_up"
landmark_offsite = "aerostat_down"
landmark_station = "aerostat_east"
landmark_offsite = "aerostat_surface"
/datum/random_map/noise/ore/virgo2
descriptor = "virgo 2 ore distribution map"
@@ -44,19 +30,6 @@
name = "aerostat ferry control console"
shuttle_tag = "Aerostat Ferry"
/obj/shuttle_connector/aerostat
name = "shuttle connector - aerostat"
shuttle_name = "Excursion Shuttle"
destinations = list(/datum/shuttle_destination/excursion/virgo2orbit, /datum/shuttle_destination/excursion/aerostat)
/obj/away_mission_init/aerostat/Initialize()
/*seed_submaps(list(Z_LEVEL_AEROSTAT_SURFACE), 50, /area/tether_away/aerostat/surface/unexplored, /datum/map_template/virgo2)
new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_AEROSTAT_SURFACE, world.maxx, world.maxy)
new /datum/random_map/noise/ore/virgo2(null, 1, 1, Z_LEVEL_AEROSTAT_SURFACE, 64, 64)*/
initialized = TRUE
return INITIALIZE_HINT_QDEL
/obj/tether_away_spawner/aerostat_inside
name = "Aerostat Indoors Spawner"
faction = "aerostat_inside"
maps/tether/submaps/aerostat/aerostat.dmm
+158 -105
View File
@@ -774,14 +774,6 @@
icon_state = "void-hc"
},
/area/tether_away/aerostat/inside)
"cf" = (
/obj/effect/floor_decal/industrial/warning/dust{
dir = 1
},
/obj/shuttle_connector/aerostat,
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating/virgo2,
/area/tether_away/aerostat/inside)
"cg" = (
/obj/machinery/door/airlock/multi_tile/metal{
icon_state = "door_closed";
@@ -880,8 +872,8 @@
/obj/effect/shuttle_landmark{
base_area = /area/tether_away/aerostat;
base_turf = /turf/unsimulated/floor/sky/virgo2_sky;
landmark_tag = "tether_excursion_aerostat";
name = "Excursion Aerostat"
landmark_tag = "aerostat_west";
name = "Virgo 2 Aerostat (W)"
},
/turf/unsimulated/floor/sky/virgo2_sky,
/area/tether_away/aerostat)
@@ -1632,6 +1624,10 @@
/obj/random/toolbox,
/turf/simulated/floor/plating/virgo2,
/area/tether_away/aerostat/inside)
"eL" = (
/obj/structure/railing,
/turf/simulated/floor/plating/virgo2,
/area/tether_away/aerostat)
"fl" = (
/obj/random/contraband,
/turf/simulated/floor/plating/virgo2,
@@ -1640,10 +1636,22 @@
/obj/structure/salvageable/implant_container,
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
"gt" = (
/obj/structure/railing{
dir = 8
},
/turf/simulated/floor/plating/virgo2,
/area/tether_away/aerostat)
"gD" = (
/obj/tether_away_spawner/aerostat_inside,
/turf/simulated/floor/plating/virgo2,
/area/tether_away/aerostat/inside)
"gT" = (
/obj/structure/railing{
dir = 4
},
/turf/simulated/floor/plating/virgo2,
/area/tether_away/aerostat)
"gX" = (
/obj/structure/salvageable/data,
/turf/simulated/floor/tiled/techfloor/virgo2,
@@ -1652,6 +1660,15 @@
/obj/random/contraband,
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
"kD" = (
/obj/effect/shuttle_landmark{
base_area = /area/tether_away/aerostat;
base_turf = /turf/unsimulated/floor/sky/virgo2_sky;
landmark_tag = "aerostat_northwest";
name = "Virgo 2 Aerostat (NW)"
},
/turf/unsimulated/floor/sky/virgo2_sky,
/area/tether_away/aerostat)
"kF" = (
/obj/random/action_figure,
/turf/simulated/floor/tiled/techfloor/virgo2,
@@ -1660,8 +1677,8 @@
/obj/effect/shuttle_landmark{
base_area = /area/tether_away/aerostat;
base_turf = /turf/unsimulated/floor/sky/virgo2_sky;
landmark_tag = "aerostat_up";
name = "Remmi Aerostat"
landmark_tag = "aerostat_east";
name = "Virgo 2 Aerostat (E)"
},
/turf/simulated/shuttle/floor/yellow,
/area/shuttle/aerostat)
@@ -1685,6 +1702,15 @@
/obj/structure/salvageable/autolathe,
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
"zX" = (
/obj/effect/shuttle_landmark{
base_area = /area/tether_away/aerostat;
base_turf = /turf/unsimulated/floor/sky/virgo2_sky;
landmark_tag = "aerostat_south";
name = "Virgo 2 Aerostat (S)"
},
/turf/unsimulated/floor/sky/virgo2_sky,
/area/tether_away/aerostat)
"AS" = (
/obj/effect/floor_decal/industrial/warning/dust{
dir = 4
@@ -1692,6 +1718,15 @@
/obj/random/toolbox,
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
"Dt" = (
/obj/effect/shuttle_landmark{
base_area = /area/tether_away/aerostat;
base_turf = /turf/unsimulated/floor/sky/virgo2_sky;
landmark_tag = "aerostat_northeast";
name = "Virgo 2 Aerostat (NE)"
},
/turf/unsimulated/floor/sky/virgo2_sky,
/area/tether_away/aerostat)
"Du" = (
/obj/effect/floor_decal/industrial/warning/dust{
dir = 1
@@ -1737,6 +1772,13 @@
/obj/random/contraband,
/turf/simulated/floor/bluegrid/virgo2,
/area/tether_away/aerostat/inside)
"ON" = (
/obj/structure/railing{
icon_state = "railing0";
dir = 1
},
/turf/simulated/floor/plating/virgo2,
/area/tether_away/aerostat)
"Qe" = (
/obj/structure/table/standard,
/obj/effect/decal/cleanable/cobweb2,
@@ -1747,6 +1789,10 @@
/obj/structure/salvageable/machine,
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
"Tq" = (
/obj/effect/overmap/visitable/sector/virgo2,
/turf/unsimulated/floor/sky/virgo2_sky,
/area/tether_away/aerostat)
"TR" = (
/obj/structure/salvageable/computer,
/turf/simulated/floor/tiled/techfloor/virgo2,
@@ -1757,10 +1803,17 @@
/obj/random/toolbox,
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
"VR" = (
/obj/machinery/door/airlock/external,
/turf/simulated/floor/plating/virgo2,
/area/tether_away/aerostat/inside)
"Wk" = (
/obj/random/drinkbottle,
/turf/simulated/floor/plating/virgo2,
/area/tether_away/aerostat/inside)
"WS" = (
/turf/simulated/floor/plating/virgo2,
/area/tether_away/aerostat)
"Ym" = (
/obj/structure/table/standard,
/obj/item/weapon/gun/energy/taser/xeno,
@@ -2052,7 +2105,7 @@ aw
aw
aw
aw
aw
Tq
cZ
"}
(3,1,1) = {"
@@ -7095,7 +7148,7 @@ aw
aw
aw
aa
cf
cc
cY
aa
aw
@@ -10884,7 +10937,7 @@ aw
aw
aw
aw
aw
kD
aw
aw
aw
@@ -11168,8 +11221,8 @@ aw
aw
aw
aw
aw
aw
ON
eL
aw
aw
aw
@@ -11310,8 +11363,8 @@ aw
aw
aw
aw
aw
aw
ON
eL
aw
aw
aw
@@ -11452,19 +11505,19 @@ aw
aw
aw
aw
ON
eL
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
ac
bo
bf
ac
ac
bo
bf
ac
be
be
@@ -11530,14 +11583,14 @@ aw
aw
bq
ac
aw
aw
aw
aw
aw
aw
aw
aw
ac
bo
bf
ac
ac
bo
bf
ac
aw
aw
aw
@@ -11594,20 +11647,20 @@ aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
ac
ON
WS
gt
gt
gt
gt
VR
be
be
be
be
be
be
VR
be
gD
bj
@@ -11671,17 +11724,17 @@ aw
aw
aw
bq
bf
aw
aw
aw
aw
aw
aw
aw
aw
aw
be
VR
be
be
be
be
be
be
VR
aw
zX
aw
aw
aw
@@ -11736,20 +11789,20 @@ aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
ac
ON
WS
gT
gT
gT
gT
VR
be
be
be
be
be
be
VR
be
be
bj
@@ -11813,15 +11866,15 @@ aw
aw
aw
bq
bf
aw
aw
aw
aw
aw
aw
aw
aw
be
VR
be
be
be
be
be
be
VR
aw
aw
aw
@@ -11878,19 +11931,19 @@ aw
aw
aw
aw
ON
eL
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
ac
bo
bf
ac
ac
bo
bf
ac
be
be
@@ -11956,14 +12009,14 @@ aw
aw
bq
ac
aw
aw
aw
aw
aw
aw
aw
aw
ac
bo
bf
ac
ac
bo
bf
ac
aw
aw
aw
@@ -12020,8 +12073,8 @@ aw
aw
aw
aw
aw
aw
ON
eL
aw
aw
aw
@@ -12162,8 +12215,8 @@ aw
aw
aw
aw
aw
aw
ON
eL
aw
aw
aw
@@ -12446,7 +12499,7 @@ aw
aw
aw
aw
aw
Dt
aw
aw
aw
maps/tether/submaps/aerostat/surface.dmm
+1 -1
View File
@@ -47,7 +47,7 @@
/obj/effect/shuttle_landmark{
base_area = /area/tether_away/aerostat/surface/explored;
base_turf = /turf/simulated/floor/tiled/techfloor/virgo2;
landmark_tag = "aerostat_down";
landmark_tag = "aerostat_surface";
name = "Virgo 2 Surface"
},
/turf/simulated/floor/tiled/techfloor/virgo2,
maps/tether/submaps/alienship/_alienship.dm
+8 -15
View File
@@ -1,23 +1,16 @@
// -- Datums -- //
/datum/shuttle_destination/excursion/alienship
name = "Unknown Ship"
my_landmark = "tether_excursion_alienship"
preferred_interim_tag = "tether_excursion_transit_space"
skip_me = TRUE
routes_to_make = list(
/datum/shuttle_destination/excursion/bluespace = 30 SECONDS
)
/obj/effect/overmap/visitable/sector/alienship
name = "Unknown Vessel"
desc = "An unknown vessel detected by sensors."
start_x = 12
start_y = 12
icon_state = "ship"
color = "#ff00ff" //Sandy
initial_generic_waypoints = list("tether_excursion_alienship")
// -- Objs -- //
/obj/shuttle_connector/alienship
name = "shuttle connector - alienship"
shuttle_name = "Excursion Shuttle"
destinations = list(/datum/shuttle_destination/excursion/alienship)
initialized = TRUE //Just don't.
/obj/away_mission_init/alienship
name = "away mission initializer - alienship"
icon = 'alienship.dmi'
maps/tether/submaps/beach/_beach.dm
+6 -29
View File
@@ -1,26 +1,11 @@
// -- Datums -- //
//We're including two new shuttle destinations. One is in orbit of our 'desert planet'
/datum/shuttle_destination/excursion/virgo4orbit //Must be a unique path
name = "Virgo 4 Orbit" //The name of the destination
my_landmark = "tether_excursion_space" //The area the shuttle goes when it's settled at this destination
preferred_interim_tag = "tether_excursion_transit_space" //The area the shuttle goes while it's moving there
skip_me = TRUE //Must be TRUE on all away-mission destinations for reasons
routes_to_make = list( //These are routes the shuttle connects to,
/datum/shuttle_destination/excursion/bluespace = 30 SECONDS //This is a normal destination that's part of Tether
)
//The other destination is landed on the surface
/datum/shuttle_destination/excursion/beach
name = "Remote Coastal Area"
my_landmark = "tether_excursion_beach"
preferred_interim_tag = "tether_excursion_transit_sand"
skip_me = TRUE
routes_to_make = list(
/datum/shuttle_destination/excursion/virgo4orbit = 30 SECONDS //This is the above one
)
/obj/effect/overmap/visitable/sector/virgo4
name = "Virgo 4"
desc = "Home to sand, and things with big fluffy ears."
icon_state = "globe"
color = "#ffd300" //Sandy
initial_generic_waypoints = list("beach_e", "beach_c", "beach_nw")
//This is a special subtype of the thing that generates ores on a map
//It will generate more rich ores because of the lower numbers than the normal one
@@ -58,14 +43,6 @@
// -- Objs -- //
//This is a special type of object which will build our shuttle paths, only if this map loads
//You do need to place this object on the map somewhere.
/obj/shuttle_connector/beach
name = "shuttle connector - beach"
shuttle_name = "Excursion Shuttle"
//This list needs to be in the correct order, and start with the one that connects to the rest of the shuttle 'network'
destinations = list(/datum/shuttle_destination/excursion/virgo4orbit, /datum/shuttle_destination/excursion/beach)
//This object simply performs any map setup that needs to happen on our map if it loads.
//As with the above, you do need to place this object on the map somewhere.
/obj/away_mission_init/beachcave
maps/tether/submaps/beach/beach.dmm
+63 -42
View File
@@ -311,8 +311,8 @@
/obj/effect/shuttle_landmark{
base_area = /area/tether_away/beach/jungle;
base_turf = /turf/simulated/floor/beach/sand/desert;
landmark_tag = "tether_excursion_beach";
name = "Excursion Beach"
landmark_tag = "beach_c";
name = "Virgo 4 Beach (Center)"
},
/turf/simulated/floor/beach/sand/desert,
/area/tether_away/beach/jungle)
@@ -331,14 +331,35 @@
/turf/simulated/floor/beach/sand,
/area/tether_away/beach/jungle)
"bs" = (
/obj/shuttle_connector/beach,
/obj/effect/step_trigger/zlevel_fall/beach,
/turf/simulated/floor/beach/sand/desert,
/area/tether_away/beach/jungle)
"hx" = (
/obj/effect/overmap/visitable/sector/virgo4,
/turf/simulated/floor/water/deep/ocean,
/area/tether_away/beach/water)
"xW" = (
/obj/tether_away_spawner/beach_outside_friendly,
/turf/simulated/floor/beach/sand/desert,
/area/tether_away/beach/jungle)
"Ar" = (
/obj/effect/shuttle_landmark{
base_area = /area/tether_away/beach/jungle;
base_turf = /turf/simulated/floor/beach/sand/desert;
landmark_tag = "beach_nw";
name = "Virgo 4 Beach (NW)"
},
/turf/simulated/floor/beach/sand/desert,
/area/tether_away/beach/jungle)
"Dr" = (
/obj/effect/shuttle_landmark{
base_area = /area/tether_away/beach/jungle;
base_turf = /turf/simulated/floor/beach/sand/desert;
landmark_tag = "beach_e";
name = "Virgo 4 Beach (E)"
},
/turf/simulated/floor/beach/sand/desert,
/area/tether_away/beach/jungle)
"TU" = (
/obj/tether_away_spawner/beach_outside,
/turf/simulated/floor/beach/sand/desert,
@@ -629,7 +650,7 @@ am
am
am
am
am
hx
bi
"}
(3,1,1) = {"
@@ -1206,7 +1227,7 @@ aa
aa
aa
aa
aa
ab
aa
aa
aa
@@ -1359,7 +1380,7 @@ aa
aa
aa
aa
aa
ab
aa
aa
aa
@@ -1810,6 +1831,7 @@ aa
aa
aa
aa
ac
aa
aa
aa
@@ -1860,8 +1882,7 @@ aa
aa
aa
aa
aa
aa
ab
aa
aa
aa
@@ -1978,7 +1999,7 @@ aa
aa
aa
aa
aa
ab
aa
aa
aa
@@ -2092,7 +2113,7 @@ aa
aa
aa
aa
ac
aa
aa
aa
aa
@@ -2222,7 +2243,7 @@ aa
aa
aa
aa
ac
aa
aa
aa
aa
@@ -2639,7 +2660,7 @@ aa
aa
aa
aa
ac
aa
aa
aa
aa
@@ -2794,7 +2815,7 @@ aa
aa
aa
aa
ab
aa
aa
aa
aa
@@ -3340,7 +3361,7 @@ aa
aa
aa
aa
aa
ab
aa
aa
aa
@@ -3509,7 +3530,7 @@ aa
aa
aa
aa
ac
aa
aa
aa
aa
@@ -3785,7 +3806,7 @@ aa
aa
aa
aa
ac
aa
aa
aa
aa
@@ -4207,7 +4228,7 @@ aa
aa
aa
aa
ab
aa
aa
aa
aa
@@ -4485,9 +4506,9 @@ aa
aa
aa
aa
ac
aa
aa
Ar
aa
aa
aa
@@ -4647,7 +4668,7 @@ aa
aa
aa
aa
ab
aa
aa
aa
aa
@@ -4793,7 +4814,7 @@ aa
aa
aa
aa
aa
ab
aa
aa
aa
@@ -5209,7 +5230,7 @@ aa
aa
aa
aa
ac
aa
aa
aa
aa
@@ -5361,7 +5382,7 @@ aa
aa
aa
aa
ac
aa
aa
aa
aa
@@ -5498,7 +5519,6 @@ aa
aa
aa
aa
TU
aa
aa
aa
@@ -5508,6 +5528,7 @@ aa
aa
aa
aa
ac
aa
aa
aa
@@ -5644,6 +5665,7 @@ aa
aa
aa
aa
TU
aa
aa
aa
@@ -5653,8 +5675,7 @@ aa
aa
aa
aa
aa
aa
ab
aa
aa
aa
@@ -5908,8 +5929,8 @@ aa
aa
aa
aa
ac
bh
aa
aa
aa
aa
aa
@@ -6034,7 +6055,7 @@ aa
aa
aa
aa
aa
ab
aa
aa
aa
@@ -6631,8 +6652,8 @@ aa
aa
aa
aa
ab
bh
aa
aa
aa
aa
aa
@@ -6754,7 +6775,7 @@ aa
aa
aa
aa
ab
aa
aa
aa
aa
@@ -7035,7 +7056,7 @@ aa
aa
aa
aa
aa
ab
aa
aa
aa
@@ -7190,7 +7211,7 @@ aa
aa
aa
aa
ab
aa
aa
aa
aa
@@ -7348,8 +7369,8 @@ aa
aa
aa
aa
aa
ac
ab
bh
aa
aa
aa
@@ -7483,7 +7504,7 @@ aa
aa
aa
aa
ac
aa
aa
aa
aa
@@ -8065,7 +8086,7 @@ aa
aa
aa
aa
aa
ac
aa
aa
aa
@@ -8170,6 +8191,8 @@ aa
aa
aa
aa
ac
bh
aa
aa
aa
@@ -8198,9 +8221,7 @@ aa
aa
aa
aa
aa
aa
aa
ac
aa
aa
aa
@@ -8468,7 +8489,7 @@ aa
aa
aa
aa
aa
ab
aa
aa
aa
@@ -18732,7 +18753,7 @@ aa
aa
aa
aa
aa
Dr
aa
aa
aa
maps/tether/submaps/gateway/carpfarm.dm
+7
View File
@@ -1,3 +1,10 @@
/obj/effect/overmap/visitable/sector/carpfarm
name = "Unknown Facility"
desc = "Seems to be a carp farm of some sort."
icon_state = "object"
known = FALSE
initial_generic_waypoints = list("tether_excursion_carpfarm")
/area/awaymission/carpfarm
icon_state = "blank"
requires_power = 0
maps/tether/submaps/gateway/carpfarm.dmm
+15 -2
View File
@@ -763,6 +763,19 @@
},
/turf/simulated/floor/airless,
/area/space)
"sI" = (
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
landmark_tag = "tether_excursion_carpfarm";
name = "Outside Facility (SW)"
},
/turf/space,
/area/space)
"Fi" = (
/obj/effect/overmap/visitable/sector/carpfarm,
/turf/space,
/area/space)
(1,1,1) = {"
aa
@@ -1045,7 +1058,7 @@ aa
aa
aa
aa
aa
Fi
aa
"}
(3,1,1) = {"
@@ -4579,7 +4592,7 @@ aa
aa
aa
aa
aa
sI
aa
aa
aa
maps/tether/submaps/gateway/listeningpost.dm
+7
View File
@@ -1,3 +1,10 @@
/obj/effect/overmap/visitable/sector/listeningpost
name = "Unknown Facility"
desc = "High levels of radio frequency emissions."
icon_state = "object"
known = FALSE
initial_generic_waypoints = list("tether_excursion_listeningpost")
/obj/item/weapon/paper/listneningpost/mission
name = "\improper Operation: Watchtower"
info = {"<b>Mission Details</b>: You have been assigned to a newly constructed listening post
maps/tether/submaps/gateway/listeningpost.dmm
+17 -4
View File
@@ -1,11 +1,11 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/space,
/area)
/area/space)
"b" = (
/obj/effect/blocker,
/turf/space,
/area)
/area/space)
"c" = (
/turf/simulated/wall/r_wall,
/area/awaymission/listeningpost)
@@ -309,6 +309,19 @@
},
/turf/simulated/floor/greengrid,
/area/mine/explored)
"W" = (
/obj/effect/overmap/visitable/sector/listeningpost,
/turf/space,
/area/space)
"Y" = (
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
landmark_tag = "tether_excursion_listeningpost";
name = "Near Asteroid (SE)"
},
/turf/space,
/area/space)
(1,1,1) = {"
a
@@ -591,7 +604,7 @@ a
a
a
a
a
W
a
"}
(3,1,1) = {"
@@ -16323,7 +16336,7 @@ a
a
a
a
a
Y
a
a
a
maps/tether/submaps/gateway/snow_outpost.dm
+7
View File
@@ -1,3 +1,10 @@
/obj/effect/overmap/visitable/sector/snowoutpost
name = "Unknown Facility"
desc = "Low surface activity and temperature detected."
icon_state = "globe"
known = FALSE
initial_generic_waypoints = list("tether_excursion_snow_outpost")
// -- Areas -- //
/area/awaymission/snow_outpost
maps/tether/submaps/gateway/snowfield.dm
+8
View File
@@ -1,3 +1,11 @@
/obj/effect/overmap/visitable/sector/snowfield
name = "Unknown Facility"
desc = "Wet, boring, and cold."
icon_state = "globe"
known = FALSE
initial_generic_waypoints = list("tether_excursion_snowfield")
// -- Areas -- //
/area/awaymission/snowfield
maps/tether/submaps/gateway/snowfield.dmm
+23 -3
View File
@@ -107,7 +107,7 @@
input_attempt = 1;
input_level = 250000;
inputting = 1;
output_level = 250000;
output_level = 250000
},
/obj/structure/cable{
icon_state = "0-2";
@@ -1683,6 +1683,26 @@
temperature = 243.15
},
/area/awaymission/snowfield/base)
"tn" = (
/obj/effect/shuttle_landmark{
base_area = /area/awaymission/snowfield/outside;
base_turf = /turf/simulated/floor/outdoors/snow;
landmark_tag = "tether_excursion_snowfield"
},
/turf/simulated/floor/outdoors/snow{
nitrogen = 93.7835;
oxygen = 20.7263;
temperature = 243.15
},
/area/awaymission/snowfield/outside)
"Bw" = (
/obj/effect/overmap/visitable/sector/snowfield,
/turf/simulated/floor/outdoors/snow{
nitrogen = 93.7835;
oxygen = 20.7263;
temperature = 243.15
},
/area/awaymission/snowfield/restricted)
(1,1,1) = {"
aa
@@ -1965,7 +1985,7 @@ ab
ab
ab
ab
ab
Bw
aa
"}
(3,1,1) = {"
@@ -7311,7 +7331,7 @@ ad
ad
ad
ad
ad
tn
ad
ad
ad
maps/tether/submaps/om_ships/hybridshuttle.dm
+49
View File
@@ -0,0 +1,49 @@
// Compile in the map for CI testing if we're testing compileability of all the maps
#if MAP_TEST
#include "hybridshuttle.dmm"
#endif
// Map template for spawning the shuttle
/datum/map_template/om_ships/hybrid
name = "OM Ship - Hybrid Shuttle"
desc = "A prototype human/alien tech hybrid shuttle."
mappath = 'hybridshuttle.dmm'
annihilate = TRUE
// The shuttle's area(s)
/area/shuttle/blue_fo
name = "\improper Hybrid Shuttle"
icon_state = "shuttle2"
requires_power = 1
// The shuttle's 'shuttle' computer
/obj/machinery/computer/shuttle_control/explore/hybridshuttle
name = "short jump console"
shuttle_tag = "XN-29 Prototype Shuttle"
req_one_access = list(access_pilot)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/hybridshuttle
name = "Origin - Hybrid Shuttle"
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_hybridshuttle"
shuttle_type = /datum/shuttle/autodock/overmap/hybridshuttle
// The 'shuttle'
/datum/shuttle/autodock/overmap/hybridshuttle
name = "XN-29 Prototype Shuttle"
current_location = "omship_spawn_hybridshuttle"
docking_controller_tag = "hybrid_shuttle_docker"
shuttle_area = /area/shuttle/blue_fo
fuel_consumption = 0
defer_initialisation = TRUE //We're not loaded until an admin does it
// The 'ship'
/obj/effect/overmap/visitable/ship/landable/hybridshuttle
name = "XN-29 Prototype Shuttle"
desc = "A hybrid excursion shuttle, sporting different features. Less space for equipment, but no fuel or power requirements."
color = "#00aaff" //Bluey
vessel_mass = 3000
vessel_size = SHIP_SIZE_SMALL
shuttle = "XN-29 Prototype Shuttle"
maps/tether/submaps/om_ships/hybridshuttle.dmm
+1173
View File
File diff suppressed because it is too large Load Diff
maps/tether/submaps/om_ships/screebarge.dm
+54
View File
@@ -0,0 +1,54 @@
// Compile in the map for CI testing if we're testing compileability of all the maps
#if MAP_TEST
#include "screebarge.dmm"
#endif
// Map template for spawning the shuttle
/datum/map_template/om_ships/screebarge
name = "OM Ship - Battle Barge"
desc = "The BATTLE BARGE."
mappath = 'screebarge.dmm'
annihilate = TRUE
// The shuttle's area(s)
/area/shuttle/screebarge
icon_state = "shuttle2"
requires_power = 1
/area/shuttle/screebarge/fore
name = "\improper Battle Barge - Fore"
/area/shuttle/screebarge/mid
name = "\improper Battle Barge - Mid"
/area/shuttle/screebarge/aft
name = "\improper Battle Barge - Aft"
// The shuttle's 'shuttle' computer
/obj/machinery/computer/shuttle_control/explore/screebarge
name = "short jump console"
shuttle_tag = "XN-29 Prototype Shuttle"
req_one_access = list(access_pilot)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/screebarge
name = "Origin - Battle Barge"
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_battlebarge"
shuttle_type = /datum/shuttle/autodock/overmap/screebarge
// The 'shuttle'
/datum/shuttle/autodock/overmap/screebarge
name = "Battle Barge"
current_location = "omship_spawn_battlebarge"
docking_controller_tag = "battlebarge_docker"
shuttle_area = list(/area/shuttle/screebarge/fore,/area/shuttle/screebarge/mid,/area/shuttle/screebarge/aft)
fuel_consumption = 0
defer_initialisation = TRUE //We're not loaded until an admin does it
// The 'ship'
/obj/effect/overmap/visitable/ship/landable/screebarge
name = "Battle Barge"
desc = "Some sort of makeshift battle barge. Appears to be armed."
color = "#95c633" //Greenish
vessel_mass = 3000
vessel_size = SHIP_SIZE_SMALL
shuttle = "Battle Barge"
maps/tether/submaps/om_ships/screebarge.dmm
+1120
View File
File diff suppressed because it is too large Load Diff
maps/tether/submaps/space/_debrisfield.dm
+5 -12
View File
@@ -1,21 +1,14 @@
// -- Datums -- //
/datum/shuttle_destination/excursion/debrisfield
/obj/effect/overmap/visitable/sector/debrisfield
name = "Debris Field"
my_landmark = "tether_excursion_debrisfield"
preferred_interim_tag = "tether_excursion_transit_space"
skip_me = TRUE
routes_to_make = list(
/datum/shuttle_destination/excursion/virgo3b_orbit = 30 SECONDS
)
desc = "Space junk galore."
icon_state = "dust1"
known = FALSE
initial_generic_waypoints = list("tether_excursion_debrisfield")
// -- Objs -- //
/obj/shuttle_connector/debrisfield
name = "shuttle connector - debrisfield"
shuttle_name = "Excursion Shuttle"
destinations = list(/datum/shuttle_destination/excursion/debrisfield)
/obj/effect/step_trigger/teleporter/debrisfield_loop/north/New()
..()
maps/tether/submaps/space/debrisfield.dmm
+1 -1
View File
@@ -6,7 +6,7 @@
/turf/space,
/area/tether_away/debrisfield/explored)
"c" = (
/obj/shuttle_connector/debrisfield,
/obj/effect/overmap/visitable/sector/debrisfield,
/turf/space,
/area/tether_away/debrisfield/explored)
"e" = (
maps/tether/submaps/tether_misc.dmm
+6161 -7358
View File
File diff suppressed because it is too large Load Diff
maps/tether/submaps/tether_ships.dmm
+3029 -2749
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-01-surface1.dmm
+17 -17
View File
@@ -35669,12 +35669,12 @@ aah
aah
auK
aAt
aBv
aBv
aBv
aBv
aBv
aBv
auK
auK
auK
auK
auK
auK
aah
aah
aah
@@ -35811,7 +35811,7 @@ aah
aah
auK
aAu
aBv
auK
aah
aah
aah
@@ -35953,7 +35953,7 @@ aah
aah
auK
aAu
aBv
auK
aah
aah
aah
@@ -36095,7 +36095,7 @@ aah
aah
auK
abB
aBv
auK
aah
aah
aah
@@ -36237,7 +36237,7 @@ aah
aah
auK
aAu
aBv
auK
aah
aah
aah
@@ -36379,7 +36379,7 @@ aah
aah
auK
aAv
aBv
auK
aah
aah
aah
@@ -36521,7 +36521,7 @@ agv
agv
azs
aAw
aBv
auK
aah
aah
aah
@@ -36663,7 +36663,7 @@ aip
aiJ
azs
aaT
aBv
auK
aah
aah
aah
@@ -36805,7 +36805,7 @@ ais
aiK
azs
aAu
aBv
auK
aah
aah
aah
@@ -36947,7 +36947,7 @@ aiH
aiL
azs
aAw
aBv
auK
aah
aah
aah
@@ -37089,7 +37089,7 @@ aiI
aiM
azs
aAu
aBv
auK
aah
aah
aah
@@ -37231,7 +37231,7 @@ agv
agv
azs
aAx
aBv
auK
aBv
aBv
aBv
maps/tether/tether-03-surface3.dmm
+955 -108
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-05-station1.dmm
+152 -133
View File
@@ -37,16 +37,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos/backup)
"aaf" = (
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
docking_controller = null;
landmark_tag = "tether_excursion_nearby";
name = "Nearby Tether"
},
/turf/space,
/area/space)
"aag" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'RADIOACTIVE AREA'";
@@ -7048,7 +7038,7 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1380;
master_tag = "tether_dock";
master_tag = "dock_d2a1";
name = "interior access button";
pixel_x = -28;
pixel_y = 26;
@@ -7514,16 +7504,6 @@
/obj/structure/flora/ausbushes/brflowers,
/turf/simulated/floor/grass,
/area/hallway/station/atrium)
"amK" = (
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
docking_controller = "specops_dock";
landmark_tag = "specops_tether";
name = "Tether Docking Arm"
},
/turf/space,
/area/space)
"amL" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -14118,9 +14098,9 @@
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
docking_controller = "d1a2_dock";
landmark_tag = "tether_excursion_dockarm";
name = "Tether Docking Arm"
docking_controller = "dock_d1a2";
landmark_tag = "tether_dockarm_d1a2";
name = "Tether Dock D1A2"
},
/turf/space,
/area/space)
@@ -15947,7 +15927,7 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1380;
master_tag = "trade_shuttle_dock_airlock";
master_tag = "dock_d1l";
name = "interior access button";
pixel_x = -28;
pixel_y = -26;
@@ -16302,7 +16282,7 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
frequency = 1380;
id_tag = "trade_shuttle_dock_pump"
id_tag = "dock_d1l_pump"
},
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_one)
@@ -17726,7 +17706,7 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1380;
master_tag = "tether_dock";
master_tag = "dock_d1a3";
name = "interior access button";
pixel_x = 28;
pixel_y = 26;
@@ -18765,9 +18745,9 @@
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
docking_controller = "trade_shuttle_dock_airlock";
landmark_tag = "trade_station";
name = "Tether Docking Arm"
docking_controller = "dock_d1l";
landmark_tag = "tether_dockarm_d1l";
name = "Tether Dock D1L"
},
/turf/space,
/area/space)
@@ -22036,9 +22016,9 @@
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
docking_controller = "tether_dock_airlock";
landmark_tag = "tether_backup_high";
name = "Tether Docking Arm"
docking_controller = "dock_d1a3";
landmark_tag = "tether_dockarm_d1a3";
name = "Tether Dock D1A3"
},
/turf/space,
/area/space)
@@ -22210,7 +22190,7 @@
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1380;
master_tag = "d1a2_dock";
master_tag = "dock_d1a2";
name = "exterior access button";
pixel_x = -5;
pixel_y = -26;
@@ -22219,7 +22199,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "d1a2_dock_outer";
id_tag = "dock_d1a2_outer";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22229,7 +22209,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "d1a2_dock_inner";
id_tag = "dock_d1a2_inner";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22242,25 +22222,25 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
frequency = 1380;
id_tag = "d1a2_dock_pump"
id_tag = "dock_d1a2_pump"
},
/obj/machinery/light/small,
/obj/machinery/airlock_sensor{
frequency = 1380;
id_tag = "d1a2_dock_sensor";
id_tag = "dock_d1a2_sensor";
pixel_x = 0;
pixel_y = -25
},
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
id_tag = "d1a2_dock";
id_tag = "dock_d1a2";
pixel_x = 0;
pixel_y = 30;
req_one_access = list(13);
tag_airpump = "d1a2_dock_pump";
tag_chamber_sensor = "d1a2_dock_sensor";
tag_exterior_door = "d1a2_dock_outer";
tag_interior_door = "d1a2_dock_inner"
tag_airpump = "dock_d1a2_pump";
tag_chamber_sensor = "dock_d1a2_sensor";
tag_exterior_door = "dock_d1a2_outer";
tag_interior_door = "dock_d1a2_inner"
},
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_one)
@@ -22268,7 +22248,7 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1380;
master_tag = "d1a2_dock";
master_tag = "dock_d1a2";
name = "interior access button";
pixel_x = -28;
pixel_y = 26;
@@ -22297,14 +22277,14 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "specops_dock_outer";
id_tag = "dock_d2a2_outer";
locked = 1;
name = "Docking Port Airlock"
},
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1380;
master_tag = "specops_dock";
master_tag = "dock_d2a2";
name = "exterior access button";
pixel_x = -5;
pixel_y = -26;
@@ -22316,7 +22296,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "specops_dock_inner";
id_tag = "dock_d2a2_inner";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22329,23 +22309,23 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
frequency = 1380;
id_tag = "specops_dock_pump"
id_tag = "dock_d2a2_pump"
},
/obj/machinery/light/small,
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
id_tag = "specops_dock";
id_tag = "dock_d2a2";
pixel_x = 0;
pixel_y = 30;
req_one_access = list(13);
tag_airpump = null;
tag_chamber_sensor = null;
tag_exterior_door = null;
tag_interior_door = null
tag_airpump = "dock_d2a2_pump";
tag_chamber_sensor = "dock_d2a2_sensor";
tag_exterior_door = "dock_d2a2_outer";
tag_interior_door = "dock_d2a2_inner"
},
/obj/machinery/airlock_sensor{
frequency = 1380;
id_tag = "specops_dock_sensor";
id_tag = "dock_d2a2_sensor";
pixel_x = 0;
pixel_y = -25
},
@@ -22362,7 +22342,7 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1380;
master_tag = "specops_dock";
master_tag = "dock_d2a2";
name = "interior access button";
pixel_x = -28;
pixel_y = 26;
@@ -22455,7 +22435,7 @@
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1380;
master_tag = "d1a1_dock";
master_tag = "dock_d1a1";
name = "exterior access button";
pixel_x = -5;
pixel_y = -26;
@@ -22464,7 +22444,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "d1a1_dock_outer";
id_tag = "dock_d1a1_outer";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22477,7 +22457,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "d1a1_dock_inner";
id_tag = "dock_d1a1_inner";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22487,25 +22467,25 @@
/obj/machinery/light/small,
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
id_tag = "d1a1_dock";
id_tag = "dock_d1a1";
pixel_x = 0;
pixel_y = 30;
req_one_access = list(13);
tag_airpump = "d1a1_dock_pump";
tag_chamber_sensor = "d1a1_dock_sensor";
tag_exterior_door = "d1a1_dock_outer";
tag_interior_door = "d1a1_dock_inner"
tag_airpump = "dock_d1a1_pump";
tag_chamber_sensor = "dock_d1a1_sensor";
tag_exterior_door = "dock_d1a1_outer";
tag_interior_door = "dock_d1a1_inner"
},
/obj/machinery/airlock_sensor{
frequency = 1380;
id_tag = "d1a1_dock_sensor";
id_tag = "dock_d1a1_sensor";
pixel_x = 0;
pixel_y = -25
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
frequency = 1380;
id_tag = "d1a1_dock_pump"
id_tag = "dock_d1a1_pump"
},
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_one)
@@ -22513,7 +22493,7 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1380;
master_tag = "d1a1_dock";
master_tag = "dock_d1a1";
name = "interior access button";
pixel_x = -28;
pixel_y = 26;
@@ -22529,7 +22509,7 @@
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1380;
master_tag = "d2a1_dock";
master_tag = "dock_d2a1";
name = "exterior access button";
pixel_x = -5;
pixel_y = -26;
@@ -22538,7 +22518,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "d2a1_dock_outer";
id_tag = "dock_d2a1_outer";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22548,7 +22528,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "d2a1_dock_inner";
id_tag = "dock_d2a1_inner";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22561,25 +22541,25 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
frequency = 1380;
id_tag = "d2a1_dock_pump"
id_tag = "dock_d2a1_pump"
},
/obj/machinery/light/small,
/obj/machinery/airlock_sensor{
frequency = 1380;
id_tag = "d2a1_dock_sensor";
id_tag = "dock_d2a1_sensor";
pixel_x = 0;
pixel_y = -25
},
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
id_tag = "d2a1_dock_airlock";
id_tag = "dock_d2a1";
pixel_x = 0;
pixel_y = 30;
req_one_access = list(13);
tag_airpump = "d2a1_dock_pump";
tag_chamber_sensor = "d2a1_dock_sensor";
tag_exterior_door = "d2a1_dock_outer";
tag_interior_door = "d2a1_dock_inner"
tag_airpump = "dock_d2a1_pump";
tag_chamber_sensor = "dock_d2a1_sensor";
tag_exterior_door = "dock_d2a1_outer";
tag_interior_door = "dock_d2a1_inner"
},
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_two)
@@ -22631,7 +22611,7 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1380;
master_tag = "nuke_shuttle_dock";
master_tag = "dock_d2l";
name = "interior access button";
pixel_x = 26;
pixel_y = -26;
@@ -22644,7 +22624,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "trade_shuttle_dock_inner";
id_tag = "dock_d1l_inner";
locked = 1;
name = "Dock One Internal Access"
},
@@ -22654,7 +22634,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "trade_shuttle_dock_inner";
id_tag = "dock_d1l_inner";
locked = 1;
name = "Dock One Internal Access"
},
@@ -22668,7 +22648,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "nuke_shuttle_dock_inner";
id_tag = "dock_d2l_inner";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22679,7 +22659,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "nuke_shuttle_dock_inner";
id_tag = "dock_d2l_inner";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22695,14 +22675,14 @@
},
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
id_tag = "trade_shuttle_dock_airlock";
id_tag = "dock_d1l";
pixel_x = 28;
pixel_y = 0;
req_one_access = list(13);
tag_airpump = "trade_shuttle_dock_pump";
tag_chamber_sensor = "trade_shuttle_dock_sensor";
tag_exterior_door = "trade_shuttle_dock_outer";
tag_interior_door = "trade_shuttle_dock_inner"
tag_airpump = "dock_d1l_pump";
tag_chamber_sensor = "dock_d1l_sensor";
tag_exterior_door = "dock_d1l_outer";
tag_interior_door = "dock_d1l_inner"
},
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_one)
@@ -22722,14 +22702,14 @@
"bQk" = (
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
id_tag = "nuke_shuttle_dock";
id_tag = "dock_d2l";
pixel_x = -28;
pixel_y = 0;
req_one_access = list(13);
tag_airpump = null;
tag_chamber_sensor = null;
tag_exterior_door = null;
tag_interior_door = null
tag_airpump = "dock_d2l_pump";
tag_chamber_sensor = "dock_d2l_sensor";
tag_exterior_door = "dock_d2l_outer";
tag_interior_door = "dock_d2l_inner"
},
/obj/effect/floor_decal/industrial/warning{
dir = 9
@@ -22760,11 +22740,11 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
frequency = 1380;
id_tag = "trade_shuttle_dock_pump"
id_tag = "dock_d1l_pump"
},
/obj/machinery/airlock_sensor{
frequency = 1380;
id_tag = "trade_shuttle_dock_sensor";
id_tag = "dock_d1l_sensor";
pixel_x = 30;
pixel_y = 8
},
@@ -22774,11 +22754,11 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
frequency = 1380;
id_tag = "nuke_shuttle_dock_pump"
id_tag = "dock_d2l_pump"
},
/obj/machinery/airlock_sensor{
frequency = 1380;
id_tag = "nuke_shuttle_dock_sensor";
id_tag = "dock_d2l_sensor";
pixel_x = -30;
pixel_y = 8
},
@@ -22791,7 +22771,7 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
frequency = 1380;
id_tag = "nuke_shuttle_dock_pump"
id_tag = "dock_d2l_pump"
},
/obj/effect/floor_decal/industrial/warning{
dir = 6
@@ -22819,7 +22799,7 @@
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1380;
master_tag = "trade_shuttle_dock_airlock";
master_tag = "dock_d1l";
name = "exterior access button";
pixel_x = 28;
pixel_y = -6;
@@ -22828,7 +22808,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "trade_shuttle_dock_outer";
id_tag = "dock_d1l_outer";
locked = 1;
name = "Dock One External Access"
},
@@ -22838,7 +22818,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "trade_shuttle_dock_outer";
id_tag = "dock_d1l_outer";
locked = 1;
name = "Dock One External Access"
},
@@ -22848,14 +22828,14 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "nuke_shuttle_dock_outer";
id_tag = "dock_d2l_outer";
locked = 1;
name = "Docking Port Airlock"
},
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1380;
master_tag = "nuke_shuttle_dock";
master_tag = "dock_d2l";
name = "exterior access button";
pixel_x = -28;
pixel_y = -6;
@@ -22884,7 +22864,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "nuke_shuttle_dock_outer";
id_tag = "dock_d2l_outer";
locked = 1;
name = "Docking Port Airlock"
},
@@ -23005,9 +22985,9 @@
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
docking_controller = "nuke_shuttle_dock_airlock";
landmark_tag = "merc_tether_dock";
name = "Tether Docking Arm"
docking_controller = "dock_d2l";
landmark_tag = "tether_dockarm_d2l";
name = "Tether Dock D2L"
},
/turf/space,
/area/space)
@@ -23177,6 +23157,15 @@
},
/turf/simulated/floor/plating,
/area/tether/station/dock_two)
"cwR" = (
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
landmark_tag = "tether_space_NE";
name = "Near Tether (NE)"
},
/turf/space,
/area/space)
"dlV" = (
/obj/machinery/door/firedoor/glass,
/obj/structure/grille,
@@ -23222,7 +23211,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "tether_dock_inner";
id_tag = "dock_d1a3_inner";
locked = 1;
name = "Docking Port Airlock"
},
@@ -23253,25 +23242,25 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 8;
frequency = 1380;
id_tag = "tether_dock_pump"
id_tag = "dock_d1a3_pump"
},
/obj/machinery/light/small,
/obj/machinery/airlock_sensor{
frequency = 1380;
id_tag = "tether_dock_sensor";
id_tag = "dock_d1a3_sensor";
pixel_x = 0;
pixel_y = -25
},
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
id_tag = "tether_dock_airlock";
id_tag = "dock_d1a3";
pixel_x = 0;
pixel_y = 30;
req_one_access = list(13);
tag_airpump = "tether_dock_pump";
tag_chamber_sensor = "tether_dock_sensor";
tag_exterior_door = "tether_dock_outer";
tag_interior_door = "tether_dock_inner"
tag_airpump = "dock_d1a3_pump";
tag_chamber_sensor = "dock_d1a3_sensor";
tag_exterior_door = "dock_d1a3_outer";
tag_interior_door = "dock_d1a3_inner"
},
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_one)
@@ -23287,6 +23276,15 @@
},
/turf/simulated/floor/plating,
/area/tether/station/dock_one)
"mnt" = (
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
landmark_tag = "tether_space_SW";
name = "Near Tether (SW)"
},
/turf/space,
/area/space)
"mNU" = (
/obj/machinery/door/firedoor/glass,
/obj/structure/grille,
@@ -23307,6 +23305,16 @@
/obj/random/tech_supply,
/turf/simulated/floor,
/area/engineering/shaft)
"odO" = (
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
docking_controller = "dock_d1a1";
landmark_tag = "tether_dockarm_d1a1";
name = "Tether Dock D1A1"
},
/turf/space,
/area/space)
"oEH" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
@@ -23314,6 +23322,16 @@
/obj/machinery/light,
/turf/simulated/floor/tiled,
/area/hallway/station/docks)
"pQN" = (
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
docking_controller = "dock_d2a2";
landmark_tag = "tether_dockarm_d2a2";
name = "Tether Dock D2A2"
},
/turf/space,
/area/space)
"qBc" = (
/obj/structure/disposalpipe/junction{
dir = 1;
@@ -23328,20 +23346,11 @@
},
/turf/simulated/floor/tiled,
/area/tether/station/dock_one)
"ssv" = (
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
landmark_tag = "skipjack_outside";
name = "Skipjack Near Tether"
},
/turf/space,
/area/space)
"tKI" = (
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1380;
master_tag = "tether_dock";
master_tag = "dock_d1a3";
name = "exterior access button";
pixel_x = -5;
pixel_y = -26;
@@ -23350,7 +23359,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "tether_dock_outer";
id_tag = "dock_d1a3_outer";
locked = 1;
name = "Docking Port Airlock"
},
@@ -23366,6 +23375,16 @@
/obj/structure/window/reinforced,
/turf/simulated/floor/plating,
/area/tether/station/dock_one)
"vmt" = (
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
docking_controller = "dock_d2a1";
landmark_tag = "tether_dockarm_d2a1";
name = "Tether Dock D2A1"
},
/turf/space,
/area/space)
"vyI" = (
/mob/living/simple_mob/animal/passive/bird/parrot/poly,
/turf/simulated/floor/outdoors/grass/forest,
@@ -28043,7 +28062,7 @@ aaa
aaa
aaa
aaa
aaa
odO
aaa
aaa
aaa
@@ -30875,6 +30894,7 @@ aaa
aaa
aaa
aaa
pQN
aaa
aaa
aaa
@@ -30882,8 +30902,7 @@ aaa
aaa
aaa
aaa
aaa
aaa
vmt
aaa
aaa
aaa
@@ -31017,7 +31036,7 @@ aaa
aaa
aaa
aaa
amK
aaa
aaa
aaa
aaa
@@ -31453,7 +31472,7 @@ aIA
bXl
bPx
bXl
aCF
aCK
aCK
aaa
aaa
@@ -34635,7 +34654,7 @@ aaa
aaa
aaa
aaa
aaf
aaa
aaa
aaa
aaa
@@ -39278,7 +39297,7 @@ aaa
aaa
aaa
aaa
aaa
mnt
aaa
aaa
aaa
@@ -39751,7 +39770,7 @@ aaa
aaa
aaa
aaa
aaa
cwR
aaa
aaa
aaa
@@ -40888,7 +40907,7 @@ aaa
aaa
aaa
aaa
ssv
aaa
aaa
aaa
aaa
maps/tether/tether-07-station3.dmm
+436 -321
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-08-mining.dmm
+146 -140
View File
@@ -11,9 +11,6 @@
"ad" = (
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/shuttle/tether/crash2)
"ae" = (
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/shuttle/antag_ground)
"af" = (
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
@@ -1059,6 +1056,15 @@
},
/turf/simulated/floor/bluegrid,
/area/outpost/mining_main/airlock)
"Ck" = (
/obj/effect/shuttle_landmark{
base_area = /area/mine/explored;
base_turf = /turf/simulated/floor/outdoors/grass/sif/virgo3b;
landmark_tag = "tether_mine_nw";
name = "Tether Mine (NW)"
},
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/mine/explored)
"Cx" = (
/turf/simulated/mineral/floor/virgo3b{
color = "#AAAAAA"
@@ -2978,7 +2984,7 @@ aa
ab
ab
ab
ab
Ck
ab
ab
ab
@@ -4423,9 +4429,9 @@ ab
ab
ab
ab
ac
ac
ac
ab
ab
ab
ab
ab
ab
@@ -4565,10 +4571,10 @@ ab
ab
ab
ab
ac
ac
ac
ac
ab
ab
ab
ab
ac
ac
ac
@@ -4707,9 +4713,9 @@ ab
ab
ab
ab
ac
ac
ac
ab
ab
ab
ac
ac
ac
@@ -4849,9 +4855,9 @@ ab
ab
ab
ab
ac
ac
ac
ab
ab
ab
ac
ac
ac
@@ -4991,9 +4997,9 @@ ab
ab
ab
ab
ac
ac
ac
ab
ab
ab
ac
ac
ac
@@ -5128,14 +5134,14 @@ ab
ab
ab
ab
ac
ac
ac
ac
ac
ac
ac
ac
ab
ab
ab
ab
ab
ab
ab
ab
ac
ac
ac
@@ -5270,14 +5276,14 @@ ab
ab
ab
ab
ac
ac
ac
ac
ac
ac
ac
ac
ab
ab
ab
ab
ab
ab
ab
ab
ac
ac
ac
@@ -5412,10 +5418,10 @@ ab
ab
ab
ab
ac
ac
ac
ac
ab
ab
ab
ab
ac
ac
ac
@@ -5551,12 +5557,12 @@ ab
ab
ab
ab
ac
ac
ac
ac
ac
ac
ab
ab
ab
ab
ab
ab
ac
ac
ac
@@ -5693,11 +5699,11 @@ ab
ab
ab
ab
ac
ac
ac
ac
ac
ab
ab
ab
ab
ab
ac
ac
ac
@@ -5832,14 +5838,14 @@ ab
ab
ab
ab
ac
ac
ac
ac
ac
ac
ac
ac
ab
ab
ab
ab
ab
ab
ab
ab
ac
ac
ac
@@ -5974,12 +5980,12 @@ ab
ab
ab
ab
ac
ac
ac
ac
ac
ac
ab
ab
ab
ab
ab
ab
ac
ac
ac
@@ -6115,12 +6121,12 @@ ab
ab
ab
ab
ac
ac
ac
ac
ac
ac
ab
ab
ab
ab
ab
ab
ac
ac
ac
@@ -6257,12 +6263,12 @@ ab
ab
ab
ab
ac
ac
ac
ac
ac
ac
ab
ab
ab
ab
ab
ab
ac
ac
ac
@@ -6399,10 +6405,10 @@ ab
ab
ab
ab
ac
ac
ac
ac
ab
ab
ab
ab
ac
ac
ac
@@ -6541,9 +6547,9 @@ ab
ab
ab
ab
ac
ac
ac
ab
ab
ab
ac
ac
ac
@@ -6684,8 +6690,8 @@ ab
ab
ab
ab
ac
ac
ab
ab
ac
ac
ac
@@ -6826,8 +6832,8 @@ ab
ab
ab
ab
ac
ac
ab
ab
ac
ac
ac
@@ -6968,8 +6974,8 @@ ab
ab
ab
ab
ac
ac
ab
ab
ac
ac
ac
@@ -18091,16 +18097,16 @@ ab
ab
ab
ab
ae
ae
ae
ae
ae
ae
ae
ae
ae
ae
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
@@ -18233,16 +18239,16 @@ ab
ab
ab
ab
ae
ae
ae
ae
ae
ae
ae
ae
ae
ae
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
@@ -18375,16 +18381,16 @@ ab
ab
ab
ab
ae
ae
ae
ae
ae
ae
ae
ae
ae
ae
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
@@ -18517,16 +18523,16 @@ ab
ab
ab
ab
ae
ae
ae
ae
ae
ae
ae
ae
ae
ae
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
@@ -18659,16 +18665,16 @@ ab
ab
ab
ab
ae
ae
ae
ae
ae
ae
ae
ae
ae
ae
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
maps/tether/tether-09-solars.dmm
+71 -65
View File
@@ -5,9 +5,6 @@
"ab" = (
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/mine/explored)
"ac" = (
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/shuttle/antag_ground)
"ad" = (
/turf/simulated/floor/outdoors/dirt/virgo3b,
/area/mine/explored)
@@ -846,15 +843,6 @@
"bN" = (
/turf/simulated/floor/outdoors/dirt/virgo3b,
/area/shuttle/tether/crash1)
"bO" = (
/obj/effect/shuttle_landmark{
base_area = /area/mine/explored;
base_turf = /turf/simulated/floor/outdoors/dirt/virgo3b;
landmark_tag = "merc_tether_solars";
name = "Tether Solar Farm"
},
/turf/simulated/floor/outdoors/dirt/virgo3b,
/area/mine/explored)
"bP" = (
/obj/structure/symbol/em,
/turf/simulated/wall,
@@ -8185,6 +8173,24 @@
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/breakroom)
"zg" = (
/obj/effect/shuttle_landmark{
base_area = /area/mine/explored;
base_turf = /turf/simulated/floor/outdoors/dirt/virgo3b;
landmark_tag = "tether_solars_sw";
name = "Tether Solar Farm (SW)"
},
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/mine/explored)
"SO" = (
/obj/effect/shuttle_landmark{
base_area = /area/mine/explored;
base_turf = /turf/simulated/floor/outdoors/dirt/virgo3b;
landmark_tag = "tether_solars_ne";
name = "Tether Solar Farm (NE)"
},
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/mine/explored)
(1,1,1) = {"
aa
@@ -10616,16 +10622,16 @@ ab
ab
ab
ab
ac
ac
ac
ac
ac
ac
ac
ac
ac
ac
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
@@ -10758,16 +10764,16 @@ ab
ab
ab
ab
ac
ac
ac
ac
ac
ac
ac
ac
ac
ac
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
@@ -10900,16 +10906,16 @@ ab
ab
ab
ab
ac
ac
ac
ac
ac
ac
ac
ac
ac
ac
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
@@ -11042,16 +11048,16 @@ ab
ab
ab
ab
ac
ac
ac
ac
ac
ac
ac
ac
ac
ac
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
@@ -11145,7 +11151,7 @@ ab
ab
ab
ab
ab
zg
ab
ab
ab
@@ -11184,16 +11190,16 @@ ab
ab
ab
ab
ac
ac
ac
ac
ac
ac
ac
ac
ac
ac
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
ab
@@ -22125,7 +22131,7 @@ ab
ab
ad
ad
bO
ad
ad
ad
ad
@@ -23113,7 +23119,7 @@ ab
ab
ab
ab
ab
SO
ab
ab
ab
maps/tether/tether-10-colony.dmm
+1654 -1579
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether_areas2.dm
+22 -15
View File
@@ -884,14 +884,31 @@
name = "\improper Exploration Showers"
/area/shuttle/excursion
name = "\improper Excursion Shuttle"
icon_state = "shuttle2"
requires_power = 1
icon_state = "shuttle2"
/area/shuttle/blue_fo
name = "\improper Hybrid Shuttle"
icon_state = "shuttle2"
/area/shuttle/excursion/general
name = "\improper Excursion Shuttle"
/area/shuttle/excursion/cockpit
name = "\improper Excursion Shuttle Cockpit"
/area/shuttle/excursion/cargo
name = "\improper Excursion Shuttle Cockpit"
/area/shuttle/tourbus
requires_power = 1
icon_state = "shuttle2"
/area/shuttle/tourbus/general
name = "\improper Tour Bus"
/area/shuttle/tourbus/cockpit
name = "\improper Tour Bus Cockpit"
/area/shuttle/tourbus/engines
name = "\improper Tour Bus Engines"
// Belter Dock
@@ -919,16 +936,6 @@
requires_power = 0
dynamic_lighting = 0
//Antag space shuttle
/area/shuttle/antag_space
name = "\improper Syndicate PS"
icon_state = "shuttle2"
//Antag ground 'shuttle'
/area/shuttle/antag_ground
name = "\improper Syndicate LC"
icon_state = "shuttle2"
//Merc shuttle
/area/shuttle/mercenary
name = "\improper Mercenary Shuttle"
maps/tether/tether_defines.dm
+31 -41
View File
@@ -37,6 +37,10 @@
full_name = "NSB Adephagia"
path = "tether"
use_overmap = TRUE
overmap_z = Z_LEVEL_MISC
overmap_size = 20
zlevel_datum_type = /datum/map_z_level/tether
lobby_icon = 'icons/misc/title_vr.dmi'
@@ -107,6 +111,8 @@
meteor_strike_areas = list(/area/tether/surfacebase/outside/outside3)
default_skybox = /datum/skybox_settings/tether
unit_test_exempt_areas = list(
/area/tether/surfacebase/outside/outside1,
/area/tether/elevator,
@@ -181,6 +187,10 @@
return 1
/datum/skybox_settings/tether
icon_state = "space5"
use_stars = FALSE
/datum/planet/virgo3b
expected_z_levels = list(
Z_LEVEL_SURFACE_LOW,
@@ -218,6 +228,27 @@
else
return list(srcz) //prevents runtimes when using CMC. any Z-level not defined above will be 'isolated' and only show to GPSes/CMCs on that same Z (e.g. CentCom).
// Overmap represetation of tether
/obj/effect/overmap/visitable/sector/virgo3b
name = "Virgo 3B"
desc = "Full of phoron, and home to the NSB Adephagia, where you can dock and refuel your craft."
base = 1
icon_state = "globe"
color = "#d35b5b"
initial_generic_waypoints = list(
"tether_dockarm_d1a1", //Bottom left,
"tether_dockarm_d1a2", //Top left,
"tether_dockarm_d1a3", //Left on inside,
"tether_dockarm_d2a1", //Bottom right,
"tether_dockarm_d2a2", //Top right,
"tether_dockarm_d1l", //End of left arm,
"tether_dockarm_d2l", //End of right arm,
"tether_space_SE", //station1, bottom right of space,
"tether_space_NE", //station1, top right of space,
"tether_space_SW", //station3, bottom left of space,
"tether_excursion_hangar" //Excursion shuttle hangar
)
// For making the 6-in-1 holomap, we calculate some offsets
#define TETHER_MAP_SIZE 140 // Width and height of compiled in tether z levels.
#define TETHER_HOLOMAP_CENTER_GUTTER 40 // 40px central gutter between columns
@@ -304,44 +335,3 @@
z = Z_LEVEL_MISC
name = "Misc"
flags = MAP_LEVEL_ADMIN|MAP_LEVEL_XENOARCH_EXEMPT
/*
/datum/map_z_level/tether/wilderness
name = "Wilderness"
flags = MAP_LEVEL_PLAYER
var/activated = 0
var/list/frozen_mobs = list()
/datum/map_z_level/tether/wilderness/proc/activate_mobs()
if(activated && isemptylist(frozen_mobs))
return
activated = 1
for(var/mob/living/simple_mob/M in frozen_mobs)
M.life_disabled = 0
frozen_mobs -= M
frozen_mobs.Cut()
/datum/map_z_level/tether/wilderness/wild_1
z = Z_LEVEL_SURFACE_WILDERNESS_1
/datum/map_z_level/tether/wilderness/wild_2
z = Z_LEVEL_SURFACE_WILDERNESS_2
/datum/map_z_level/tether/wilderness/wild_3
z = Z_LEVEL_SURFACE_WILDERNESS_3
/datum/map_z_level/tether/wilderness/wild_4
z = Z_LEVEL_SURFACE_WILDERNESS_4
/datum/map_z_level/tether/wilderness/wild_5
z = Z_LEVEL_SURFACE_WILDERNESS_5
/datum/map_z_level/tether/wilderness/wild_6
z = Z_LEVEL_SURFACE_WILDERNESS_6
/datum/map_z_level/tether/wilderness/wild_crash
z = Z_LEVEL_SURFACE_WILDERNESS_CRASH
/datum/map_z_level/tether/wilderness/wild_ruins
z = Z_LEVEL_SURFACE_WILDERNESS_RUINS
*/
maps/tether/tether_shuttle_defs.dm
+110 -58
View File
@@ -8,9 +8,6 @@
landmark_offsite = "escape_cc"
landmark_station = "escape_station"
landmark_transition = "escape_transit"
//docking_controller_tag = "escape_shuttle"
//dock_target_station = "escape_dock"
//dock_target_offsite = "centcom_dock"
move_time = SHUTTLE_TRANSIT_DURATION_RETURN
//////////////////////////////////////////////////////////////
@@ -23,8 +20,6 @@
landmark_offsite = "escapepod1_cc"
landmark_transition = "escapepod1_transit"
docking_controller_tag = "large_escape_pod_1"
//dock_target_station = "large_escape_pod_1_berth"
//dock_target_offsite = "large_escape_pod_1_recovery"
move_time = SHUTTLE_TRANSIT_DURATION_RETURN
//////////////////////////////////////////////////////////////
@@ -37,21 +32,24 @@
landmark_offsite = "supply_cc"
landmark_station = "supply_station"
docking_controller_tag = "supply_shuttle"
//dock_target_station = "cargo_bay"
flags = SHUTTLE_FLAGS_PROCESS|SHUTTLE_FLAGS_SUPPLY
//////////////////////////////////////////////////////////////
// Trade Ship
/datum/shuttle/autodock/ferry/trade
/datum/shuttle/autodock/multi/trade
name = "Trade"
location = FERRY_LOCATION_OFFSITE
current_location = "trade_dock"
shuttle_area = /area/shuttle/trade
warmup_time = 10 //want some warmup time so people can cancel.
landmark_offsite = "trade_cc"
landmark_station = "trade_station"
docking_controller_tag = "trade_shuttle"
//dock_target_station = "trade_shuttle_dock_airlock"
//dock_target_offsite = "trade_shuttle_bay"
warmup_time = 10 //want some warmup time so people can cancel.
destination_tags = list(
"trade_dock",
"tether_dockarm_d1l",
"aerostat_south",
"beach_e",
"beach_c",
"beach_nw"
)
//////////////////////////////////////////////////////////////
// Tether Shuttle
@@ -61,48 +59,11 @@
warmup_time = 5
move_time = 45
landmark_offsite = "tether_backup_low"
landmark_station = "tether_backup_high"
landmark_station = "tether_dockarm_d1a3"
landmark_transition = "tether_backup_transit"
shuttle_area = /area/shuttle/tether
//crash_areas = list(/area/shuttle/tether/crash1, /area/shuttle/tether/crash2)
docking_controller_tag = "tether_shuttle"
//dock_target_station = "tether_dock_airlock"
//dock_target_offsite = "tether_pad_airlock"
//////////////////////////////////////////////////////////////
// Antag Space "Proto Shuttle" Shuttle
/datum/shuttle/autodock/multi/protoshuttle
name = "Proto"
warmup_time = 8
move_time = 60
current_location = "antag_space_base"
shuttle_area = /area/shuttle/antag_space
landmark_transition = "antag_space_transit"
destination_tags = list(
"antag_space_nearby",
"antag_space_docks"
//"Nearby" = /area/shuttle/antag_space/north,
//"Docks" = /area/shuttle/antag_space/docks
)
docking_controller_tag = "antag_space_shuttle"
//destination_dock_targets = list("Home Base" = "antag_space_dock")
//////////////////////////////////////////////////////////////
// Antag Surface "Land Crawler" Shuttle
/datum/shuttle/autodock/multi/landcrawler
name = "Land Crawler"
warmup_time = 8
move_time = 60
current_location = "antag_ground_base"
shuttle_area = /area/shuttle/antag_ground
landmark_transition = "antag_ground_transit"
destination_tags = list(
"antag_ground_solars",
"antag_ground_mining"
//"Solar Array" = /area/shuttle/antag_ground/solars,
//"Mining Outpost" = /area/shuttle/antag_ground/mining
)
docking_controller_tag = "antag_ground_shuttle"
//////////////////////////////////////////////////////////////
// Mercenary Shuttle
@@ -114,16 +75,109 @@
shuttle_area = /area/shuttle/mercenary
destination_tags = list(
"merc_base",
"merc_tether_solars",
"merc_tether_dock"
"aerostat_south",
"beach_e",
"beach_nw",
"tether_solars_ne",
"tether_solars_sw",
"tether_mine_nw",
"tether_space_NE",
"tether_space_SE",
"tether_space_SW",
"tether_dockarm_d2l" //End of right docking arm
)
docking_controller_tag = "merc_shuttle"
announcer = "Automated Traffic Control"
/datum/shuttle/autodock/multi/mercenary/New()
arrival_message = "Attention. An unregistered vessel is approaching Virgo-3B."
departure_message = "Attention. A unregistered vessel is now leaving Virgo-3B."
..()
//////////////////////////////////////////////////////////////
// Ninja Shuttle
/datum/shuttle/autodock/multi/ninja
name = "Ninja"
warmup_time = 8
move_time = 60
can_cloak = TRUE
cloaked = TRUE
current_location = "ninja_base"
landmark_transition = "ninja_transit"
shuttle_area = /area/shuttle/ninja
destination_tags = list(
"ninja_base",
"aerostat_northeast",
"beach_e",
"beach_nw",
"tether_solars_ne",
"tether_solars_sw",
"tether_mine_nw",
"tether_space_NE",
"tether_space_SE",
"tether_space_SW",
"tether_dockarm_d1a3" //Inside of left dockarm
)
docking_controller_tag = "ninja_shuttle"
announcer = "Automated Traffic Control"
arrival_message = "Attention. An unregistered vessel is approaching Virgo-3B."
departure_message = "Attention. A unregistered vessel is now leaving Virgo-3B."
//////////////////////////////////////////////////////////////
// Skipjack
/datum/shuttle/autodock/multi/heist
name = "Skipjack"
warmup_time = 8
move_time = 60
can_cloak = TRUE
cloaked = TRUE
current_location = "skipjack_base"
landmark_transition = "skipjack_transit"
shuttle_area = /area/shuttle/skipjack
destination_tags = list(
"skipjack_base",
"aerostat_south",
"beach_e",
"beach_nw",
"tether_solars_ne",
"tether_solars_sw",
"tether_mine_nw",
"tether_space_NE",
"tether_space_SE",
"tether_space_SW",
"tether_dockarm_d1l" //End of left dockarm
)
//docking_controller_tag = ??? doesn't have one?
announcer = "Automated Traffic Control"
arrival_message = "Attention. An unregistered vessel is approaching Virgo-3B."
departure_message = "Attention. A unregistered vessel is now leaving Virgo-3B."
//////////////////////////////////////////////////////////////
// ERT Shuttle
/datum/shuttle/autodock/multi/specialops
name = "NDV Phantom"
can_cloak = TRUE
cloaked = FALSE
warmup_time = 8
move_time = 60
current_location = "specops_base"
landmark_transition = "specops_transit"
shuttle_area = /area/shuttle/specialops
destination_tags = list(
"specops_base",
"aerostat_northwest",
"beach_e",
"beach_nw",
"tether_solars_ne",
"tether_solars_sw",
"tether_mine_nw",
"tether_space_NE",
"tether_space_SE",
"tether_space_SW",
"tether_dockarm_d2a2" //Top of right docking arm
)
docking_controller_tag = "specops_shuttle_hatch"
announcer = "Automated Traffic Control"
arrival_message = "Attention. An NT support vessel is approaching Virgo-3B."
departure_message = "Attention. A NT support vessel is now leaving Virgo-3B."
//////////////////////////////////////////////////////////////
// RogueMiner "Belter: Shuttle
@@ -138,8 +192,6 @@
landmark_offsite = "belter_zone1"
landmark_transition = "belter_transit"
docking_controller_tag = "belter_docking"
//dock_target_station = "belter_nodocking" //Fake tags to prevent the shuttle from opening doors.
//dock_target_offsite = "belter_nodocking"
/datum/shuttle/autodock/ferry/belter/New()
move_time = move_time + rand(-5 SECONDS, 5 SECONDS)
maps/tether/tether_shuttles.dm
+57 -305
View File
@@ -7,18 +7,30 @@
shuttle_tag = "Tether Backup"
req_one_access = list(access_heads,access_pilot)
/obj/machinery/computer/shuttle_control/multi/tether_antag_ground
name = "land crawler control console"
shuttle_tag = "Land Crawler"
/obj/machinery/computer/shuttle_control/multi/mercenary
name = "vessel control console"
shuttle_tag = "Mercenary"
req_one_access = list(access_syndicate)
/obj/machinery/computer/shuttle_control/multi/tether_antag_space
name = "protoshuttle control console"
shuttle_tag = "Proto"
/obj/machinery/computer/shuttle_control/multi/ninja
name = "vessel control console"
shuttle_tag = "Ninja"
//req_one_access = list()
/obj/machinery/computer/shuttle_control/cruiser_shuttle
name = "cruiser shuttle control console"
shuttle_tag = "Cruiser Shuttle"
req_one_access = list(access_heads)
/obj/machinery/computer/shuttle_control/multi/skipjack
name = "vessel control console"
shuttle_tag = "Skipjack"
//req_one_access = list()
/obj/machinery/computer/shuttle_control/multi/specops
name = "vessel control console"
shuttle_tag = "NDV Phantom"
req_one_access = list(access_cent_specops)
/obj/machinery/computer/shuttle_control/multi/trade
name = "vessel control console"
shuttle_tag = "Trade"
req_one_access = list(access_trader)
//
// "Tram" Emergency Shuttler
@@ -165,312 +177,52 @@
update_icon()
return 1
*/
////////////////////////////////////////
//////// Excursion Shuttle /////////////
////////////////////////////////////////
/obj/machinery/computer/shuttle_control/web/excursion
name = "shuttle control console"
shuttle_tag = "Excursion Shuttle"
req_access = list()
req_one_access = list(access_pilot)
var/wait_time = 45 MINUTES
/obj/machinery/computer/shuttle_control/web/excursion/ui_interact()
if(world.time < wait_time)
to_chat(usr,"<span class='warning'>The console is locked while the shuttle refuels. It will be complete in [round((wait_time - world.time)/10/60)] minute\s.</span>")
return FALSE
. = ..()
/datum/shuttle/autodock/web_shuttle/excursion
// The 'shuttle' of the excursion shuttle
/datum/shuttle/autodock/overmap/excursion
name = "Excursion Shuttle"
warmup_time = 0
current_location = "tether_excursion_hangar"
docking_controller_tag = "expshuttle_docker"
web_master_type = /datum/shuttle_web_master/excursion
shuttle_area = /area/shuttle/excursion
var/abduct_chance = 0 //Prob
shuttle_area = list(/area/shuttle/excursion/cockpit, /area/shuttle/excursion/general, /area/shuttle/excursion/cargo)
fuel_consumption = 3
/datum/shuttle/autodock/web_shuttle/excursion/long_jump(var/obj/effect/shuttle_landmark/destination, var/obj/effect/shuttle_landmark/interim, var/travel_time)
if(prob(abduct_chance))
abduct_chance = 0
var/list/occupants = list()
for(var/area/A in shuttle_area)
for(var/mob/living/L in A)
occupants += key_name(L)
log_and_message_admins("Shuttle abduction occuring with (only mobs on turfs): [english_list(occupants)]")
//Build the route to the alien ship
var/obj/shuttle_connector/alienship/ASC = new /obj/shuttle_connector/alienship(null)
ASC.setup_routes()
// The 'ship' of the excursion shuttle
/obj/effect/overmap/visitable/ship/landable/excursion
name = "Excursion Shuttle"
desc = "The traditional Excursion Shuttle. NT Approved!"
vessel_mass = 10000
vessel_size = SHIP_SIZE_SMALL
shuttle = "Excursion Shuttle"
//Redirect us onto that route instead
var/datum/shuttle/autodock/web_shuttle/WS = shuttle_controller.shuttles[name]
var/datum/shuttle_destination/ASD = WS.web_master.get_destination_by_type(/datum/shuttle_destination/excursion/alienship)
WS.web_master.future_destination = ASD
. = ..(ASD.my_landmark,interim,travel_time)
else
. = ..()
/datum/shuttle_web_master/excursion
destination_class = /datum/shuttle_destination/excursion
starting_destination = /datum/shuttle_destination/excursion/tether
/datum/shuttle_destination/excursion/tether
name = "NSB Adephagia Excursion Hangar"
my_landmark = "tether_excursion_hangar"
radio_announce = 1
announcer = "Docking System"
routes_to_make = list(
/datum/shuttle_destination/excursion/outside_tether = 0,
)
/datum/shuttle_destination/excursion/tether/get_arrival_message()
return "Attention, [master.my_shuttle.visible_name] has arrived at the Excursion Hangar."
/datum/shuttle_destination/excursion/tether/get_departure_message()
return "Attention, [master.my_shuttle.visible_name] has departed from the Excursion Hangar."
/datum/shuttle_destination/excursion/outside_tether
name = "Nearby NSB Adephagia"
my_landmark = "tether_excursion_nearby"
preferred_interim_tag = "tether_excursion_transit_space"
routes_to_make = list(
/datum/shuttle_destination/excursion/docked_tether = 0,
/datum/shuttle_destination/excursion/virgo3b_orbit = 30 SECONDS
)
/datum/shuttle_destination/excursion/docked_tether
name = "NSB Adephagia Docking Arm"
my_landmark = "tether_excursion_dockarm"
radio_announce = 1
announcer = "Docking System"
/datum/shuttle_destination/excursion/docked_tether/get_arrival_message()
return "Attention, [master.my_shuttle.visible_name] has arrived at Docking Arm One."
/datum/shuttle_destination/excursion/docked_tether/get_departure_message()
return "Attention, [master.my_shuttle.visible_name] has departed from Docking Arm One."
/datum/shuttle_destination/excursion/virgo3b_orbit
name = "Virgo 3B Orbit"
my_landmark = "tether_excursion_space"
preferred_interim_tag = "tether_excursion_transit_space"
routes_to_make = list(
/datum/shuttle_destination/excursion/virgo3b_sky = 30 SECONDS,
/datum/shuttle_destination/excursion/bluespace = 30 SECONDS
)
/datum/shuttle_destination/excursion/virgo3b_sky
name = "Skies of Virgo 3B"
my_landmark = "tether_excursion_virgo3bsky"
////////// Aliems!!
/obj/machinery/computer/shuttle_control/web/excursion/blue
name = "shuttle control console"
icon = 'icons/obj/flight_computer_vr.dmi'
icon_state = "center"
shuttle_tag = "Hybrid Shuttle"
req_access = list()
/obj/machinery/computer/shuttle_control/explore/excursion
name = "short jump console"
shuttle_tag = "Excursion Shuttle"
req_one_access = list(access_pilot)
wait_time = 0
var/setup = FALSE
/obj/machinery/computer/shuttle_control/web/excursion/blue/ui_interact()
if(!setup && alert("Steal the excursion shuttle's destinations and copy them to this shuttle?","Shuttle Setup","Yes","Cancel") == "Yes")
var/datum/shuttle/autodock/web_shuttle/HS = shuttle_controller.shuttles[shuttle_tag]
var/datum/shuttle/autodock/web_shuttle/ES = shuttle_controller.shuttles["Excursion Shuttle"]
if(!ES.web_master.destinations.len)
return
// First, instantiate all the destination subtypes relevant to this datum.
for(var/new_type in ES.web_master.destinations)
var/datum/shuttle_destination/D = new_type
//if(D.skip_me) //Don't care
// continue
HS.web_master.destinations += new D.type(HS.web_master)
// Now start the process of connecting all of them.
for(var/datum/shuttle_destination/D in HS.web_master.destinations)
for(var/type_to_link in D.routes_to_make)
var/travel_delay = D.routes_to_make[type_to_link]
D.link_destinations(HS.web_master.get_destination_by_type(type_to_link), D.preferred_interim_tag, travel_delay)
HS.web_master.current_destination = HS.web_master.get_destination_by_type(/datum/shuttle_destination/excursion/deepish_space)
setup = TRUE
..()
else
return ..()
/datum/shuttle/autodock/web_shuttle/excursion/blue
name = "Hybrid Shuttle"
visible_name = "XN-39 Prototype"
////////////////////////////////////////
//////// Tour Bus /////////////
////////////////////////////////////////
/datum/shuttle/autodock/overmap/tourbus
name = "Tour Bus"
warmup_time = 0
current_location = "bluefo_start"
docking_controller_tag = "hybrid_shuttle_docker"
web_master_type = /datum/shuttle_web_master/excursion/blue
shuttle_area = /area/shuttle/blue_fo
abduct_chance = 0
flags = SHUTTLE_FLAGS_NONE
current_location = "tourbus_dock"
docking_controller_tag = "tourbus_docker"
shuttle_area = list(/area/shuttle/tourbus/cockpit, /area/shuttle/tourbus/general, /area/shuttle/tourbus/engines)
fuel_consumption = 1
/datum/shuttle_web_master/excursion/blue
destination_class = /datum/shuttle_destination/excursion
starting_destination = /datum/shuttle_destination/excursion/deepish_space
// The 'ship' of the excursion shuttle
/obj/effect/overmap/visitable/ship/landable/tourbus
name = "Tour Bus"
desc = "A small 'space bus', if you will."
vessel_mass = 2000
vessel_size = SHIP_SIZE_SMALL
shuttle = "Tour Bus"
/datum/shuttle_web_master/excursion/blue/build_destinations()
return
/datum/shuttle_destination/excursion/deepish_space
name = "Deepish Space"
my_landmark = "bluefo_start"
preferred_interim_tag = "tether_excursion_transit_space"
routes_to_make = list(
/datum/shuttle_destination/excursion/bluespace = 0
)
/datum/shuttle_destination/excursion/deepish_space/link_destinations(var/datum/shuttle_destination/other_place, var/interim_tag, var/travel_time = 0)
var/datum/shuttle_route/new_route = new(src, other_place, interim_tag, travel_time)
routes += new_route
////////// Distant Destinations
/datum/shuttle_destination/excursion/bluespace
name = "Bluespace Jump"
my_landmark = "tether_excursion_bluespace"
preferred_interim_tag = "tether_excursion_transit_space"
// Heist
/obj/machinery/computer/shuttle_control/web/heist
name = "skipjack control console"
req_access = list(access_syndicate)
shuttle_tag = "Skipjack"
/datum/shuttle/autodock/web_shuttle/heist
name = "Skipjack"
current_location = "skipjack_base"
shuttle_area = /area/shuttle/skipjack
web_master_type = /datum/shuttle_web_master/heist
warmup_time = 0
can_cloak = TRUE
cloaked = TRUE
/datum/shuttle_web_master/heist
destination_class = /datum/shuttle_destination/heist
starting_destination = /datum/shuttle_destination/heist/root
/datum/shuttle_destination/heist/root
name = "Raider Outpost"
my_landmark = "skipjack_base"
preferred_interim_tag = "skipjack_transit"
routes_to_make = list(
/datum/shuttle_destination/heist/outside_tether = 1 MINUTE
)
/datum/shuttle_destination/heist/outside_tether
name = "NSB Adephagia - Nearby"
my_landmark = "skipjack_outside"
preferred_interim_tag = "skipjack_transit"
routes_to_make = list(
/datum/shuttle_destination/heist/root = 1 MINUTE
)
// Ninja
/obj/machinery/computer/shuttle_control/web/ninja
name = "stealth shuttle control console"
req_access = list(access_syndicate)
shuttle_tag = "Ninja"
/datum/shuttle/autodock/web_shuttle/ninja
name = "Ninja"
visible_name = "Unknown Vessel"
current_location = "ninja_base"
shuttle_area = /area/shuttle/ninja
docking_controller_tag = "ninja_shuttle"
web_master_type = /datum/shuttle_web_master/ninja
warmup_time = 0
can_cloak = TRUE
cloaked = TRUE
/datum/shuttle_web_master/ninja
destination_class = /datum/shuttle_destination/ninja
starting_destination = /datum/shuttle_destination/ninja/root
/datum/shuttle_destination/ninja/root
name = "Dojo Outpost"
my_landmark = "ninja_base"
preferred_interim_tag = "ninja_transit"
routes_to_make = list(
/datum/shuttle_destination/ninja/outside_tether = 30 SECONDS
)
/datum/shuttle_destination/ninja/outside_tether
name = "NSB Adephagia - Nearby"
my_landmark = "ninja_outside"
preferred_interim_tag = "ninja_transit"
routes_to_make = list(
/datum/shuttle_destination/ninja/root = 30 SECONDS
)
////////////////////////////////////
//////// Specops Shuttle ///////////
////////////////////////////////////
/obj/machinery/computer/shuttle_control/web/specialops
name = "shuttle control console"
shuttle_tag = "Special Operations Shuttle"
req_access = list()
req_one_access = list(access_cent_specops)
/datum/shuttle/autodock/web_shuttle/specialops
name = "Special Operations Shuttle"
visible_name = "NDV Phantom"
current_location = "specops_base"
shuttle_area = /area/shuttle/specialops
docking_controller_tag = "specops_shuttle_hatch"
web_master_type = /datum/shuttle_web_master/specialops
can_rename = FALSE
can_cloak = TRUE
cloaked = FALSE
/datum/shuttle_web_master/specialops
destination_class = /datum/shuttle_destination/specialops
starting_destination = /datum/shuttle_destination/specialops/centcom
/datum/shuttle_destination/specialops/tether
name = "NSB Adephagia Docking Arm 2"
my_landmark = "specops_tether"
preferred_interim_tag = "specops_transit"
radio_announce = 1
announcer = "A.L.I.C.E."
routes_to_make = list(
/datum/shuttle_destination/specialops/centcom = 15,
)
/datum/shuttle_destination/specialops/tether/get_arrival_message()
return "Attention, [master.my_shuttle.visible_name] has arrived at the Docking Arm 2."
/datum/shuttle_destination/specialops/tether/get_departure_message()
return "Attention, [master.my_shuttle.visible_name] has departed from the Docking Arm 2."
/datum/shuttle_destination/specialops/centcom
name = "Central Command"
my_landmark = "specops_base"
preferred_interim_tag = "specops_transit"
routes_to_make = list(
/datum/shuttle_destination/specialops/tether = 15
)
/obj/machinery/computer/shuttle_control/explore/tourbus
name = "short jump console"
shuttle_tag = "Tour Bus"
req_one_access = list(access_pilot)