cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 20:17:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11341 from VOREStation/Arokha/fancy_shuttle_done

Browse Source 
Fancy sprited shuttles
This commit is contained in:
Aronai Sieyes
2021-08-06 18:15:14 -04:00
committed by GitHub
parent 3f99161430 43b19823f7
commit 6133dc6fdd
41 changed files with 2674 additions and 2382 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_helpers/turfs.dm
+6 -2
View File
@@ -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
code/datums/elements/turf_transparency.dm
+4 -2
View File
@@ -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
code/game/sound.dm
+2 -3
View File
@@ -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
code/game/turfs/flooring/flooring_decals.dm
+12 -5
View File
@@ -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"
code/game/turfs/simulated/fancy_shuttles.dm
+278
View File
@@ -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'
code/game/turfs/turf.dm
+14
View File
@@ -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
code/modules/overmap/ships/engines/ion_thruster.dm
+6 -4
View File
@@ -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)]."
code/modules/shuttles/shuttle.dm
+5
View File
@@ -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
icons/obj/sofas.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

icons/turf/fancy_shuttles/_fancy_helpers.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

icons/turf/fancy_shuttles/delivery.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 150 KiB

icons/turf/fancy_shuttles/delivery_preview.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

icons/turf/fancy_shuttles/dropship.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 129 KiB

icons/turf/fancy_shuttles/dropship_preview.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 50 KiB

icons/turf/fancy_shuttles/escape.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 211 KiB

icons/turf/fancy_shuttles/escape_preview.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 97 KiB

icons/turf/fancy_shuttles/generic.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

icons/turf/fancy_shuttles/generic_preview.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

icons/turf/fancy_shuttles/lifeboat.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 35 KiB

icons/turf/fancy_shuttles/lifeboat_preview.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

icons/turf/fancy_shuttles/miner.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 220 KiB

icons/turf/fancy_shuttles/miner_preview.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 104 KiB

icons/turf/fancy_shuttles/orangeline.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 72 KiB

icons/turf/fancy_shuttles/orangeline_preview.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

icons/turf/fancy_shuttles/pod.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

icons/turf/fancy_shuttles/pod_preview.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

icons/turf/fancy_shuttles/science.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 168 KiB

icons/turf/fancy_shuttles/science_preview.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 73 KiB

icons/turf/fancy_shuttles/tourbus.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 57 KiB

icons/turf/fancy_shuttles/tourbus_preview.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

icons/turf/fancy_shuttles/wagon.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 59 KiB

icons/turf/fancy_shuttles/wagon_preview.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

icons/turf/shuttle_parts_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

maps/offmap_vr/om_ships/aro3.dm
+2 -1
View File
@@ -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
maps/offmap_vr/om_ships/aro3.dmm
+271 -203
View File
@@ -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
maps/tether/submaps/tether_misc.dmm
+1207 -1354
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-01-surface1.dmm
+247 -247
View File
@@ -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
maps/tether/tether-03-surface3.dmm
+613 -561
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether_areas.dm
+1
View File
@@ -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"
maps/tether/tether_turfs.dm
+5
View File
@@ -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
vorestation.dme
+1
View File
@@ -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"