diff --git a/code/_helpers/turfs.dm b/code/_helpers/turfs.dm index ffef724172..cc90829619 100644 --- a/code/_helpers/turfs.dm +++ b/code/_helpers/turfs.dm @@ -104,6 +104,9 @@ //Are we doing shuttlework? Just to save another type check later. var/shuttlework = 0 + T.pre_translate_A(B) + B.pre_translate_B(T) + //Shuttle turfs handle their own fancy moving. if(istype(T,/turf/simulated/shuttle)) shuttlework = 1 @@ -116,7 +119,6 @@ var/old_dir1 = T.dir var/old_icon_state1 = T.icon_state var/old_icon1 = T.icon - var/old_underlays = T.underlays.Copy() var/old_decals = T.decals ? T.decals.Copy() : null X = B.ChangeTurf(T.type) @@ -124,7 +126,6 @@ X.icon_state = old_icon_state1 X.icon = old_icon1 X.copy_overlays(T, TRUE) - X.underlays = old_underlays X.decals = old_decals //Move the air from source to dest @@ -164,6 +165,9 @@ else T.ChangeTurf(get_base_turf_by_area(T)) + T.post_translate_A(B) + B.post_translate_B(T) + return TRUE //Used for border objects. This returns true if this atom is on the border between the two specified turfs diff --git a/code/datums/elements/turf_transparency.dm b/code/datums/elements/turf_transparency.dm index e8808c58a0..073f076659 100644 --- a/code/datums/elements/turf_transparency.dm +++ b/code/datums/elements/turf_transparency.dm @@ -34,6 +34,8 @@ if(!show_bottom_level(our_turf) && prune_on_fail) //If we cant show whats below, and we prune on fail, change the turf to plating as a fallback our_turf.ChangeTurf(/turf/simulated/floor/plating) return FALSE + else + return TRUE if(init) below_turf?.update_icon() // So the 'ceiling-less' overlay gets added. our_turf.vis_contents += below_turf @@ -67,11 +69,11 @@ /datum/element/turf_z_transparency/proc/show_bottom_level(turf/our_turf) if(!show_bottom_level) return FALSE - var/turf/path = get_base_turf(our_turf.z) || /turf/space + var/turf/path = get_base_turf_by_area(our_turf) || /turf/space if(!ispath(path)) path = text2path(path) if(!ispath(path)) - warning("Z-level [our_turf.z] has invalid baseturf '[get_base_turf(our_turf.z)]'") + warning("Z-level [our_turf] has invalid baseturf '[get_base_turf_by_area(our_turf)]' in area '[get_area(our_turf)]'") path = /turf/space var/do_plane = ispath(path, /turf/space) ? SPACE_PLANE : null diff --git a/code/game/sound.dm b/code/game/sound.dm index ce4c33d37b..32eabbca4e 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -1,8 +1,7 @@ /proc/playsound(atom/source, soundin, vol as num, vary, extrarange as num, falloff, is_global, frequency = null, channel = 0, pressure_affected = TRUE, ignore_walls = TRUE, preference = null, volume_channel = null) - if(isarea(source)) - throw EXCEPTION("playsound(): source is an area") + if(Master.current_runlevel < RUNLEVEL_LOBBY) return - + var/turf/turf_source = get_turf(source) if(!turf_source) return diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm index 5d5f4ebff3..b420e9e73e 100644 --- a/code/game/turfs/flooring/flooring_decals.dm +++ b/code/game/turfs/flooring/flooring_decals.dm @@ -30,18 +30,25 @@ var/list/floor_decals = list() set_dir(supplied_dir) // TODO - Why can't this line be done in initialize/New()? var/turf/T = get_turf(src) if(istype(T, /turf/simulated/floor) || istype(T, /turf/unsimulated/floor) || istype(T, /turf/simulated/shuttle/floor)) - var/cache_key = "[alpha]-[color]-[dir]-[icon_state]-[T.layer]" + var/cache_key = get_cache_key(T) var/image/I = floor_decals[cache_key] if(!I) - I = image(icon = icon, icon_state = icon_state, dir = dir) - I.layer = MAPPER_DECAL_LAYER - I.color = color - I.alpha = alpha + I = make_decal_image() floor_decals[cache_key] = I LAZYADD(T.decals, I) // Add to its decals list (so it remembers to re-apply after it cuts overlays) T.add_overlay(I) // Add to its current overlays too. return T +/obj/effect/floor_decal/proc/make_decal_image() + var/image/I = image(icon = icon, icon_state = icon_state, dir = dir) + I.layer = MAPPER_DECAL_LAYER + I.color = color + I.alpha = alpha + return I + +/obj/effect/floor_decal/proc/get_cache_key(var/turf/T) + return "[alpha]-[color]-[dir]-[icon_state]-[T.layer]" + /obj/effect/floor_decal/reset name = "reset marker" diff --git a/code/game/turfs/simulated/fancy_shuttles.dm b/code/game/turfs/simulated/fancy_shuttles.dm new file mode 100644 index 0000000000..9804d6c0c6 --- /dev/null +++ b/code/game/turfs/simulated/fancy_shuttles.dm @@ -0,0 +1,278 @@ +/** + * To map these, place down a /obj/effect/fancy_shuttle on the map and lay down /turf/simulated/wall/fancy_shuttle + * everywhere that is included in the sprite. Up to you if you want to make some opacity=FALSE or density=FALSE + * Set a matching fancy_shuttle_tag on your walls and on the /obj/effect/fancy_shuttle. Make sure it's unique. + * + * If you want flooring to look like the shuttle flooring, put /obj/effect/floor_decal/fancy_shuttle on all of it. + * You can add your own decals on top of that. Just make sure to put the fancy_shuttle decal lowest. + * Also set the same tag as your /obj/effect/fancy_shuttle on the decals. + */ + +GLOBAL_LIST_EMPTY(fancy_shuttles) +/** + * Generic shuttle + * North facing: W:5, H:9 + */ +/obj/effect/fancy_shuttle + name = "shuttle wall decorator" + icon = 'icons/turf/fancy_shuttles/generic_preview.dmi' + icon_state = "walls" + plane = TURF_PLANE + layer = ABOVE_TURF_LAYER + invisibility = INVISIBILITY_MAXIMUM + alpha = 90 // so you can see it a bit easier on the map if you placed walls properly + var/split_file = 'icons/turf/fancy_shuttles/generic.dmi' + var/icon/split_icon + var/fancy_shuttle_tag + +/obj/effect/fancy_shuttle/New() // has to be very early so others can grab it + . = ..() + if(!fancy_shuttle_tag) + error("Fancy shuttle with no tag at [x],[y],[z]! Type is: [type]") + return INITIALIZE_HINT_QDEL + split_icon = icon(split_file, null, dir) + GLOB.fancy_shuttles[fancy_shuttle_tag] = src + +/obj/effect/fancy_shuttle_floor_preview + name = "shuttle floor preview" + icon = 'icons/turf/fancy_shuttles/generic_preview.dmi' + icon_state = "floors" + plane = PLATING_PLANE + layer = ABOVE_TURF_LAYER + alpha = 90 + +/obj/effect/fancy_shuttle_floor_preview/Initialize() + . = ..() + return INITIALIZE_HINT_QDEL + +// Only icon changes are damage +/turf/simulated/wall/fancy_shuttle + icon = 'icons/turf/fancy_shuttles/_fancy_helpers.dmi' + icon_state = "hull" + wall_masks = 'icons/turf/fancy_shuttles/_fancy_helpers.dmi' + var/mutable_appearance/under_MA + var/mutable_appearance/under_EM + var/fancy_shuttle_tag + +/turf/simulated/wall/fancy_shuttle/pre_translate_A(turf/B) + . = ..() + remove_underlay() + +/turf/simulated/wall/fancy_shuttle/post_translate_B(turf/A) + apply_underlay() + return ..() + +/turf/simulated/wall/fancy_shuttle/window + opacity = FALSE + icon_state = "hull_transparent" + +/turf/simulated/wall/fancy_shuttle/nondense + density = FALSE + blocks_air = FALSE + opacity = FALSE + icon_state = "hull_nondense" + +/turf/simulated/wall/fancy_shuttle/proc/remove_underlay() + if(under_MA) + underlays -= under_MA + under_MA = null + if(under_EM) + underlays -= under_EM + under_EM = null + +/turf/simulated/wall/fancy_shuttle/proc/apply_underlay() + remove_underlay() + + var/turf/path = get_base_turf_by_area(src) || /turf/space + + var/do_plane = null + var/do_state = initial(path.icon_state) + var/do_icon = initial(path.icon) + if(ispath(path, /turf/space)) + do_plane = SPACE_PLANE + do_state = "white" + + under_EM = mutable_appearance('icons/turf/space.dmi', "white", plane = PLANE_O_LIGHTING_VISUAL) + under_EM.filters = filter(type = "alpha", icon = icon(src.icon, src.icon_state), flags = MASK_INVERSE) + + under_MA = mutable_appearance(do_icon, do_state, layer = src.layer-0.02, plane = do_plane) + underlays += under_MA + if(under_EM) + underlays += under_EM + +// Trust me, this is WAY faster than the normal wall overlays shenanigans, don't worry about performance +/turf/simulated/wall/fancy_shuttle/update_icon() + if(!damage_overlays[1]) + generate_overlays() + + cut_overlays() + if(fancy_shuttle_tag) // after a shuttle jump it won't be set anymore, but the shuttle jump proc will set our icon and state + var/obj/effect/fancy_shuttle/F = GLOB.fancy_shuttles[fancy_shuttle_tag] + if(!F) + warning("Fancy shuttle wall at [x],[y],[z] couldn't locate a helper with tag [fancy_shuttle_tag]") + return + icon = F.split_icon + icon_state = "walls [x - F.x],[y - F.y]" + + apply_underlay() + + if(damage != 0) + var/integrity = material.integrity + if(reinf_material) + integrity += reinf_material.integrity + + var/overlay = round(damage / integrity * damage_overlays.len) + 1 + if(overlay > damage_overlays.len) + overlay = damage_overlays.len + + add_overlay(damage_overlays[overlay]) + +/turf/simulated/wall/fancy_shuttle/update_connections() + return + +/turf/simulated/wall/fancy_shuttle/set_light(l_range, l_power, l_color, l_on) + return + +/obj/effect/floor_decal/fancy_shuttle + icon = 'icons/turf/fancy_shuttles/_fancy_helpers.dmi' + icon_state = "fancy_shuttle" + layer = DECAL_LAYER-1 + var/icon_file + var/fancy_shuttle_tag + +/obj/effect/floor_decal/fancy_shuttle/Initialize() + var/obj/effect/fancy_shuttle/F = GLOB.fancy_shuttles[fancy_shuttle_tag] + if(!F) + warning("Fancy shuttle floor decal at [x],[y],[z] couldn't locate a helper with tag [fancy_shuttle_tag]") + return INITIALIZE_HINT_QDEL + icon = F.split_icon + icon_file = F.split_file + icon_state = "floors [x - F.x],[y - F.y]" + return ..() + +/obj/effect/floor_decal/fancy_shuttle/make_decal_image() + return image(icon = icon, icon_state = icon_state, layer = BUILTIN_DECAL_LAYER) + +/obj/effect/floor_decal/fancy_shuttle/get_cache_key(var/turf/T) + return "[alpha]-[color]-[dir]-[icon_state]-[T.layer]-[icon_file]" + +/** + * Invisible ship equipment (otherwise the same as normal) + */ +// Gas engine +/obj/machinery/atmospherics/unary/engine/fancy_shuttle + icon = 'icons/turf/fancy_shuttles/_fancy_helpers.dmi' + icon_state = "gas_engine" + invisibility = INVISIBILITY_MAXIMUM + +// Ion engine +/obj/machinery/ion_engine/fancy_shuttle + icon = 'icons/turf/fancy_shuttles/_fancy_helpers.dmi' + icon_state = "ion_engine" + invisibility = INVISIBILITY_MAXIMUM + +// Sensors +/obj/machinery/shipsensors/fancy_shuttle + icon = 'icons/turf/fancy_shuttles/_fancy_helpers.dmi' + icon_state = "ship_sensors" + invisibility = INVISIBILITY_MAXIMUM + +/** + * Escape shuttle + * North facing: W:15, H:27 + */ +/obj/effect/fancy_shuttle/escape + icon = 'icons/turf/fancy_shuttles/escape_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/escape.dmi' +/obj/effect/fancy_shuttle_floor_preview/escape + icon = 'icons/turf/fancy_shuttles/escape_preview.dmi' + +/** + * Mining shuttle + * North facing: W:18, H:24 + */ +/obj/effect/fancy_shuttle/miner + icon = 'icons/turf/fancy_shuttles/miner_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/miner.dmi' +/obj/effect/fancy_shuttle_floor_preview/miner + icon = 'icons/turf/fancy_shuttles/miner_preview.dmi' + +/** + * Science shuttle + * North facing: W:17, H:22 + */ +/obj/effect/fancy_shuttle/science + icon = 'icons/turf/fancy_shuttles/science_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/science.dmi' +/obj/effect/fancy_shuttle_floor_preview/science + icon = 'icons/turf/fancy_shuttles/science_preview.dmi' + +/** + * Dropship + * North facing: W:11, H:20 + */ +/obj/effect/fancy_shuttle/dropship + icon = 'icons/turf/fancy_shuttles/dropship_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/dropship.dmi' +/obj/effect/fancy_shuttle_floor_preview/dropship + icon = 'icons/turf/fancy_shuttles/dropship_preview.dmi' + +/** + * Orange line tram + * North facing: W:9, H:16 + */ +/obj/effect/fancy_shuttle/orangeline + icon = 'icons/turf/fancy_shuttles/orangeline_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/orangeline.dmi' +/obj/effect/fancy_shuttle_floor_preview/orangeline + icon = 'icons/turf/fancy_shuttles/orangeline_preview.dmi' + +/** + * Tour bus + * North facing: W:7, H:13 + */ +/obj/effect/fancy_shuttle/tourbus + icon = 'icons/turf/fancy_shuttles/tourbus_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/tourbus.dmi' +/obj/effect/fancy_shuttle_floor_preview/tourbus + icon = 'icons/turf/fancy_shuttles/tourbus_preview.dmi' + +/** + * Delivery shuttle + * North facing: W:8, H:10 + */ +/obj/effect/fancy_shuttle/delivery + icon = 'icons/turf/fancy_shuttles/delivery_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/delivery.dmi' +/obj/effect/fancy_shuttle_floor_preview/delivery + icon = 'icons/turf/fancy_shuttles/delivery_preview.dmi' + +/** + * Wagon + * North facing: W:5, H:13 + */ +/obj/effect/fancy_shuttle/wagon + icon = 'icons/turf/fancy_shuttles/wagon_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/wagon.dmi' +/obj/effect/fancy_shuttle_floor_preview/wagon + icon = 'icons/turf/fancy_shuttles/wagon_preview.dmi' + +/** + * Lifeboat + * North facing: W:5, H:10 + */ +/obj/effect/fancy_shuttle/lifeboat + icon = 'icons/turf/fancy_shuttles/lifeboat_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/lifeboat.dmi' +/obj/effect/fancy_shuttle_floor_preview/lifeboat + icon = 'icons/turf/fancy_shuttles/lifeboat_preview.dmi' + +/** + * Pod + * North facing: W:3, H:4 + */ +/obj/effect/fancy_shuttle/escapepod + icon = 'icons/turf/fancy_shuttles/pod_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/pod.dmi' +/obj/effect/fancy_shuttle_floor_preview/escapepod + icon = 'icons/turf/fancy_shuttles/pod_preview.dmi' diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 2f54db4847..bcd53322b8 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -394,3 +394,17 @@ ChangeTurf(/turf/simulated/floor/airless, preserve_outdoors = TRUE) return TRUE return FALSE + + +// We're about to be the A-side in a turf translation +/turf/proc/pre_translate_A(var/turf/B) + return +// We're about to be the B-side in a turf translation +/turf/proc/pre_translate_B(var/turf/A) + return +// We were the the A-side in a turf translation +/turf/proc/post_translate_A(var/turf/B) + return +// We were the the B-side in a turf translation +/turf/proc/post_translate_B(var/turf/A) + return \ No newline at end of file diff --git a/code/modules/overmap/ships/engines/ion_thruster.dm b/code/modules/overmap/ships/engines/ion_thruster.dm index 3c84790e12..21a4f9ea3a 100644 --- a/code/modules/overmap/ships/engines/ion_thruster.dm +++ b/code/modules/overmap/ships/engines/ion_thruster.dm @@ -52,15 +52,17 @@ /obj/machinery/ion_engine/Initialize() . = ..() controller = new(src) - - var/image/i = image('icons/turf/shuttle_parts_vr.dmi', "ion_overlay") // VOREStation Edit - i.plane = PLANE_LIGHTING_ABOVE // VOREStation Edit - add_overlay(i) // VOREStation Edit + add_glow() /obj/machinery/ion_engine/Destroy() QDEL_NULL(controller) . = ..() +/obj/machinery/ion_engine/proc/add_glow() + var/image/i = image('icons/turf/shuttle_parts_vr.dmi', "ion_overlay") // VOREStation Edit + i.plane = PLANE_LIGHTING_ABOVE // VOREStation Edit + add_overlay(i) // VOREStation Edit + /obj/machinery/ion_engine/proc/get_status() . = list() .+= "Location: [get_area(src)]." diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index a062d2a3d3..cb120ef214 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -348,6 +348,11 @@ for(var/obj/structure/cable/C in A) powernets |= C.powernet + // Update our base turfs before we move, so that transparent turfs look good. + var/new_base = destination.base_turf || /turf/space + for(var/area/A as anything in shuttle_area) + A.base_turf = new_base + // Actually do the movement of everything - This replaces origin.move_contents_to(destination) translate_turfs(turf_translation, current_location.base_area, current_location.base_turf) current_location = destination diff --git a/icons/obj/sofas.dmi b/icons/obj/sofas.dmi index ebb7ad3374..9864a923ac 100644 Binary files a/icons/obj/sofas.dmi and b/icons/obj/sofas.dmi differ diff --git a/icons/turf/fancy_shuttles/_fancy_helpers.dmi b/icons/turf/fancy_shuttles/_fancy_helpers.dmi new file mode 100644 index 0000000000..8b7fcb5eaf Binary files /dev/null and b/icons/turf/fancy_shuttles/_fancy_helpers.dmi differ diff --git a/icons/turf/fancy_shuttles/delivery.dmi b/icons/turf/fancy_shuttles/delivery.dmi new file mode 100644 index 0000000000..1aae679adc Binary files /dev/null and b/icons/turf/fancy_shuttles/delivery.dmi differ diff --git a/icons/turf/fancy_shuttles/delivery_preview.dmi b/icons/turf/fancy_shuttles/delivery_preview.dmi new file mode 100644 index 0000000000..51150ea1ef Binary files /dev/null and b/icons/turf/fancy_shuttles/delivery_preview.dmi differ diff --git a/icons/turf/fancy_shuttles/dropship.dmi b/icons/turf/fancy_shuttles/dropship.dmi new file mode 100644 index 0000000000..a8249949e8 Binary files /dev/null and b/icons/turf/fancy_shuttles/dropship.dmi differ diff --git a/icons/turf/fancy_shuttles/dropship_preview.dmi b/icons/turf/fancy_shuttles/dropship_preview.dmi new file mode 100644 index 0000000000..fef5fb379d Binary files /dev/null and b/icons/turf/fancy_shuttles/dropship_preview.dmi differ diff --git a/icons/turf/fancy_shuttles/escape.dmi b/icons/turf/fancy_shuttles/escape.dmi new file mode 100644 index 0000000000..82f98e904b Binary files /dev/null and b/icons/turf/fancy_shuttles/escape.dmi differ diff --git a/icons/turf/fancy_shuttles/escape_preview.dmi b/icons/turf/fancy_shuttles/escape_preview.dmi new file mode 100644 index 0000000000..6c92bbbdec Binary files /dev/null and b/icons/turf/fancy_shuttles/escape_preview.dmi differ diff --git a/icons/turf/fancy_shuttles/generic.dmi b/icons/turf/fancy_shuttles/generic.dmi new file mode 100644 index 0000000000..5e52d1c33e Binary files /dev/null and b/icons/turf/fancy_shuttles/generic.dmi differ diff --git a/icons/turf/fancy_shuttles/generic_preview.dmi b/icons/turf/fancy_shuttles/generic_preview.dmi new file mode 100644 index 0000000000..bab99053bb Binary files /dev/null and b/icons/turf/fancy_shuttles/generic_preview.dmi differ diff --git a/icons/turf/fancy_shuttles/lifeboat.dmi b/icons/turf/fancy_shuttles/lifeboat.dmi new file mode 100644 index 0000000000..f52831ac40 Binary files /dev/null and b/icons/turf/fancy_shuttles/lifeboat.dmi differ diff --git a/icons/turf/fancy_shuttles/lifeboat_preview.dmi b/icons/turf/fancy_shuttles/lifeboat_preview.dmi new file mode 100644 index 0000000000..e28b2586aa Binary files /dev/null and b/icons/turf/fancy_shuttles/lifeboat_preview.dmi differ diff --git a/icons/turf/fancy_shuttles/miner.dmi b/icons/turf/fancy_shuttles/miner.dmi new file mode 100644 index 0000000000..1687e59aea Binary files /dev/null and b/icons/turf/fancy_shuttles/miner.dmi differ diff --git a/icons/turf/fancy_shuttles/miner_preview.dmi b/icons/turf/fancy_shuttles/miner_preview.dmi new file mode 100644 index 0000000000..848a76ca3c Binary files /dev/null and b/icons/turf/fancy_shuttles/miner_preview.dmi differ diff --git a/icons/turf/fancy_shuttles/orangeline.dmi b/icons/turf/fancy_shuttles/orangeline.dmi new file mode 100644 index 0000000000..de62f36f5b Binary files /dev/null and b/icons/turf/fancy_shuttles/orangeline.dmi differ diff --git a/icons/turf/fancy_shuttles/orangeline_preview.dmi b/icons/turf/fancy_shuttles/orangeline_preview.dmi new file mode 100644 index 0000000000..1826583b2f Binary files /dev/null and b/icons/turf/fancy_shuttles/orangeline_preview.dmi differ diff --git a/icons/turf/fancy_shuttles/pod.dmi b/icons/turf/fancy_shuttles/pod.dmi new file mode 100644 index 0000000000..7f531daa7e Binary files /dev/null and b/icons/turf/fancy_shuttles/pod.dmi differ diff --git a/icons/turf/fancy_shuttles/pod_preview.dmi b/icons/turf/fancy_shuttles/pod_preview.dmi new file mode 100644 index 0000000000..e3cff0f677 Binary files /dev/null and b/icons/turf/fancy_shuttles/pod_preview.dmi differ diff --git a/icons/turf/fancy_shuttles/science.dmi b/icons/turf/fancy_shuttles/science.dmi new file mode 100644 index 0000000000..b7cb2228b0 Binary files /dev/null and b/icons/turf/fancy_shuttles/science.dmi differ diff --git a/icons/turf/fancy_shuttles/science_preview.dmi b/icons/turf/fancy_shuttles/science_preview.dmi new file mode 100644 index 0000000000..7c19d05c5b Binary files /dev/null and b/icons/turf/fancy_shuttles/science_preview.dmi differ diff --git a/icons/turf/fancy_shuttles/tourbus.dmi b/icons/turf/fancy_shuttles/tourbus.dmi new file mode 100644 index 0000000000..beb0b4b30d Binary files /dev/null and b/icons/turf/fancy_shuttles/tourbus.dmi differ diff --git a/icons/turf/fancy_shuttles/tourbus_preview.dmi b/icons/turf/fancy_shuttles/tourbus_preview.dmi new file mode 100644 index 0000000000..56e5b6d455 Binary files /dev/null and b/icons/turf/fancy_shuttles/tourbus_preview.dmi differ diff --git a/icons/turf/fancy_shuttles/wagon.dmi b/icons/turf/fancy_shuttles/wagon.dmi new file mode 100644 index 0000000000..ceae25d789 Binary files /dev/null and b/icons/turf/fancy_shuttles/wagon.dmi differ diff --git a/icons/turf/fancy_shuttles/wagon_preview.dmi b/icons/turf/fancy_shuttles/wagon_preview.dmi new file mode 100644 index 0000000000..aa9b8317e0 Binary files /dev/null and b/icons/turf/fancy_shuttles/wagon_preview.dmi differ diff --git a/icons/turf/shuttle_parts_vr.dmi b/icons/turf/shuttle_parts_vr.dmi index 740688a502..6f138b26cc 100644 Binary files a/icons/turf/shuttle_parts_vr.dmi and b/icons/turf/shuttle_parts_vr.dmi differ diff --git a/maps/offmap_vr/om_ships/aro3.dm b/maps/offmap_vr/om_ships/aro3.dm index c6a68b1525..791a53a642 100644 --- a/maps/offmap_vr/om_ships/aro3.dm +++ b/maps/offmap_vr/om_ships/aro3.dm @@ -66,6 +66,7 @@ name = "Aronai - Ship's Boat" requires_power = 1 dynamic_lighting = 1 + base_turf = /turf/simulated/floor/reinforced /turf/simulated/floor/water/indoors/surfluid name = "surfluid pool" @@ -108,7 +109,7 @@ /obj/effect/shuttle_landmark/shuttle_initializer/aroboat3 name = "Aronai's Boat Bay" base_area = /area/aro3/flight_deck - base_turf = /turf/simulated/floor/tiled/eris/dark/techfloor_grid + base_turf = /turf/simulated/floor/reinforced landmark_tag = "omship_spawn_aroboat3" docking_controller = "aroship3_boatbay" shuttle_type = /datum/shuttle/autodock/overmap/aroboat3 diff --git a/maps/offmap_vr/om_ships/aro3.dmm b/maps/offmap_vr/om_ships/aro3.dmm index 41bba6aafd..385b05f701 100644 --- a/maps/offmap_vr/om_ships/aro3.dmm +++ b/maps/offmap_vr/om_ships/aro3.dmm @@ -99,6 +99,7 @@ /obj/effect/floor_decal/milspec/color/red/half{ dir = 1 }, +/obj/effect/floor_decal/milspec/stripe, /turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "aB" = ( @@ -233,14 +234,19 @@ /turf/simulated/wall/tgmc/durawall, /area/aro3/cockpit) "bs" = ( -/obj/machinery/power/rtg/abductor/hybrid/built, -/obj/structure/cable/cyan{ - icon_state = "0-2" +/obj/structure/bed/chair/shuttle_padded{ + dir = 1 }, -/obj/machinery/light{ - dir = 4 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "aro3boat" }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/aroboat3) "bv" = ( /obj/machinery/door/airlock/angled_tgmc/cell{ @@ -443,12 +449,6 @@ }, /turf/simulated/floor/tiled/milspec, /area/aro3/cockpit) -"cE" = ( -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 8 - }, -/turf/simulated/floor/tiled/milspec, -/area/aro3/flight_deck) "cH" = ( /turf/simulated/floor/water/indoors/surfluid, /area/aro3/surfluid) @@ -494,20 +494,26 @@ /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) "cV" = ( +/obj/machinery/door/airlock/angled_tgmc/security_glass{ + dir = 4; + name = "shuttle airlock" + }, +/obj/effect/map_helper/airlock/door/simple, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/fans/hardlight, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/structure/cable/cyan{ - icon_state = "4-8" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "aro3boat" }, -/obj/effect/floor_decal/milspec/color/black/half{ - dir = 8 - }, -/turf/simulated/floor/tiled/milspec, -/area/aro3/flight_deck) +/turf/simulated/floor/tiled/steel, +/area/shuttle/aroboat3) "db" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -804,14 +810,21 @@ }, /turf/simulated/floor/tiled/milspec, /area/aro3/power) -"eI" = ( -/obj/structure/bed/chair/bay/comfy/blue{ - dir = 1 +"eG" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 8; + frequency = 1380; + id_tag = "aroboat3_docker"; + pixel_x = 25; + req_one_access = list(777) }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/structure/bed/chair/shuttle_padded{ + dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "aro3boat" + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/aroboat3) "eK" = ( /obj/structure/table/marble, @@ -1080,6 +1093,7 @@ /obj/effect/floor_decal/milspec/color/red/half{ dir = 1 }, +/obj/effect/floor_decal/milspec/stripe, /turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "gK" = ( @@ -1331,6 +1345,13 @@ }, /turf/simulated/floor/tiled/milspec, /area/aro3/power) +"ii" = ( +/obj/effect/floor_decal/milspec/stripe, +/obj/effect/floor_decal/milspec/stripe{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/flight_deck) "ij" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1350,6 +1371,15 @@ /obj/effect/floor_decal/milspec/monotile, /turf/simulated/floor/tiled/milspec, /area/aro3/medical) +"it" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "aro3boat" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/aroboat3) "iw" = ( /obj/effect/floor_decal/milspec/color/orange/half{ dir = 1 @@ -1643,13 +1673,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/aro3/medical) -"ke" = ( -/obj/structure/fans/hardlight, -/obj/machinery/door/blast/multi_tile/four_tile_hor_sec{ - id = "aroshipshutter_ramp" - }, -/turf/simulated/floor/reinforced, -/area/aro3/flight_deck) "kg" = ( /obj/machinery/light{ dir = 4 @@ -1976,14 +1999,13 @@ /turf/simulated/wall/rpshull, /area/space) "lY" = ( -/obj/structure/bed/chair/bay/comfy/blue{ - dir = 1 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "aro3boat" }, -/obj/machinery/alarm/alarms_hidden{ - dir = 4; - pixel_x = -26 +/obj/structure/bed/chair/shuttle_padded{ + dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/steel, /area/shuttle/aroboat3) "lZ" = ( /obj/structure/cable/cyan{ @@ -2009,14 +2031,14 @@ /turf/simulated/floor/tiled/milspec, /area/aro3/hallway_starboard) "md" = ( -/obj/machinery/light{ - dir = 8 +/obj/effect/fancy_shuttle{ + dir = 1; + fancy_shuttle_tag = "aro3boat" }, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 8 +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "aro3boat" }, -/turf/simulated/floor/tiled/milspec, -/area/aro3/flight_deck) +/area/shuttle/aroboat3) "mf" = ( /obj/effect/floor_decal/milspec/color/black/half{ dir = 4 @@ -2201,6 +2223,14 @@ /obj/effect/floor_decal/milspec/monotile, /turf/simulated/floor/tiled/milspec, /area/aro3/function) +"nr" = ( +/obj/structure/fans/hardlight, +/obj/machinery/door/blast/angled{ + dir = 2; + id = "aroshipshutter_ramp" + }, +/turf/simulated/floor/reinforced/airless, +/area/aro3/flight_deck) "ns" = ( /turf/simulated/wall/tgmc/durawall, /area/aro3/function) @@ -2300,11 +2330,10 @@ /turf/simulated/floor/wood, /area/aro3/suite_starboard) "oe" = ( -/obj/structure/sign/warning/vacuum{ - pixel_x = 16; - pixel_y = -30 +/obj/effect/floor_decal/milspec/stripe{ + dir = 1 }, -/obj/effect/floor_decal/milspec/color/red/half, +/obj/effect/floor_decal/milspec/stripe, /turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "oh" = ( @@ -2358,6 +2387,9 @@ /obj/effect/floor_decal/milspec/color/red/half{ dir = 1 }, +/obj/effect/floor_decal/milspec/stripe{ + dir = 5 + }, /turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "oz" = ( @@ -2454,12 +2486,6 @@ }, /turf/space, /area/space) -"pg" = ( -/obj/effect/floor_decal/milspec/color/red/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled/milspec, -/area/aro3/flight_deck) "pj" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -2469,6 +2495,16 @@ }, /turf/simulated/floor/wood, /area/aro3/suite_port) +"pk" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/milspec/stripe{ + dir = 6 + }, +/obj/effect/floor_decal/milspec/stripe, +/turf/simulated/floor/tiled/milspec, +/area/aro3/flight_deck) "pl" = ( /obj/structure/cable/cyan{ icon_state = "1-8" @@ -3111,12 +3147,6 @@ }, /turf/simulated/floor/tiled/milspec, /area/aro3/function) -"tz" = ( -/turf/simulated/shuttle/wall/voidcraft/blue{ - hard_corner = 1; - icon_state = "void-hc" - }, -/area/shuttle/aroboat3) "tB" = ( /obj/machinery/alarm/angled/hidden{ pixel_x = -4; @@ -3512,6 +3542,7 @@ /obj/effect/floor_decal/milspec/color/red/half{ dir = 1 }, +/obj/effect/floor_decal/milspec/stripe, /turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "ws" = ( @@ -3724,10 +3755,10 @@ /obj/structure/sign/vacuum{ pixel_x = -32 }, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 8 - }, /obj/effect/floor_decal/milspec/stripe, +/obj/effect/floor_decal/milspec/stripe{ + dir = 1 + }, /turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "xE" = ( @@ -3750,7 +3781,12 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, -/turf/simulated/wall/rpshull, +/obj/structure/fans/hardlight, +/obj/machinery/door/blast/angled{ + dir = 2; + id = "aroshipshutter_ramp" + }, +/turf/simulated/floor/reinforced/airless, /area/aro3/flight_deck) "xI" = ( /obj/structure/flora/pottedplant/unusual, @@ -3782,6 +3818,15 @@ }, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) +"xR" = ( +/obj/structure/bed/chair/shuttle_padded{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "aro3boat" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/aroboat3) "xS" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -3872,6 +3917,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/effect/floor_decal/milspec/stripe{ + dir = 8 + }, /turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "yz" = ( @@ -3990,17 +4038,13 @@ /turf/simulated/floor/tiled/milspec/sterile, /area/aro3/medical) "zi" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; - req_access = list() +/obj/machinery/light{ + dir = 8 }, -/obj/structure/cable/cyan{ - icon_state = "0-4" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "aro3boat" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/steel, /area/shuttle/aroboat3) "zj" = ( /obj/machinery/atmospherics/binary/pump/on{ @@ -4049,6 +4093,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/milspec/stripe{ + dir = 8 + }, /turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "zt" = ( @@ -4261,6 +4308,12 @@ /obj/effect/floor_decal/milspec/monotile, /turf/simulated/floor/tiled/milspec, /area/aro3/kitchen) +"Al" = ( +/obj/structure/bed/chair/shuttle_padded{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/aroboat3) "Am" = ( /obj/machinery/recharge_station, /obj/effect/floor_decal/milspec/color/emerald, @@ -4397,7 +4450,8 @@ name = "hangar shutters"; pixel_x = -28 }, -/obj/machinery/door/blast/multi_tile/four_tile_hor_sec{ +/obj/machinery/door/blast/angled{ + dir = 2; id = "aroshipshutter_ramp" }, /turf/simulated/floor/reinforced, @@ -4425,12 +4479,6 @@ }, /turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) -"BO" = ( -/obj/effect/floor_decal/milspec/color/red/corner{ - dir = 8 - }, -/turf/simulated/floor/tiled/milspec, -/area/aro3/flight_deck) "BQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -4504,13 +4552,13 @@ /turf/simulated/floor/plating/eris/under, /area/aro3/atmos) "Cu" = ( -/obj/structure/bed/chair/bay/comfy/blue{ - dir = 1 +/obj/structure/bed/chair/shuttle_padded{ + dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "aro3boat" }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/steel, /area/shuttle/aroboat3) "Cv" = ( /obj/effect/floor_decal/milspec/monotile, @@ -4576,6 +4624,10 @@ pixel_x = 28 }, /obj/structure/fans/hardlight, +/obj/machinery/door/blast/angled{ + dir = 2; + id = "aroshipshutter_ramp" + }, /turf/simulated/floor/reinforced, /area/aro3/flight_deck) "CN" = ( @@ -4611,11 +4663,16 @@ /turf/simulated/floor/tiled/techmaint, /area/aro3/hallway_bunkrooms) "Di" = ( -/obj/effect/floor_decal/industrial/warning/dust{ +/obj/effect/floor_decal/milspec/color/red/half{ dir = 1 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/effect/floor_decal/milspec/stripe, +/obj/machinery/computer/shuttle_control/explore/aroboat3{ + dir = 4; + req_one_access = list(777) + }, +/turf/simulated/floor/tiled/milspec, +/area/aro3/flight_deck) "Dk" = ( /turf/simulated/floor/tiled/milspec/raised, /area/aro3/power) @@ -4645,14 +4702,24 @@ /turf/simulated/floor/tiled/milspec, /area/aro3/hallway_bunkrooms) "DA" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "aro3boat" }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 1 +/obj/machinery/power/apc/angled/hidden{ + dir = 8; + req_one_access = list(777) }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/structure/cable/cyan, +/obj/machinery/alarm/angled/hidden{ + dir = 8; + req_one_access = list(777) + }, +/obj/structure/closet/autolok_wall{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/aroboat3) "DB" = ( /obj/structure/cable/cyan{ icon_state = "2-8" @@ -4847,10 +4914,6 @@ /obj/effect/floor_decal/milspec/monotile, /turf/simulated/floor/tiled/milspec, /area/aro3/function) -"EH" = ( -/obj/effect/floor_decal/milspec/color/red/half, -/turf/simulated/floor/tiled/milspec, -/area/aro3/flight_deck) "EI" = ( /obj/structure/lattice, /obj/structure/hull_corner/long_vert{ @@ -4900,14 +4963,6 @@ }, /turf/simulated/floor/tiled/milspec, /area/aro3/function) -"Fc" = ( -/obj/structure/window/plastitanium/full, -/obj/structure/window/plastitanium{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/aroboat3) "Ff" = ( /obj/structure/table/glass, /obj/item/device/defib_kit/loaded, @@ -5013,6 +5068,14 @@ /obj/effect/floor_decal/milspec/monotile, /turf/simulated/floor/tiled/milspec, /area/aro3/workshop) +"FY" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "aro3boat" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/steel, +/area/shuttle/aroboat3) "FZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -5131,12 +5194,6 @@ }, /turf/simulated/floor/tiled/techmaint/airless, /area/space) -"Hc" = ( -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 9 - }, -/turf/simulated/floor/tiled/milspec, -/area/aro3/flight_deck) "Hd" = ( /turf/simulated/wall/tgmc/durawall, /area/aro3/hallway_starboard) @@ -5211,9 +5268,6 @@ "Hz" = ( /turf/simulated/wall/tgmc/durawall/deco0, /area/aro3/suite_port) -"HE" = ( -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/shuttle/aroboat3) "HG" = ( /obj/structure/hull_corner{ dir = 8 @@ -5438,6 +5492,9 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, +/obj/effect/floor_decal/milspec/stripe{ + dir = 8 + }, /turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "Kf" = ( @@ -5868,6 +5925,9 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, +/obj/effect/floor_decal/milspec/stripe{ + dir = 8 + }, /turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "MC" = ( @@ -6281,12 +6341,10 @@ /turf/simulated/floor/tiled/milspec, /area/aro3/surfluid) "Pa" = ( -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 9 +/turf/simulated/wall/fancy_shuttle/window{ + fancy_shuttle_tag = "aro3boat" }, -/obj/structure/prop/tgmc_missile/double, -/turf/simulated/floor/tiled/milspec, -/area/aro3/flight_deck) +/area/shuttle/aroboat3) "Pb" = ( /obj/machinery/light{ dir = 1 @@ -6455,26 +6513,25 @@ /turf/simulated/floor/tiled/milspec, /area/aro3/eva_hall) "QA" = ( -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 10 +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "aro3boat" }, -/obj/structure/prop/tgmc_missile/fatty, -/turf/simulated/floor/tiled/milspec, -/area/aro3/flight_deck) +/area/shuttle/aroboat3) "QB" = ( -/obj/structure/fans/hardlight, +/obj/effect/shuttle_landmark/shuttle_initializer/aroboat3, /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/effect/map_helper/airlock/door/simple, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/voidcraft, -/turf/simulated/floor/tiled/eris/steel/panels, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "aro3boat" + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/aroboat3) "QD" = ( /obj/structure/fans/hardlight, @@ -6766,20 +6823,19 @@ /turf/simulated/floor/reinforced/airless, /area/space) "Tb" = ( -/obj/structure/cable/cyan{ - icon_state = "1-8" - }, -/obj/structure/cable/cyan{ - icon_state = "1-4" - }, -/obj/effect/shuttle_landmark/shuttle_initializer/aroboat3, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 5 }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "aro3boat" + }, +/obj/structure/cable/cyan{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/aroboat3) "Tc" = ( /turf/simulated/wall/tgmc/durawall, @@ -6985,8 +7041,13 @@ /turf/simulated/floor/tiled/milspec, /area/aro3/power) "UE" = ( -/obj/machinery/computer/shuttle_control/explore/aroboat3, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "aro3boat" + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/aroboat3) "UI" = ( /obj/structure/sign/warning/vacuum{ @@ -7055,6 +7116,10 @@ /area/space) "Vg" = ( /obj/structure/fans/hardlight, +/obj/machinery/door/blast/angled{ + dir = 2; + id = "aroshipshutter_ramp" + }, /turf/simulated/floor/reinforced, /area/aro3/flight_deck) "Vk" = ( @@ -7286,9 +7351,7 @@ /turf/simulated/floor/tiled/milspec, /area/aro3/hallway_port) "Xo" = ( -/obj/machinery/ion_engine{ - dir = 1 - }, +/obj/machinery/ion_engine, /turf/space, /area/aro3/engines) "Xp" = ( @@ -7356,16 +7419,13 @@ /turf/simulated/floor/tiled/milspec, /area/aro3/atmos) "XV" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "aro3boat" + }, /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - dir = 8; - frequency = 1380; - id_tag = "aroboat3_docker"; - pixel_x = 25 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, +/turf/simulated/floor/tiled/steel, /area/shuttle/aroboat3) "Yb" = ( /obj/structure/cable/cyan{ @@ -7423,12 +7483,14 @@ /turf/simulated/floor/tiled/techmaint, /area/aro3/medical) "Yq" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" +/obj/machinery/computer/shuttle_control/explore/aroboat3{ + req_one_access = list(777) }, -/obj/effect/floor_decal/milspec/color/red/half, -/turf/simulated/floor/tiled/milspec, -/area/aro3/flight_deck) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "aro3boat" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/aroboat3) "Yt" = ( /obj/structure/closet/crate/bin{ anchored = 1; @@ -7593,6 +7655,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/milspec/stripe{ + dir = 8 + }, /turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "Zv" = ( @@ -7628,6 +7693,9 @@ /obj/structure/cable/cyan{ icon_state = "1-2" }, +/obj/effect/floor_decal/milspec/stripe{ + dir = 8 + }, /turf/simulated/floor/tiled/milspec, /area/aro3/flight_deck) "ZI" = ( @@ -16182,7 +16250,7 @@ eb mI tv on -aq +Uz Px ps xa @@ -17035,15 +17103,15 @@ NC Ty To Iq +Di +QA +QA +QA Pa QA -HE -HE -HE -HE -HE -tz -Hc +Pa +QA +QA md xB Bw @@ -17178,16 +17246,16 @@ Rj lm Iq wq -EH -Fc +QA +QA UE lY zi Cu -HE -gH -Ov -BJ +Cu +QA +QA +ii Vg hD hD @@ -17320,16 +17388,16 @@ mF lm Iq aA -EH -Fc +Pa +Yq bs -XV +FY Tb -eI -HE -gH -Ov -BJ +XV +XV +DA +QA +ii Vg hD hD @@ -17462,16 +17530,16 @@ oz lm Jj gH -EH -HE -HE -HE +QA +QA +it +Al QB -HE -tz -gH -Ov -BJ +xR +eG +QA +QA +ii Vg hD hD @@ -17604,18 +17672,18 @@ Ad LD QD gH -BO -cE -cE -cE +QA +QA +QA +Pa cV -cE -cE -pg -Ov +Pa +QA +QA +QA oe -Ur -Di +nr +hD hD hD Au @@ -17755,9 +17823,9 @@ yy MA MA MA -Yq +pk xG -DA +te te te sV @@ -17898,7 +17966,7 @@ Ov Ov Ov BJ -ke +Vg hD hD hD diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm index ab868eeb13..8f3f370cc4 100644 --- a/maps/tether/submaps/tether_misc.dmm +++ b/maps/tether/submaps/tether_misc.dmm @@ -1675,6 +1675,17 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"fi" = ( +/obj/structure/bed/chair/sofa/bench/right{ + padding_color = "#99AAFF" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "fn" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -1961,12 +1972,16 @@ /obj/structure/flora/grass/both, /turf/simulated/floor/holofloor/snow, /area/holodeck/holodorm/source_snow) -"gE" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +"gv" = ( +/obj/effect/shuttle_landmark{ + base_area = null; + base_turf = null; + docking_controller = null; + landmark_tag = "escape_transit"; + name = "Escape Transit" }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) +/turf/simulated/floor/tiled/techfloor/grid/transit, +/area/space) "gN" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/desert, @@ -1994,12 +2009,18 @@ /obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) -"gX" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 +"he" = ( +/obj/structure/bed/chair/sofa/bench/left{ + dir = 4; + padding_color = "#99AAFF" }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "hg" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/landmark{ @@ -2064,6 +2085,12 @@ "hF" = ( /turf/simulated/floor/holofloor/space, /area/holodeck/holodorm/source_space) +"hI" = ( +/obj/effect/floor_decal/transit/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid/transit, +/area/space) "hJ" = ( /obj/structure/bed/chair/holochair{ dir = 4 @@ -2122,38 +2149,11 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/holodorm/source_boxing) "ig" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - name = "thrower_throwdownside"; - nostop = 1; - stopper = 0; - tiles = 0 - }, /obj/effect/floor_decal/transit/orange{ dir = 4 }, -/obj/effect/transit/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null - }, +/turf/simulated/floor/tiled/techfloor/grid/transit, /area/space) -"ih" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner, -/obj/structure/closet/walllocker_double/hydrant/south, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) -"ii" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "in" = ( /obj/effect/floor_decal/transit/orange{ dir = 8 @@ -2161,10 +2161,7 @@ /obj/effect/transit/light{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null - }, +/turf/simulated/floor/tiled/techfloor/grid/transit, /area/space) "iq" = ( /obj/structure/closet/secure_closet/nanotrasen_security, @@ -2182,17 +2179,8 @@ /obj/effect/transit/light{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null - }, +/turf/simulated/floor/tiled/techfloor/grid/transit, /area/space) -"ix" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "iO" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -2206,26 +2194,32 @@ }, /turf/space/transit/west, /area/space) -"iU" = ( -/obj/structure/table/standard, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "jf" = ( /turf/space/transit/north, /area/space) +"jA" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/bed/chair/sofa/bench/left{ + padding_color = "#99AAFF" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "jL" = ( -/obj/effect/shuttle_landmark{ - base_area = null; - base_turf = null; - docking_controller = null; - landmark_tag = "escape_transit"; - name = "Escape Transit" +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null +/obj/machinery/light{ + dir = 8 }, -/area/space) +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) "jQ" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -2261,7 +2255,7 @@ name = "\improper CentCom Security Arrivals" }) "lf" = ( -/obj/effect/floor_decal/techfloor/orange{ +/obj/effect/floor_decal/transit/orange{ dir = 8 }, /obj/effect/step_trigger/thrower{ @@ -2271,41 +2265,65 @@ stopper = 0; tiles = 0 }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null - }, -/area/space) -"mb" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - name = "thrower_throwdownside"; - nostop = 1; - stopper = 0; - tiles = 0 - }, -/obj/effect/floor_decal/transit/orange{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null - }, -/area/space) -"mF" = ( /obj/effect/transit/light{ dir = 8 }, +/turf/simulated/floor/tiled/techfloor/grid/transit, +/area/space) +"lu" = ( +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; + tiles = 0 + }, +/obj/effect/floor_decal/transit/orange{ + dir = 4 + }, +/obj/effect/transit/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid/transit, +/area/space) +"lW" = ( +/obj/random/forgotten_tram, +/obj/structure/bed/chair/sofa/bench/left{ + dir = 4; + padding_color = "#99AAFF" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) +"mb" = ( /obj/effect/floor_decal/transit/orange{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; + tiles = 0 }, +/turf/simulated/floor/tiled/techfloor/grid/transit, +/area/space) +"mF" = ( +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; + tiles = 0 + }, +/obj/effect/floor_decal/transit/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid/transit, /area/space) "mN" = ( /obj/structure/table/glass, @@ -2322,24 +2340,23 @@ }, /turf/unsimulated/floor/steel, /area/centcom/control) -"nB" = ( -/obj/structure/bed/chair/shuttle{ - dir = 8 +"nz" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/structure/closet/walllocker/medical/west{ + dir = 1; + pixel_x = 0; + pixel_y = -32 }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) -"nC" = ( -/obj/structure/bed/chair/shuttle{ - dir = 8 +/obj/structure/bed/chair/sofa/bench/right{ + dir = 1; + padding_color = "#99AAFF" }, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "nV" = ( /obj/item/toy/chess/rook_black, /turf/simulated/floor/holofloor/wmarble, @@ -2347,10 +2364,42 @@ "nW" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"nZ" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/obj/structure/closet/walllocker/emerglocker/east{ + dir = 2; + pixel_x = 0; + pixel_y = 32 + }, +/obj/structure/bed/chair/sofa/bench/right{ + padding_color = "#99AAFF" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "oI" = ( /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, /turf/space/transit/east, /area/space) +"oL" = ( +/obj/effect/floor_decal/transit/orange{ + dir = 8 + }, +/obj/effect/transit/light{ + dir = 8 + }, +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; + tiles = 0 + }, +/turf/simulated/floor/tiled/techfloor/grid/transit, +/area/space) "oT" = ( /obj/item/toy/chess/pawn_black, /turf/simulated/floor/holofloor/wmarble, @@ -2363,26 +2412,18 @@ /obj/effect/floor_decal/sign/small_8, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) -"pk" = ( -/obj/structure/bed/chair/shuttle{ +"pv" = ( +/obj/effect/floor_decal/techfloor/orange{ dir = 8 }, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) -"pv" = ( -/obj/effect/transit/light{ - dir = 4 - }, -/obj/effect/floor_decal/transit/orange{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; + tiles = 0 }, +/turf/simulated/floor/tiled/techfloor/grid/transit, /area/space) "pz" = ( /obj/machinery/transhuman/resleever, @@ -2397,6 +2438,22 @@ }, /turf/space/transit/east, /area/space) +"pQ" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; + tiles = 0 + }, +/obj/effect/floor_decal/transit/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid/transit, +/area/space) "pT" = ( /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) @@ -2409,10 +2466,26 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/centcom/simulated/terminal) +"qa" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "qc" = ( -/obj/structure/sign/warning/docking_area, -/turf/unsimulated/wall, -/area/centcom/simulated/terminal) +/obj/effect/transit/light{ + dir = 8 + }, +/obj/effect/floor_decal/transit/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid/transit, +/area/space) "qn" = ( /turf/space/transit/east, /area/space) @@ -2432,14 +2505,22 @@ /obj/effect/floor_decal/sign/small_6, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) -"rh" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/borderfloor{ - dir = 1 +"ra" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" }, -/obj/random/forgotten_tram, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) +/obj/structure/closet/walllocker/emerglocker/east{ + dir = 2; + pixel_x = 0; + pixel_y = 32 + }, +/obj/structure/bed/chair/sofa/bench/left{ + padding_color = "#99AAFF" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "ru" = ( /obj/item/toy/chess/pawn_black, /turf/simulated/floor/holofloor/bmarble, @@ -2456,30 +2537,32 @@ /turf/space/internal_edge/top, /area/space) "sp" = ( +/obj/effect/transit/light{ + dir = 4 + }, +/obj/effect/floor_decal/transit/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid/transit, +/area/space) +"st" = ( +/obj/structure/sign/warning/docking_area, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) +"sw" = ( +/obj/effect/step_trigger/lost_in_space/tram, /obj/effect/floor_decal/transit/orange{ dir = 8 }, -/obj/effect/transit/light{ - dir = 8 - }, -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - name = "thrower_throwdownside"; - nostop = 1; - stopper = 0; - tiles = 0 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null - }, +/turf/simulated/floor/tiled/techfloor/grid/transit, /area/space) "sx" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 +/obj/effect/step_trigger/lost_in_space/tram, +/obj/effect/floor_decal/transit/orange{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/centcom/simulated/terminal) +/turf/simulated/floor/tiled/techfloor/grid/transit, +/area/space) "sB" = ( /obj/structure/table/glass, /obj/item/weapon/storage/pill_bottle/spaceacillin, @@ -2489,16 +2572,22 @@ /obj/effect/overmap/bluespace_rift, /turf/unsimulated/map, /area/overmap) +"sH" = ( +/obj/structure/closet/walllocker_double/hydrant/south, +/obj/structure/bed/chair/sofa/bench/right{ + dir = 4; + padding_color = "#99AAFF" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "sN" = ( -/obj/effect/step_trigger/lost_in_space/tram, -/obj/effect/floor_decal/transit/orange{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null - }, -/area/space) +/turf/simulated/floor/maglev, +/area/centcom/simulated/terminal) "sQ" = ( /obj/structure/table/reinforced, /obj/item/weapon/melee/baton/loaded, @@ -2542,30 +2631,49 @@ /turf/space/transit/east, /area/space) "tH" = ( -/obj/effect/floor_decal/transit/orange{ - dir = 8 - }, -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - name = "thrower_throwdownside"; - nostop = 1; - stopper = 0; - tiles = 0 - }, -/obj/effect/transit/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null - }, -/area/space) -"tS" = ( -/obj/structure/bed/chair/shuttle{ +/obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) +/obj/random/forgotten_tram, +/obj/structure/bed/chair/sofa/bench/right{ + padding_color = "#99AAFF" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) +"tL" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/firstaid/o2, +/obj/item/weapon/storage/firstaid/toxin, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) +"tV" = ( +/obj/structure/table/standard, +/obj/random/forgotten_tram, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) +"tW" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE" + }, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) "uc" = ( /turf/unsimulated/wall, /area/centcom/suppy) @@ -2594,12 +2702,30 @@ icon_state = "dark" }, /area/centcom/suppy) +"uj" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) +"uE" = ( +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "escape_shuttle_hatch_station"; + locked = 1; + name = "Shuttle Hatch" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "uG" = ( /obj/effect/step_trigger/lost_in_space/tram, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null - }, +/turf/simulated/floor/tiled/techfloor/grid/transit, /area/space) "uM" = ( /obj/item/toy/chess/knight_black, @@ -2617,12 +2743,6 @@ icon = 'icons/turf/transit_vr.dmi' }, /area/space) -"vz" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "vW" = ( /obj/effect/floor_decal/sign/small_a, /turf/simulated/floor/holofloor/wood, @@ -2688,14 +2808,20 @@ }, /turf/unsimulated/floor/steel, /area/centcom/control) -"xi" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 +"xm" = ( +/obj/machinery/light, +/obj/random/forgotten_tram, +/obj/structure/bed/chair/sofa/bench/right{ + dir = 1; + padding_color = "#99AAFF" }, -/obj/structure/grille, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/escape) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "xu" = ( /obj/structure/sign/painting/public{ pixel_y = 30 @@ -2766,12 +2892,6 @@ }, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) -"yU" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "yV" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/white, @@ -2811,22 +2931,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/centcom/simulated/terminal) -"zw" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "escape_shuttle_hatch_offsite"; - locked = 1; - name = "Shuttle Hatch" - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "zF" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_x = 30 @@ -2835,30 +2939,43 @@ /area/centcom/simulated/security{ name = "\improper CentCom Security Arrivals" }) -"zH" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "zK" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 +/obj/effect/shuttle_landmark{ + base_area = /area/centcom/simulated/terminal; + base_turf = /turf/simulated/floor/tiled/techfloor/grid; + docking_controller = null; + landmark_tag = "escape_cc"; + name = "Escape Centcom" }, -/obj/machinery/light{ - dir = 8 +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "escape_shuttle_hatch_station"; + locked = 1; + name = "Shuttle Hatch" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/centcom/simulated/terminal) -"Al" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "As" = ( -/turf/simulated/floor/maglev, -/area/centcom/simulated/terminal) +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "escape_shuttle_hatch_offsite"; + locked = 1; + name = "Shuttle Hatch" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "Av" = ( /obj/effect/transit/light{ dir = 8 @@ -2877,12 +2994,6 @@ "Az" = ( /turf/unsimulated/beach/coastline, /area/beach) -"AD" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "AK" = ( /obj/machinery/door/airlock/medical{ name = "Operating Theatre"; @@ -2901,14 +3012,6 @@ /obj/item/toy/chess/bishop_black, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) -"Bs" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/escape) "Bw" = ( /turf/unsimulated/beach/water, /area/beach) @@ -2924,31 +3027,9 @@ /turf/space, /turf/space/internal_edge/bottomleft, /area/space) -"Cd" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/grille, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/escape) "Cn" = ( /turf/simulated/sky/virgo3b/south, /area/space) -"Cp" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "escape_shuttle_hatch_station"; - locked = 1; - name = "Shuttle Hatch" - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "Ct" = ( /obj/machinery/ntnet_relay, /turf/unsimulated/floor/steel, @@ -2969,18 +3050,6 @@ }, /turf/unsimulated/wall, /area/centcom/simulated/terminal) -"CD" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) -"CG" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "CJ" = ( /obj/item/toy/chess/pawn_white, /turf/simulated/floor/holofloor/bmarble, @@ -2998,15 +3067,6 @@ }, /turf/simulated/floor/tiled/steel, /area/space) -"Dm" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "Dw" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/food/snacks/chips, @@ -3016,18 +3076,6 @@ /turf/space, /turf/space/internal_edge/topright, /area/space) -"DI" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "DL" = ( /obj/effect/floor_decal/sign/small_b, /turf/simulated/floor/holofloor/wood, @@ -3043,12 +3091,6 @@ /obj/effect/floor_decal/sign/small_g, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) -"Et" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "Eu" = ( /obj/structure/sign/painting/public{ pixel_y = -30 @@ -3064,6 +3106,34 @@ }, /turf/simulated/floor/wood, /area/centcom/simulated/restaurant) +"Ey" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/obj/structure/closet/walllocker/medical/west{ + dir = 1; + pixel_x = 0; + pixel_y = -32 + }, +/obj/structure/bed/chair/sofa/bench/left{ + dir = 1; + padding_color = "#99AAFF" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) +"EC" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/obj/machinery/status_display{ + pixel_x = 34 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "ET" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/centcom/simulated/terminal) @@ -3075,10 +3145,6 @@ /obj/structure/table/standard, /turf/unsimulated/beach/sand, /area/beach) -"Fe" = ( -/obj/structure/sign/nanotrasen, -/turf/simulated/wall/thull, -/area/shuttle/escape) "Fp" = ( /obj/effect/transit/light{ dir = 4 @@ -3088,18 +3154,18 @@ icon_state = "rock" }, /area/space) -"Ft" = ( -/obj/machinery/light{ - dir = 1 +"Fz" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" }, -/obj/machinery/status_display{ - pixel_y = 32 +/obj/structure/bed/chair/sofa/bench/right{ + dir = 8; + padding_color = "#99AAFF" }, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "FC" = ( /turf/simulated/floor/wood, /area/centcom/simulated/bar) @@ -3114,35 +3180,9 @@ }, /turf/unsimulated/beach/sand, /area/beach) -"FJ" = ( -/obj/structure/bed/chair/shuttle, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "FT" = ( -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null - }, +/turf/simulated/floor/tiled/techfloor/grid/transit, /area/space) -"FX" = ( -/obj/effect/step_trigger/lost_in_space/tram, -/obj/effect/floor_decal/transit/orange{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null - }, -/area/space) -"FY" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "Ga" = ( /turf/unsimulated/floor/steel, /area/centcom/control) @@ -3157,12 +3197,6 @@ /obj/effect/overlay/palmtree_l, /turf/unsimulated/beach/sand, /area/beach) -"Gz" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/borderfloor, -/obj/random/forgotten_tram, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "GU" = ( /obj/structure/bed/chair{ dir = 8 @@ -3216,20 +3250,6 @@ /obj/machinery/light, /turf/simulated/floor/wood, /area/centcom/simulated/restaurant) -"HX" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) -"Ic" = ( -/obj/structure/table/standard, -/obj/structure/closet/walllocker/emerglocker/west, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "Ik" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/food/drinks/cans/cola, @@ -3254,21 +3274,13 @@ /turf/unsimulated/floor/steel, /area/centcom/control) "IN" = ( -/obj/effect/floor_decal/transit/orange{ - dir = 8 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" }, -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - name = "thrower_throwdownside"; - nostop = 1; - stopper = 0; - tiles = 0 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null - }, -/area/space) +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "IR" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -3287,20 +3299,6 @@ /obj/item/toy/chess/bishop_white, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) -"Jq" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/firstaid, -/obj/item/toy/nanotrasenballoon, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/o2, -/obj/structure/closet/walllocker/medical/west, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) -"Jw" = ( -/obj/structure/table/standard, -/obj/structure/closet/walllocker/emerglocker/east, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "Jz" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -3386,6 +3384,30 @@ }, /turf/simulated/floor/tiled/steel, /area/space) +"Lm" = ( +/obj/structure/bed/chair/sofa/bench{ + padding_color = "#99AAFF" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) +"Lu" = ( +/obj/structure/closet/walllocker_double/hydrant/north, +/obj/structure/bed/chair/sofa/bench/right{ + dir = 8; + padding_color = "#99AAFF" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "Lz" = ( /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, /turf/simulated/sky/virgo3b/south, @@ -3407,14 +3429,17 @@ /turf/simulated/floor/tiled/white, /area/centcom/simulated/medical) "Mb" = ( -/obj/effect/floor_decal/transit/orange{ - dir = 8 +/obj/structure/bed/chair/sofa/bench/right{ + dir = 4; + padding_color = "#99AAFF" }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" }, -/area/space) +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "Me" = ( /turf/simulated/floor/smole/desert, /area/holodeck/source_smoleworld) @@ -3422,15 +3447,6 @@ /obj/item/toy/chess/bishop_white, /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) -"Mq" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "MB" = ( /obj/machinery/sleeper{ dir = 4 @@ -3458,6 +3474,17 @@ }, /turf/space/transit/east, /area/space) +"MP" = ( +/obj/structure/bed/chair/sofa/bench/left{ + padding_color = "#99AAFF" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "Nj" = ( /obj/item/clothing/head/collectable/paper, /turf/unsimulated/beach/sand, @@ -3494,6 +3521,18 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/centcom/simulated/terminal) +"NC" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/obj/structure/bed/chair/sofa/bench/left{ + dir = 8; + padding_color = "#99AAFF" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "NJ" = ( /obj/structure/table/reinforced, /obj/item/weapon/reagent_containers/food/drinks/flask/barflask, @@ -3502,13 +3541,17 @@ /turf/simulated/floor/wood, /area/centcom/simulated/bar) "NW" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'HIGH VOLTAGE'"; - icon_state = "shock"; - name = "HIGH VOLTAGE" +/obj/machinery/light{ + dir = 8 }, -/turf/unsimulated/wall, -/area/centcom/simulated/terminal) +/obj/random/forgotten_tram, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "Oj" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -3534,12 +3577,6 @@ "OY" = ( /turf/unsimulated/map, /area/overmap) -"Pe" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "Pf" = ( /obj/structure/table/woodentable{ dir = 5 @@ -3549,12 +3586,6 @@ }, /turf/simulated/floor/tiled, /area/centcom/simulated/terminal) -"Pg" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "Pi" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -3565,40 +3596,79 @@ }, /turf/space/transit/west, /area/space) +"Pk" = ( +/obj/effect/fancy_shuttle/orangeline{ + dir = 1; + fancy_shuttle_tag = "tram"; + plane = -50 + }, +/obj/effect/fancy_shuttle_floor_preview/orangeline{ + dir = 1; + plane = -45 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) +"Pn" = ( +/obj/structure/bed/chair/sofa/bench{ + dir = 1; + padding_color = "#99AAFF" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "Pq" = ( /obj/machinery/vending/coffee{ dir = 1 }, /turf/simulated/floor/wood, /area/centcom/simulated/restaurant) -"Py" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - name = "thrower_throwdownside"; - nostop = 1; - stopper = 0; - tiles = 0 - }, -/obj/effect/floor_decal/transit/orange{ +"Pr" = ( +/obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" }, -/area/space) +/obj/structure/table/standard, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) +"Py" = ( +/obj/structure/bed/chair/sofa/bench/left{ + dir = 1; + padding_color = "#99AAFF" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "PM" = ( /turf/simulated/floor/smole/megablocks, /area/holodeck/source_smoleworld) "PU" = ( -/obj/effect/floor_decal/transit/orange{ - dir = 4 +/obj/structure/bed/chair/sofa/bench/right{ + dir = 1; + padding_color = "#99AAFF" }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" }, -/area/space) +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "Qo" = ( /obj/machinery/vending/sovietsoda{ dir = 1 @@ -3621,51 +3691,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/centcom/simulated/terminal) -"Rd" = ( -/obj/structure/bed/chair/shuttle, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) -"Rg" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "escape_shuttle_hatch_station"; - locked = 1; - name = "Shuttle Hatch" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) -"Ri" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) -"Rk" = ( -/obj/structure/bed/chair/shuttle{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) -"Rm" = ( -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) -"Ro" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "Rq" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -3688,16 +3713,6 @@ }, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) -"Rs" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/structure/closet/walllocker_double/hydrant/north, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "Ru" = ( /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) @@ -3724,45 +3739,26 @@ }, /turf/simulated/floor/tiled/white, /area/centcom/simulated/medical) -"Rz" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "RA" = ( -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) -"RC" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) -"RD" = ( -/obj/structure/bed/chair/shuttle{ - dir = 8 +/obj/machinery/light, +/obj/structure/bed/chair/sofa/bench/left{ + dir = 1; + padding_color = "#99AAFF" }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) -"RE" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) +"RN" = ( +/turf/simulated/wall/fancy_shuttle/window{ + fancy_shuttle_tag = "tram" }, -/obj/structure/closet/walllocker_double/hydrant/south, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) -"RF" = ( -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) -"RG" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "RV" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -3776,16 +3772,6 @@ }, /turf/simulated/sky/virgo3b/south, /area/space) -"RY" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/structure/closet/walllocker_double/hydrant/north, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "Sf" = ( /obj/structure/table/reinforced, /obj/machinery/chemical_dispenser/bar_alc/full, @@ -3799,17 +3785,8 @@ stopper = 0; tiles = 0 }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null - }, +/turf/simulated/floor/tiled/techfloor/grid/transit, /area/space) -"Sl" = ( -/obj/structure/bed/chair/shuttle{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "Sm" = ( /turf/simulated/shuttle/wall/alien/blue/hard_corner, /area/unknown/dorm4) @@ -3852,15 +3829,6 @@ /obj/structure/fans, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm4) -"Sy" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "Sz" = ( /obj/machinery/smartfridge/survival_pod, /obj/item/weapon/storage/mre/menu11, @@ -3913,15 +3881,6 @@ /obj/structure/prop/alien/dispenser, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm4) -"SG" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "SH" = ( /obj/structure/bed/chair{ dir = 8 @@ -4091,13 +4050,6 @@ /obj/effect/overlay/coconut, /turf/unsimulated/beach/sand, /area/beach) -"Tv" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "Tx" = ( /obj/structure/prop/alien/dispenser, /turf/simulated/shuttle/floor/alien, @@ -4168,6 +4120,19 @@ /obj/machinery/recharge_station, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm2) +"TO" = ( +/obj/structure/bed/chair/sofa/bench/left{ + dir = 8; + padding_color = "#99AAFF" + }, +/obj/random/forgotten_tram, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "TP" = ( /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm2) @@ -4329,6 +4294,17 @@ "Ux" = ( /turf/simulated/shuttle/wall/alien, /area/unknown/dorm1) +"Uy" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/obj/machinery/status_display{ + pixel_x = -34 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "Uz" = ( /obj/machinery/recharge_station, /turf/simulated/shuttle/floor/alienplating, @@ -4484,12 +4460,6 @@ "Vd" = ( /turf/unsimulated/wall, /area/centcom/simulated/medical) -"Ve" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "Vf" = ( /obj/machinery/door/airlock{ name = "Unit 4" @@ -4634,12 +4604,6 @@ }, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/evac) -"VK" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "VL" = ( /obj/effect/floor_decal/steeldecal/steel_decals9, /turf/simulated/floor/tiled, @@ -4668,14 +4632,6 @@ "VQ" = ( /turf/simulated/floor/wood, /area/centcom/simulated/restaurant) -"VR" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/escape) "VS" = ( /obj/effect/floor_decal/corner_steel_grid/diagonal, /obj/effect/floor_decal/industrial/warning/dust/corner{ @@ -4778,21 +4734,6 @@ }, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/living) -"Wt" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/shuttle_landmark{ - base_area = /area/centcom/simulated/terminal; - base_turf = /turf/simulated/floor/tiled/techfloor/grid; - docking_controller = null; - landmark_tag = "escape_cc"; - name = "Escape Centcom" - }, -/obj/structure/grille, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/escape) "Wz" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/food/snacks/pastatomato, @@ -4840,11 +4781,6 @@ }, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) -"WF" = ( -/obj/structure/table/standard, -/obj/random/forgotten_tram, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "WH" = ( /obj/structure/bed/chair/wood/wings{ dir = 1 @@ -4897,33 +4833,10 @@ "WS" = ( /turf/simulated/floor/tiled/white, /area/centcom/simulated/medical) -"WT" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/borderfloor, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) -"WU" = ( -/obj/structure/bed/chair/shuttle{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) -"WV" = ( -/obj/effect/floor_decal/borderfloor, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "WW" = ( /obj/item/weapon/stool/padded, /turf/simulated/floor/wood, /area/centcom/simulated/bar) -"WZ" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "Xa" = ( /obj/structure/bed/chair/wood/wings{ dir = 4 @@ -5000,10 +4913,6 @@ }, /turf/simulated/floor/tiled/white, /area/centcom/simulated/medical) -"Xn" = ( -/obj/effect/floor_decal/borderfloor, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "Xp" = ( /obj/structure/toilet{ dir = 8 @@ -5013,10 +4922,6 @@ }, /turf/simulated/floor/tiled/white, /area/centcom/simulated/bathroom) -"Xr" = ( -/obj/effect/floor_decal/borderfloor/corner, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "Xv" = ( /obj/machinery/vending/cigarette{ dir = 1 @@ -5038,22 +4943,6 @@ /area/centcom/simulated/security{ name = "\improper CentCom Security Arrivals" }) -"Xy" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "escape_shuttle_hatch_offsite"; - locked = 1; - name = "Shuttle Hatch" - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "Xz" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -5103,9 +4992,6 @@ /area/centcom/simulated/security{ name = "\improper CentCom Security Arrivals" }) -"XE" = ( -/turf/simulated/wall/thull, -/area/shuttle/escape) "XH" = ( /obj/structure/bed/chair{ dir = 8 @@ -5185,15 +5071,6 @@ /area/centcom/simulated/security{ name = "\improper CentCom Security Arrivals" }) -"XW" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "XX" = ( /obj/machinery/light{ dir = 4 @@ -5483,14 +5360,6 @@ /obj/effect/floor_decal/sign/small_e, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) -"YY" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/o2, -/obj/structure/closet/walllocker/medical/east, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "YZ" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -5621,15 +5490,6 @@ "Zt" = ( /turf/simulated/floor/tiled/steel_grid, /area/centcom/simulated/terminal) -"Zw" = ( -/obj/machinery/status_display{ - pixel_y = -30 - }, -/obj/structure/bed/chair/shuttle{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) "Zx" = ( /obj/machinery/light, /turf/simulated/floor/tiled/white, @@ -5648,20 +5508,13 @@ }, /turf/simulated/floor/wood, /area/centcom/simulated/restaurant) -"ZD" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) "ZE" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor{ - dir = 6 +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "tram" }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "ZF" = ( /obj/machinery/vending/cola{ dir = 1 @@ -10083,48 +9936,48 @@ Xl (32,1,1) = {" Hy Hy -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap Hy ap ap @@ -10225,47 +10078,47 @@ Xl (33,1,1) = {" Hy Hy -Mb -Mb -in -Mb -Mb -Mb -tH -IN -IN -IN -tH -IN -IN -IN -tH -IN -IN -IN -sp -lf -IN -IN -sp -IN -IN -IN -sp -IN -IN -IN -sp -Mb -Mb -Mb -mF -Mb -Mb -Mb -in -sN -Mb +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg dg Av ap @@ -10367,47 +10220,47 @@ Xl (34,1,1) = {" Hy Hy -FT -FT -FT -FT -FT -FT -Sh -Sh -Sh -Sh -Sh -FT -FT -FT -FT -FT -FT -FT -jL -FT -FT -FT -FT -FT -FT -FT -Sh -Sh -Sh -Sh -Sh -FT -FT -FT -FT -FT -FT -FT -FT -uG -FT +hI +hI +in +hI +hI +hI +lf +mb +mb +mb +lf +mb +mb +mb +lf +mb +mb +mb +oL +pv +mb +mb +oL +mb +mb +mb +oL +mb +mb +mb +oL +hI +hI +hI +qc +hI +hI +hI +in +sw +hI dg Hy ap @@ -10518,6 +10371,11 @@ FT Sh Sh Sh +Sh +Sh +FT +FT +gv FT FT FT @@ -10531,12 +10389,7 @@ FT FT FT FT -FT -FT -FT -FT -FT -FT +Sh Sh Sh Sh @@ -10659,6 +10512,9 @@ cq cq vu vu +vu +vu +vu cq cq cq @@ -10675,11 +10531,8 @@ cq cq cq cq -cq -cq -cq -cq -cq +vu +vu vu vu cq @@ -10800,6 +10653,10 @@ FT FT FT Sh +Sh +Sh +Sh +Sh FT FT FT @@ -10816,13 +10673,9 @@ FT FT FT FT -FT -FT -FT -FT -FT -FT -FT +Sh +Sh +Sh Sh FT FT @@ -10942,6 +10795,10 @@ FT FT FT Sh +Sh +Sh +Sh +Sh FT FT FT @@ -10958,13 +10815,9 @@ FT FT FT FT -FT -FT -FT -FT -FT -FT -FT +Sh +Sh +Sh Sh FT FT @@ -11084,6 +10937,10 @@ FT FT FT Sh +Sh +Sh +Sh +Sh FT FT FT @@ -11100,13 +10957,9 @@ FT FT FT FT -FT -FT -FT -FT -FT -FT -FT +Sh +Sh +Sh Sh FT FT @@ -11226,6 +11079,10 @@ FT FT FT Sh +Sh +Sh +Sh +Sh FT FT FT @@ -11242,13 +11099,9 @@ FT FT FT FT -FT -FT -FT -FT -FT -FT -FT +Sh +Sh +Sh Sh FT FT @@ -11368,6 +11221,10 @@ FT FT FT Sh +Sh +Sh +Sh +Sh FT FT FT @@ -11384,13 +11241,9 @@ FT FT FT FT -FT -FT -FT -FT -FT -FT -FT +Sh +Sh +Sh Sh FT FT @@ -11511,6 +11364,9 @@ cq cq vu vu +vu +vu +vu cq cq cq @@ -11527,11 +11383,8 @@ cq cq cq cq -cq -cq -cq -cq -cq +vu +vu vu vu cq @@ -11654,6 +11507,8 @@ FT Sh Sh Sh +Sh +Sh FT FT FT @@ -11670,9 +11525,7 @@ FT FT FT FT -FT -FT -FT +Sh Sh Sh Sh @@ -11787,47 +11640,47 @@ Xl (44,1,1) = {" Hy Hy -FT -FT -FT -FT -FT -FT -Sh -Sh -Sh -Sh -Sh -FT -FT -FT -FT -FT -FT -FT -FT -FT -FT -FT -FT -FT -FT -FT -Sh -Sh -Sh -Sh -Sh -FT -FT -FT -FT -FT -FT -FT -FT -uG -FT +ig +ig +is +ig +ig +ig +lu +mF +mF +mF +lu +mF +mF +mF +lu +mF +mF +mF +lu +pQ +mF +mF +lu +mF +mF +mF +lu +mF +mF +mF +lu +ig +ig +ig +sp +ig +ig +ig +is +sx +ig dg Hy ap @@ -11929,47 +11782,47 @@ Xl (45,1,1) = {" Hy Hy -PU -PU -is -PU -PU -PU -ig -Py -Py -Py -ig -Py -Py -Py -ig -Py -Py -Py -ig -mb -Py -Py -ig -Py -Py -Py -ig -Py -Py -Py -ig -PU -PU -PU -pv -PU -PU -PU -is -FX -PU +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg dg Fp ap @@ -12071,48 +11924,48 @@ Xl (46,1,1) = {" Hy Hy -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap Hy ap ap @@ -16795,35 +16648,35 @@ ae ae ae ae -qc -dZ -dZ -dZ -dZ -dZ -dZ -dZ -dZ -NW -dZ -dZ -dZ -dZ -dZ -dZ -dZ -dZ -dZ -dZ -dZ -NW -dZ -dZ -dZ -dZ -dZ -dZ -CC +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae ae ae ae @@ -16937,35 +16790,35 @@ ae ae ae ae -sT -sx -sx -sx -zK -sx -sx -sx -sx -zK -sx -sx -sx -sx -zK -sx -sx -sx -sx -zK -sx -sx -sx -sx -zK -sx -sx -sx -sT +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae ae ae ae @@ -17079,35 +16932,35 @@ ae ae ae ae -sT -ET -ET -ET -ET -ET -ET -XE -XE -Rg -XE -Fe -Cp -Bs -Wt -Bs -Cp -Fe -XE -Rg -XE -XE -ET -ET -ET -ET -ET -ET -sT +st +dZ +dZ +dZ +dZ +dZ +dZ +dZ +dZ +tW +dZ +dZ +dZ +dZ +dZ +dZ +dZ +dZ +dZ +dZ +dZ +tW +dZ +dZ +dZ +dZ +dZ +dZ +CC ae ae ae @@ -17222,33 +17075,33 @@ ae ae ae sT -ET -ET -ET -ET -XE -XE -XE -XE -Rs -yU -SG -gE -yU -Rm -ix -gE -Mq -ix -ih -XE -XE -XE -XE -ET -ET -ET -ET +uj +uj +uj +jL +uj +uj +uj +uj +jL +uj +uj +uj +uj +jL +uj +uj +uj +uj +jL +uj +uj +uj +uj +jL +uj +uj +uj sT ae ae @@ -17364,33 +17217,33 @@ ae ae ae sT -As -As -As -XE -Fe -FJ -Jq -Sl -Al -HX -XW -Ve -XW -XW -XW -Ve -XW -FY -Xn -FJ -Ic -Zw -XE -XE -As -As -As +ET +ET +ET +ET +ET +ET +ZE +ZE +zK +ZE +RN +RN +ZE +RN +RN +ZE +RN +RN +ZE +uE +ZE +Pk +ET +ET +ET +ET +ET sT ae ae @@ -17506,33 +17359,33 @@ ae ae ae sT -ET -ET -XE -XE -XE -DI -RG -RG -Pe -Ri -WF -RA -WF -iU -iU -RA -WF -WT -ii -RG -RG -ZD -Fe -XE -XE -ET -ET +sN +sN +sN +sN +sN +sN +ZE +tL +IN +ZE +lW +Mb +NW +he +Mb +qa +he +sH +ZE +IN +tL +ZE +sN +sN +sN +sN +sN sT ae ae @@ -17650,29 +17503,29 @@ ae sT ET ET -xi -Pg -zH -Pe -Rd -Rd -Rm -Rk -RD +ET +ET +ET +ET +ZE +tH +IN +ZE +IN +IN +IN +IN +IN +IN +IN +IN +ZE +IN RA -RD -RD -RD -RA -RD -WU -Rm -tS -tS -ii -CD -Pg -Cd +ZE +ET +ET +ET ET ET sT @@ -17792,29 +17645,29 @@ ae sT ET ET -xi -WF -Al -Rm -RF -RF -Rm -vz -RA -RA -RA -RA -RA -RA -RA -WV -Rm -RF -RF -Rm -Xn -WF -Cd +ET +ET +ET +ET +ZE +ra +IN +Uy +IN +fi +tV +Py +fi +tV +Py +IN +Uy +IN +nz +ZE +ET +ET +ET ET ET sT @@ -17934,29 +17787,29 @@ ae sT ET ET -xi -RD -CG -Et -Rd -Rd -Rm -Sy -Pg -RA -Pg -Pg -Pg -RA -Pg -WZ -Rm -tS -tS -Xr -gX -RD -Cd +ET +ET +ET +ET +ZE +IN +IN +IN +IN +Lm +tV +Pn +Lm +tV +Pn +IN +IN +IN +IN +ZE +ET +ET +ET ET ET sT @@ -18076,29 +17929,29 @@ ae sT ET ET -XE -XE -XE -Ft -AD -AD -Et -rh -iU -RA -iU -WF -iU -RA -iU -Gz -Xr -AD -AD +ET +ET +ET +ET ZE -Fe -XE -XE +nZ +IN +EC +IN +MP +tV +PU +MP +tV +PU +IN +EC +IN +Ey +ZE +ET +ET +ET ET ET sT @@ -18216,33 +18069,33 @@ ae ae ae sT -As -As -As -XE -Fe -FJ -Jw -Sl -Al -nC -nB -VK -nB -nB -nB -VK -nB -pk -Xn -FJ -YY -Zw -XE -XE -As -As -As +ET +ET +ET +ET +ET +ET +ZE +jA +IN +ZE +IN +IN +IN +IN +IN +IN +IN +IN +ZE +IN +xm +ZE +ET +ET +ET +ET +ET sT ae ae @@ -18358,33 +18211,33 @@ ae ae ae sT -ET -ET -ET -ET -XE -XE -XE -XE -RY -Rz -Tv -Ro -Rz -Rm -RC -Ro -Dm -RC -RE -XE -XE -XE -XE -ET -ET -ET -ET +sN +sN +sN +sN +sN +sN +ZE +tV +IN +ZE +Lu +NC +Pr +Fz +NC +Pr +Fz +TO +ZE +IN +tV +ZE +sN +sN +sN +sN +sN sT ae ae @@ -18506,22 +18359,22 @@ ET ET ET ET -XE -XE -zw -XE -Fe -zw -VR -VR -VR -zw -Fe -XE -Xy -XE -XE -ET +ZE +ZE +As +ZE +RN +RN +ZE +RN +RN +ZE +RN +RN +ZE +As +ZE +ZE ET ET ET @@ -18648,6 +18501,7 @@ Rc zv pX pX +pX LD NA NA @@ -18661,7 +18515,6 @@ NA NA NA NA -NA YZ pX pX diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 44ba3e7e5c..ee8a16e6ad 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -3469,7 +3469,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "afH" = ( -/turf/simulated/floor/maglev, +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "afI" = ( /obj/item/device/radio/intercom{ @@ -11606,6 +11609,9 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 4 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "atD" = ( @@ -11857,11 +11863,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "aua" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 +/obj/effect/shuttle_landmark{ + base_area = /area/tether/surfacebase/tram; + base_turf = /turf/simulated/floor/tiled/techfloor/grid; + docking_controller = null; + landmark_tag = "escape_station"; + name = "Tether Surface Base" }, /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) @@ -21276,14 +21283,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/tram) "aJq" = ( -/obj/effect/shuttle_landmark{ - base_area = /area/tether/surfacebase/tram; - base_turf = /turf/simulated/floor/tiled/techfloor/grid; - docking_controller = null; - landmark_tag = "escape_station"; - name = "Tether Surface Base" - }, -/turf/simulated/floor/tiled/techfloor/grid, +/turf/simulated/floor/maglev, /area/tether/surfacebase/tram) "aJr" = ( /obj/effect/floor_decal/borderfloor{ @@ -55657,16 +55657,15 @@ aFU atA atA atA -atA aJp aub aub aub +aub wXW atA atA atA -atA mtl auc auc @@ -55674,6 +55673,7 @@ auc auc auc auc +auc auD aad aad @@ -55796,13 +55796,13 @@ aud aud aud aud +aua aud aud aud aud aud aud -aJq aud aud aud @@ -55930,34 +55930,34 @@ baU aah aah auD -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq auD aad aad @@ -56072,34 +56072,34 @@ baU aah aah auD -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud auD aad aad @@ -56782,34 +56782,34 @@ aad aad aah auD -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq +aJq auD aad aad @@ -56924,34 +56924,34 @@ aad aad aah auD -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH -afH +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud auD aad aad @@ -57066,34 +57066,34 @@ aad aad aah auD -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud +afH +afH +afH +afH +atC +afH +afH +afH +afH +aue +atC +afH +afH +afH +atC +afH +afH +afH +atC +aue +afH +afH +afH +atC +afH +afH +afH +afH auD aad aad @@ -57207,36 +57207,36 @@ aad aad aad aad -auD -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -auD +aty +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +aty aad aad aad @@ -57349,36 +57349,36 @@ aad aad aad aad -auD -atC -atC -atC -atC -aua -atC -atC -atC -atC -aue -aua -atC -atC -atC -aua -atC -atC -atC -aua -aue -atC -atC -atC -aua -atC -atC -atC -atC -auD +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad aad aad aad @@ -57491,36 +57491,36 @@ aad aad aad aad -aty -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -atx -aty +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad +aad aad aad aad diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index b5b680db24..1bc9dec295 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -27204,9 +27204,11 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/lower/third_south) "aUq" = ( -/obj/effect/floor_decal/rust/part_rusted1, /obj/machinery/atmospherics/binary/pump, -/turf/simulated/floor/tiled/eris/dark/golden, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "aUr" = ( /obj/structure/disposalpipe/segment{ @@ -27264,7 +27266,10 @@ /obj/structure/bed/chair/bay/chair{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/golden, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "aUy" = ( /obj/machinery/door/firedoor/glass, @@ -27352,15 +27357,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) -"aUE" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 8 - }, -/obj/structure/closet/emergsuit_wall{ - pixel_x = 32 - }, -/turf/simulated/floor/tiled/eris/dark/golden, -/area/shuttle/tourbus/general) "aUF" = ( /turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) @@ -27428,20 +27424,13 @@ /area/tether/surfacebase/public_garden_three) "aUN" = ( /obj/structure/bed/chair/bay/chair{ - dir = 1 + dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; - req_access = list(); - req_one_access = list(11,67) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/eris/white/orangecorner, -/area/shuttle/tourbus/cockpit) +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) "aUO" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -27472,13 +27461,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"aUQ" = ( -/obj/structure/handrail{ - dir = 8 - }, -/obj/machinery/light/small, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/tourbus/general) "aUR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27753,15 +27735,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) -"aVm" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow, -/turf/simulated/floor/tiled/eris/dark/golden, -/area/shuttle/tourbus/general) "aVn" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -27988,21 +27961,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"aVF" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - dir = 8; - frequency = 1380; - id_tag = "tourbus_docker"; - pixel_x = 28 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/obj/structure/bed/chair/bay/chair{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/golden, -/area/shuttle/tourbus/general) "aVG" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -28041,10 +27999,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/upperhall) -"aVJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow, -/turf/simulated/wall/shull, -/area/shuttle/tourbus/general) "aVK" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -28074,18 +28028,6 @@ /obj/structure/sign/poster, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"aVM" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/door/window/southleft{ - dir = 1; - req_one_access = list(19,43,67) - }, -/turf/simulated/floor/tiled/eris/dark/bluecorner, -/area/shuttle/tourbus/general) "aVN" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -28205,22 +28147,6 @@ }, /turf/simulated/wall, /area/tether/surfacebase/security/upperhall) -"aWc" = ( -/obj/machinery/light/small, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 9 - }, -/obj/machinery/door/window/southright{ - dir = 1; - req_one_access = list(19,43,67) - }, -/turf/simulated/floor/tiled/eris/dark/bluecorner, -/area/shuttle/tourbus/general) "aWd" = ( /obj/effect/landmark/start{ name = "Medical Doctor" @@ -28595,39 +28521,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) -"aWK" = ( -/obj/machinery/power/smes/buildable{ - charge = 500000 - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/bluecorner, -/area/shuttle/tourbus/general) -"aWL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/bed/chair/bay/chair{ - dir = 4 - }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28; - req_access = list(); - req_one_access = list(11,67) - }, -/turf/simulated/floor/tiled/eris/dark/golden, -/area/shuttle/tourbus/general) "aWM" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/grass, @@ -28659,20 +28552,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"aWP" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "tourbus_windows"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/tiled/steel_dirty, -/area/shuttle/tourbus/general) "aWQ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -28746,14 +28625,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) -"aWX" = ( -/obj/machinery/shipsensors{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/light/small, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/tourbus/general) "aWY" = ( /obj/structure/bed/chair{ dir = 1 @@ -28774,15 +28645,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "aXa" = ( -/obj/machinery/door/airlock/glass{ - req_one_access = list(19,43,67) - }, /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + icon_state = "1-8" }, -/turf/simulated/floor/tiled/eris/techmaint_panels, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "aXb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -31662,11 +31531,19 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "bbX" = ( -/obj/machinery/atmospherics/unary/engine{ +/obj/effect/fancy_shuttle_floor_preview/tourbus{ dir = 1 }, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, +/obj/effect/fancy_shuttle/tourbus{ + dir = 1; + fancy_shuttle_tag = "tourbus" + }, +/obj/machinery/atmospherics/unary/engine/fancy_shuttle{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "tourbus" + }, /area/shuttle/tourbus/general) "bbY" = ( /obj/structure/cable/green{ @@ -36233,22 +36110,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/resleeving) -"bkN" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "tourbus_windows"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/tourbus/general) "bkO" = ( /obj/machinery/transhuman/resleever, /turf/simulated/floor/tiled/dark, @@ -37948,35 +37809,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) -"caw" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central5{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals_central5{ - dir = 8 - }, -/obj/machinery/door/airlock/glass_external/public{ - frequency = 1380; - id_tag = "tourbus_right" - }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/obj/effect/map_helper/airlock/door/simple, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "tourbus_windows"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/tourbus/general) "cbn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -38003,14 +37835,66 @@ /obj/item/weapon/storage/secure/briefcase, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) +"ccN" = ( +/obj/machinery/button/remote/airlock{ + desiredstate = 1; + id = "tourbus_left"; + name = "hatch bolt control"; + pixel_x = 4; + pixel_y = 30; + req_one_access = list(19,43,67); + specialfunctions = 4 + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "tourbus_windows"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/airlock/angled_tgmc/security_glass{ + dir = 4; + icon_state = "door_locked"; + id_tag = "tourbus_left"; + locked = 1; + name = "tourbus airlock" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) +"cdf" = ( +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/area/shuttle/tourbus/cockpit) "cdv" = ( /obj/structure/cable/orange{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/obj/effect/map_helper/airlock/door/simple, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "tourbus_windows"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/airlock/angled_tgmc/security_glass{ + dir = 4; + name = "tourbus airlock" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/shuttle_pad) +/area/shuttle/tourbus/general) "ceN" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -38034,15 +37918,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"cnN" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 4 - }, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/eris/dark/golden, -/area/shuttle/tourbus/general) "cnO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -38057,15 +37932,6 @@ }, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) -"cnZ" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 4 - }, -/obj/structure/closet/emergsuit_wall{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/eris/dark/golden, -/area/shuttle/tourbus/general) "cpd" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -38210,6 +38076,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/library) +"cUF" = ( +/obj/machinery/computer/shuttle_control/explore/tourbus, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/cockpit) "cVg" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -38276,6 +38152,20 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) +"daD" = ( +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/tether/surfacebase/shuttle_pad) "daN" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -38318,27 +38208,54 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) +"ddb" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/shuttle_pad) "ddn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ +/obj/structure/bed/chair/bay/chair{ dir = 1 }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "tourbus_windows"; - name = "Shuttle Blast Doors"; - opacity = 0 +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -28; + req_access = list(); + req_one_access = list(11,67) }, -/turf/simulated/floor/plating/eris/under, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) "dgA" = ( /obj/structure/flora/bboulder2, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) +"diF" = ( +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/shuttle_pad) "djy" = ( /obj/machinery/door/airlock{ name = "Unit 3" @@ -38521,7 +38438,10 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/golden, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "dVZ" = ( /obj/structure/table/woodentable, @@ -38601,9 +38521,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) -"eiO" = ( -/turf/simulated/floor/tiled/eris/dark/golden, -/area/shuttle/tourbus/general) "ely" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -38611,6 +38528,21 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) +"eqZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/shuttle_pad) "erS" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 10 @@ -38639,10 +38571,6 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) -"eCG" = ( -/obj/machinery/computer/ship/helm, -/turf/simulated/floor/tiled/eris/white/orangecorner, -/area/shuttle/tourbus/cockpit) "eCP" = ( /obj/structure/cable/green{ d1 = 4; @@ -38673,13 +38601,11 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "eGv" = ( -/obj/structure/fuel_port{ - pixel_x = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/yellow, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 6 - }, -/turf/simulated/floor/tiled/eris/steel/danger, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "eHk" = ( /obj/structure/sign/nosmoking_2{ @@ -38778,6 +38704,33 @@ /obj/machinery/vending/sovietsoda, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) +"fag" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/bed/chair/bay/chair{ + dir = 4 + }, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28; + req_access = list(); + req_one_access = list(11,67) + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) "faL" = ( /obj/structure/lattice, /obj/structure/cable/orange{ @@ -38787,13 +38740,26 @@ /turf/simulated/open, /area/tether/surfacebase/southhall) "fcg" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 8 +/obj/effect/shuttle_landmark{ + base_area = /area/tether/surfacebase/shuttle_pad; + base_turf = /turf/simulated/floor/reinforced; + docking_controller = "tourbus_pad"; + landmark_tag = "tourbus_dock"; + name = "Tourbus Pad" }, -/obj/machinery/light/small{ +/obj/effect/overmap/visitable/ship/landable/tourbus, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/golden, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "feu" = ( /obj/machinery/alarm{ @@ -38894,6 +38860,18 @@ "fzy" = ( /turf/simulated/wall, /area/tether/surfacebase/security/iaa/officecommon) +"fEX" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) "fGm" = ( /obj/machinery/door/airlock/glass_security{ name = "Briefing Room"; @@ -38909,6 +38887,20 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"fJJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/obj/machinery/power/terminal, +/obj/structure/cable/orange, +/obj/structure/bed/chair/bay/chair{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) "fLx" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -38934,6 +38926,28 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) +"fNO" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 8; + frequency = 1380; + id_tag = "tourbus_docker"; + pixel_x = 28 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/obj/structure/bed/chair/bay/chair{ + dir = 8 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) "fOj" = ( /obj/structure/disposalpipe/sortjunction/flipped{ dir = 1; @@ -38956,6 +38970,14 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) +"fWR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 10 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/area/shuttle/tourbus/general) "gfg" = ( /obj/machinery/light{ dir = 8 @@ -38994,6 +39016,12 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) +"gjD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/area/shuttle/tourbus/general) "gnE" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -39076,33 +39104,78 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"gBr" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/machinery/door/window/southleft{ + dir = 1; + req_one_access = list(19,43,67) + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) "gCV" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) -"gHh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 10 +"gCZ" = ( +/obj/machinery/light/small, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/turf/simulated/wall/shull, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 9 + }, +/obj/machinery/door/window/southright{ + dir = 1; + req_one_access = list(19,43,67) + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) +"gHc" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "gLd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/machinery/power/smes/buildable{ + charge = 500000 }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/shuttle_pad) +/area/shuttle/tourbus/general) "gLg" = ( /obj/machinery/holoposter{ dir = 8; @@ -39120,6 +39193,11 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) +"gQb" = ( +/turf/simulated/wall/fancy_shuttle/window{ + fancy_shuttle_tag = "tourbus" + }, +/area/shuttle/tourbus/general) "gRG" = ( /obj/structure/closet/hydrant{ pixel_x = -32 @@ -39141,13 +39219,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "gUL" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 8 +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, -/obj/effect/floor_decal/rust/part_rusted1{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/golden, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "gVg" = ( /obj/structure/cable/green{ @@ -39237,11 +39320,11 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_hallway) -"hlF" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 1 +"hjt" = ( +/obj/machinery/shipsensors/fancy_shuttle, +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "tourbus" }, -/turf/simulated/floor/tiled/eris/white/orangecorner, /area/shuttle/tourbus/cockpit) "hoQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -39254,6 +39337,14 @@ /obj/effect/floor_decal/emblem/nt1, /turf/simulated/floor/tiled/dark, /area/bridge) +"hpY" = ( +/obj/machinery/atmospherics/unary/engine/fancy_shuttle{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "tourbus" + }, +/area/shuttle/tourbus/general) "hth" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light{ @@ -39350,17 +39441,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"hHL" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 2 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/shuttle_pad) "hId" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -39540,11 +39620,17 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/upperhall) "ivq" = ( -/obj/machinery/computer/ship/engines{ +/obj/structure/bed/chair/bay/chair{ dir = 8 }, -/turf/simulated/floor/tiled/eris/white/orangecorner, -/area/shuttle/tourbus/cockpit) +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) "iFr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -39699,7 +39785,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 6 }, -/turf/simulated/wall/shull, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, /area/shuttle/tourbus/general) "jrn" = ( /obj/structure/cable/green{ @@ -39727,7 +39815,19 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "jvK" = ( -/turf/simulated/wall/shull, +/obj/structure/table/standard, +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 + }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "tourbus_windows"; + name = "window blast shields" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) "jAt" = ( /obj/structure/cable/green{ @@ -39792,6 +39892,11 @@ }, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) +"jER" = ( +/turf/simulated/wall/fancy_shuttle/window{ + fancy_shuttle_tag = "tourbus" + }, +/area/shuttle/tourbus/cockpit) "jFq" = ( /obj/structure/table/reinforced, /obj/item/weapon/folder{ @@ -39841,9 +39946,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"jHw" = ( -/turf/simulated/wall/shull, -/area/shuttle/tourbus/general) "jJd" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -39892,36 +39994,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"jML" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central5{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals_central5{ - dir = 4 - }, -/obj/machinery/door/airlock/glass_external{ - icon_state = "door_locked"; - id_tag = "tourbus_left"; - locked = 1; - req_one_access = list() - }, -/obj/machinery/button/remote/airlock{ - desiredstate = 1; - id = "tourbus_left"; - name = "hatch bolt control"; - pixel_y = 30; - req_one_access = list(19,43,67); - specialfunctions = 4 - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "tourbus_windows"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/tourbus/general) "jPW" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -39993,17 +40065,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) -"jYd" = ( -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/turf/simulated/floor/reinforced, -/area/tether/surfacebase/shuttle_pad) "jYD" = ( /turf/simulated/wall, /area/tether/surfacebase/security/iaa/officeb) @@ -40021,23 +40082,29 @@ /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "kcC" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/structure/fuel_port{ + pixel_x = 1 }, -/turf/simulated/floor/tiled/eris/dark/golden, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 6 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "kdx" = ( -/obj/structure/table/standard, +/obj/structure/bed/chair/bay/chair{ + dir = 4 + }, /obj/structure/closet/emergsuit_wall{ pixel_y = 32 }, -/obj/machinery/button/remote/blast_door{ - dir = 4; - id = "tourbus_windows"; - name = "window blast shields" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" }, -/turf/simulated/floor/tiled/eris/white/orangecorner, -/area/shuttle/tourbus/cockpit) +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) "keg" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -40081,14 +40148,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"kiw" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/golden, -/area/shuttle/tourbus/general) "kjn" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -40104,15 +40163,6 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) -"kmK" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/eris/dark/golden, -/area/shuttle/tourbus/general) "kmS" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -40154,23 +40204,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) -"kun" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/bed/chair/bay/chair{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/eris/dark/golden, -/area/shuttle/tourbus/general) "kuQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -40613,6 +40646,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +"lVB" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) "lWE" = ( /obj/structure/grille, /obj/machinery/door/blast/regular{ @@ -40724,6 +40769,15 @@ }, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) +"mse" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) "mwz" = ( /obj/effect/floor_decal/corner/red{ dir = 9 @@ -40765,15 +40819,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) -"mDf" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/golden, -/area/shuttle/tourbus/general) "mFq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -40886,6 +40931,17 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"ndK" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/cockpit) "nfl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -40904,6 +40960,18 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"ngV" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) "nio" = ( /obj/machinery/camera/network/civilian{ dir = 9 @@ -40924,6 +40992,15 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"nkq" = ( +/obj/machinery/computer/ship/engines{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/cockpit) "nlf" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -41165,10 +41242,17 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "ooM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/effect/floor_decal/steeldecal/monofloor{ dir = 1 }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 9 + }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "opE" = ( @@ -41355,12 +41439,6 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/security/iaa/officeb) -"oPm" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/golden, -/area/shuttle/tourbus/general) "oPG" = ( /obj/structure/closet/secure_closet/hos, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -41387,6 +41465,15 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) +"oSQ" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 1 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/cockpit) "oTr" = ( /obj/structure/sign/painting/public{ pixel_x = -30 @@ -41581,10 +41668,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"pwF" = ( -/obj/machinery/computer/ship/sensors, -/turf/simulated/floor/tiled/eris/white/orangecorner, -/area/shuttle/tourbus/cockpit) "pAh" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -41660,11 +41743,19 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "pNk" = ( -/obj/machinery/computer/shuttle_control/explore/tourbus, -/obj/machinery/light/small{ - dir = 1 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/white/orangecorner, +/obj/machinery/door/airlock/angled_tgmc/prep/prep_delta{ + name = "cockpit"; + req_one_access = list(19,43,67) + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) "pNF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -42050,14 +42141,14 @@ /area/tether/surfacebase/security/hos) "rbR" = ( /obj/structure/cable/orange{ - d1 = 2; - d2 = 4; - icon_state = "2-4" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" }, -/turf/simulated/floor/tiled/eris/dark/golden, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "rnn" = ( /obj/effect/floor_decal/borderfloor{ @@ -42130,15 +42221,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) -"rzV" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 8 - }, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/eris/dark/golden, -/area/shuttle/tourbus/general) "rAe" = ( /obj/machinery/light{ dir = 1 @@ -42579,25 +42661,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) -"tcW" = ( -/obj/effect/shuttle_landmark{ - base_area = /area/tether/surfacebase/shuttle_pad; - base_turf = /turf/simulated/floor/reinforced; - docking_controller = "tourbus_pad"; - landmark_tag = "tourbus_dock"; - name = "Tourbus Pad" - }, -/obj/effect/overmap/visitable/ship/landable/tourbus, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/golden, -/area/shuttle/tourbus/general) "tki" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -42739,6 +42802,13 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) +"tOT" = ( +/obj/machinery/computer/ship/helm, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/cockpit) "tPE" = ( /obj/structure/table/reinforced, /obj/item/weapon/book/manual/security_space_law, @@ -42864,10 +42934,10 @@ /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "uhm" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 8 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" }, -/turf/simulated/floor/tiled/eris/dark/golden, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "uiJ" = ( /obj/machinery/chemical_dispenser/full, @@ -42998,6 +43068,13 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"uLh" = ( +/obj/machinery/computer/ship/sensors, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/cockpit) "uMD" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, @@ -43040,9 +43117,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 9 - }, /obj/effect/floor_decal/steeldecal/monofloor, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) @@ -43120,23 +43194,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) -"voF" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/shuttle_pad) "vqv" = ( /obj/structure/grille, /obj/machinery/door/firedoor, @@ -43153,14 +43210,6 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor/plating, /area/tether/surfacebase/security/upperhall) -"vrU" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/eris/white/orangecorner, -/area/shuttle/tourbus/cockpit) "vtN" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -43538,20 +43587,9 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) "wyi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "tourbus_windows"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating/eris/under, /area/shuttle/tourbus/general) "wBv" = ( /obj/structure/table/reinforced, @@ -43624,12 +43662,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, -/obj/machinery/power/terminal, -/obj/structure/cable/orange, -/obj/structure/bed/chair/bay/chair{ - dir = 8 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/golden, +/obj/structure/bed/chair/bay/chair{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "wQs" = ( /obj/item/device/radio/intercom/department/security{ @@ -43815,6 +43862,11 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"xtq" = ( +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "tourbus" + }, +/area/shuttle/tourbus/cockpit) "xud" = ( /obj/structure/table/rack/shelf, /obj/item/weapon/storage/backpack/parachute{ @@ -43989,10 +44041,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/floor_decal/rust/part_rusted1{ - dir = 4 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" }, -/turf/simulated/floor/tiled/eris/dark/golden, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "xQv" = ( /obj/structure/table/reinforced, @@ -55124,18 +55176,18 @@ aHR awf aJn aKa -aKU -aKU -aUQ -jHw -jHw -jHw -bkN -jHw -jML -jHw +xtq +cdf +cdf +cdf +wyi +gQb +gQb +ccN +gQb +gQb jpB -aVJ +gjD bbX aKU aOI @@ -55266,19 +55318,19 @@ aHR awf aJn aKa -aKU -aKU -jvK +cdf +cdf jvK +cdf kdx -jHw -cnN -mDf -eiO -cnZ -aWL -jHw -jHw +ngV +uhm +uhm +uhm +aUN +fag +wyi +wyi aKU aOI aPb @@ -55408,19 +55460,19 @@ aXn aIy ats aKD -aKU -aKU +jER +tOT ddn -eCG +cdf aUN -jHw -oPm -kmK +gHc +xOa +xOa xOa dVW -kun -aVM -aWP +wQf +gBr +wyi aKU avs aKj @@ -55550,19 +55602,19 @@ aXp awf aJn aKa -aKU -aKU -ddn +jER +cUF +ndK pNk -vrU +xOa aXa -kiw +uhm kcC eGv aUq -aVm -aWc -aWP +fEX +gCZ +wyi aKU aOI bgW @@ -55692,19 +55744,19 @@ aXu aIz aJn aKa -aKU -aKU -ddn -pwF -hlF -jHw +jER +uLh +oSQ +cdf +mse +mse uhm gUL rbR aUx -wQf -aWK -aWP +fJJ +gLd +wyi aKU aOI bgW @@ -55834,19 +55886,19 @@ aIa aOJ ats ieb -aKU -aKU -jvK -jvK +cdf +cdf +nkq +cdf ivq -jHw -rzV +lVB +uhm fcg -tcW -aUE -aVF -jHw -jHw +uhm +mse +fNO +wyi +wyi aKU aOK bgW @@ -55976,19 +56028,19 @@ aIa aIz aJn aKa -aKU -aKU -aWX -jHw -jHw -jHw +hjt +cdf +cdf +cdf wyi -jHw -caw -jHw -gHh -aVJ -bbX +gQb +gQb +cdv +gQb +gQb +fWR +gjD +hpY aKU aOI bgW @@ -56125,8 +56177,8 @@ aKU aKU aKU aKU +daD aKU -jYd aKU aKU aKU @@ -56267,8 +56319,8 @@ aKU aKU aKU aKU +daD aKU -jYd aKU aKU aKU @@ -56409,8 +56461,8 @@ aKV aKV aKV aKV +ddb aKV -voF aKV aKV aKV @@ -56694,7 +56746,7 @@ aKj aKj aKf gCV -hHL +dAe aKf aNX aKj @@ -56835,8 +56887,8 @@ gfg aMV aKe aKg +diF aKg -cdv aKg aKe aOc @@ -56977,8 +57029,8 @@ sFW aMW sFW ghf +eqZ ghf -gLd ghf sFW aMW diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index ce4bd5c55a..b7458caaf4 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -1449,6 +1449,7 @@ /area/shuttle/tourbus requires_power = 1 icon_state = "shuttle2" + base_turf = /turf/simulated/floor/reinforced /area/shuttle/tourbus/general name = "\improper Tour Bus" diff --git a/maps/tether/tether_turfs.dm b/maps/tether/tether_turfs.dm index f975667161..6bdd1f42fe 100644 --- a/maps/tether/tether_turfs.dm +++ b/maps/tether/tether_turfs.dm @@ -275,3 +275,8 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) . = ..() for(var/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b/F in src) qdel(F) + +// Tram transit floor +/turf/simulated/floor/tiled/techfloor/grid/transit + icon = 'icons/turf/transit_vr.dmi' + initial_flooring = null diff --git a/vorestation.dme b/vorestation.dme index f042c8ac34..46fa1a4caa 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1578,6 +1578,7 @@ #include "code\game\turfs\flooring\shuttle_vr.dm" #include "code\game\turfs\initialization\init.dm" #include "code\game\turfs\initialization\maintenance.dm" +#include "code\game\turfs\simulated\fancy_shuttles.dm" #include "code\game\turfs\simulated\floor.dm" #include "code\game\turfs\simulated\floor_acts.dm" #include "code\game\turfs\simulated\floor_attackby.dm"