diff --git a/code/__defines/dcs/signals.dm b/code/__defines/dcs/signals.dm index a72788d41a..4947337598 100644 --- a/code/__defines/dcs/signals.dm +++ b/code/__defines/dcs/signals.dm @@ -232,8 +232,6 @@ #define COMSIG_MOVABLE_MOVED "movable_moved" ///from base of atom/movable/Cross(): (/atom/movable) #define COMSIG_MOVABLE_CROSS "movable_cross" -///from base of atom/movable/Crossed(): (/atom/movable) -#define COMSIG_MOVABLE_CROSSED "movable_crossed" ///when we cross over something (calling Crossed() on that atom) #define COMSIG_CROSSED_MOVABLE "crossed_movable" ///from base of atom/movable/Bump(): (/atom) diff --git a/code/__defines/turfs.dm b/code/__defines/turfs.dm index 679b83fa4a..1c4b228b63 100644 --- a/code/__defines/turfs.dm +++ b/code/__defines/turfs.dm @@ -22,3 +22,9 @@ #define IS_OPAQUE_TURF(turf) (turf.directional_opacity == ALL_CARDINALS) #define IS_OPAQUE_TURF_DIR(turf, dir) (turf.directional_opacity & dir) #define FOOTSTEP_SPRITE_AMT 2 + +// Used to designate if a turf (or its area) should initialize as outdoors or not. +#define OUTDOORS_YES 1 // This being 1 helps with backwards compatibility. +#define OUTDOORS_NO 0 // Ditto. +#define OUTDOORS_AREA -1 // If a turf has this, it will defer to the area's settings on init. + // Note that after init, it will be either YES or NO. 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/controllers/subsystems/planets.dm b/code/controllers/subsystems/planets.dm index 5486034871..4dae77ccbe 100644 --- a/code/controllers/subsystems/planets.dm +++ b/code/controllers/subsystems/planets.dm @@ -34,7 +34,7 @@ SUBSYSTEM_DEF(planets) // DO NOT CALL THIS DIRECTLY UNLESS IT'S IN INITIALIZE, // USE turf/simulated/proc/make_indoors() and -// tyrf/simulated/proc/make_outdoors() +// turf/simulated/proc/make_outdoors() /datum/controller/subsystem/planets/proc/addTurf(var/turf/T) if(z_to_planet.len >= T.z && z_to_planet[T.z]) var/datum/planet/P = z_to_planet[T.z] @@ -42,7 +42,7 @@ SUBSYSTEM_DEF(planets) return if(istype(T, /turf/unsimulated/wall/planetary)) P.planet_walls += T - else if(istype(T, /turf/simulated) && T.outdoors) + else if(istype(T, /turf/simulated) && T.is_outdoors()) P.planet_floors += T P.weather_holder.apply_to_turf(T) P.sun_holder.apply_to_turf(T) diff --git a/code/controllers/subsystems/skybox.dm b/code/controllers/subsystems/skybox.dm index 99f69ec595..52065ad241 100644 --- a/code/controllers/subsystems/skybox.dm +++ b/code/controllers/subsystems/skybox.dm @@ -122,9 +122,15 @@ SUBSYSTEM_DEF(skybox) if(istype(O)) var/image/self_image = O.generate_skybox(z) new_overlays += self_image - for(var/obj/effect/overmap/visitable/other in O.loc) - if(other != O) - new_overlays += other.get_skybox_representation(z) + //VOREStation Add + if(isbelly(O.loc)) // Teehee + base.icon = 'icons/skybox/skybox_vr.dmi' + base.icon_state = "flesh" + //VOREStation Add End + else + for(var/obj/effect/overmap/visitable/other in O.loc) + if(other != O) + new_overlays += other.get_skybox_representation(z) // Allow events to apply custom overlays to skybox! (Awesome!) for(var/datum/event/E in SSevents.active_events) diff --git a/code/controllers/subsystems/throwing.dm b/code/controllers/subsystems/throwing.dm new file mode 100644 index 0000000000..3b908ac393 --- /dev/null +++ b/code/controllers/subsystems/throwing.dm @@ -0,0 +1,207 @@ +#define MAX_THROWING_DIST 1280 // 5 z-levels on default width +#define MAX_TICKS_TO_MAKE_UP 3 //how many missed ticks will we attempt to make up for this run. + +SUBSYSTEM_DEF(throwing) + name = "Throwing" + wait = 1 + flags = SS_NO_INIT|SS_KEEP_TIMING + + var/list/currentrun + var/list/processing = list() + +/datum/controller/subsystem/throwing/stat_entry() + ..("P:[processing.len]") + +/datum/controller/subsystem/throwing/fire(resumed = 0) + if (!resumed) + src.currentrun = processing.Copy() + + //cache for sanic speed (lists are references anyways) + var/list/currentrun = src.currentrun + + while(length(currentrun)) + var/atom/movable/AM = currentrun[currentrun.len] + var/datum/thrownthing/TT = currentrun[AM] + currentrun.len-- + if (QDELETED(AM) || QDELETED(TT)) + processing -= AM + if (MC_TICK_CHECK) + return + continue + + TT.tick() + + if (MC_TICK_CHECK) + return + + currentrun = null + +/datum/thrownthing + var/atom/movable/thrownthing + var/atom/target + var/turf/target_turf + var/target_zone + var/init_dir + var/maxrange + var/speed + var/mob/thrower + var/start_time + var/dist_travelled = 0 + var/dist_x + var/dist_y + var/dx + var/dy + var/diagonal_error + var/pure_diagonal + var/datum/callback/callback + var/paused = FALSE + var/delayed_time = 0 + var/last_move = 0 + +/datum/thrownthing/New(var/atom/movable/thrownthing, var/atom/target, var/range, var/speed, var/mob/thrower, var/datum/callback/callback) + src.thrownthing = thrownthing + src.target = target + src.target_turf = get_turf(target) + src.init_dir = get_dir(thrownthing, target) + src.maxrange = range + src.speed = speed + src.thrower = thrower + src.callback = callback + if(!QDELETED(thrower)) + src.target_zone = thrower.zone_sel ? thrower.zone_sel.selecting : null + + dist_x = abs(target.x - thrownthing.x) + dist_y = abs(target.y - thrownthing.y) + dx = (target.x > thrownthing.x) ? EAST : WEST + dy = (target.y > thrownthing.y) ? NORTH : SOUTH//same up to here + + if (dist_x == dist_y) + pure_diagonal = TRUE + + else if(dist_x <= dist_y) + var/olddist_x = dist_x + var/olddx = dx + dist_x = dist_y + dist_y = olddist_x + dx = dy + dy = olddx + + diagonal_error = dist_x/2 - dist_y + + start_time = world.time + +/datum/thrownthing/Destroy() + SSthrowing.processing -= thrownthing + thrownthing.throwing = null + thrownthing = null + target = null + thrower = null + callback = null + return ..() + +/datum/thrownthing/proc/tick() + var/atom/movable/AM = thrownthing + if (!isturf(AM.loc) || !AM.throwing) + finalize() + return + + if(paused) + delayed_time += world.time - last_move + return + + if (dist_travelled && hitcheck(get_turf(thrownthing))) //to catch sneaky things moving on our tile while we slept + finalize() + return + + var/area/A = get_area(AM.loc) + var/atom/step + + last_move = world.time + + //calculate how many tiles to move, making up for any missed ticks. + var/tilestomove = CEILING(min(((((world.time+world.tick_lag) - start_time + delayed_time) * speed) - (dist_travelled ? dist_travelled : -1)), speed*MAX_TICKS_TO_MAKE_UP) * (world.tick_lag * SSthrowing.wait), 1) + while (tilestomove-- > 0) + if ((dist_travelled >= maxrange || AM.loc == target_turf) && (A && A.has_gravity())) + finalize() + return + + if (dist_travelled <= max(dist_x, dist_y)) //if we haven't reached the target yet we home in on it, otherwise we use the initial direction + step = get_step(AM, get_dir(AM, target_turf)) + else + step = get_step(AM, init_dir) + + if (!pure_diagonal) // not a purely diagonal trajectory and we don't want all diagonal moves to be done first + if (diagonal_error >= 0 && max(dist_x,dist_y) - dist_travelled != 1) //we do a step forward unless we're right before the target + step = get_step(AM, dx) + diagonal_error += (diagonal_error < 0) ? dist_x/2 : -dist_y + + if (!step) // going off the edge of the map makes get_step return null, don't let things go off the edge + finalize() + return + + if (hitcheck(step)) + finalize() + return + + AM.Move(step, get_dir(AM, step)) + + if (!AM.throwing) // we hit something during our move + finalize(hit = TRUE) + return + + dist_travelled++ + + if (dist_travelled > MAX_THROWING_DIST) + finalize() + return + + A = get_area(AM.loc) + +/datum/thrownthing/proc/finalize(hit = FALSE, t_target=null) + set waitfor = FALSE + //done throwing, either because it hit something or it finished moving + if(QDELETED(thrownthing)) + return + thrownthing.throwing = null + if (!hit) + for (var/thing in get_turf(thrownthing)) //looking for our target on the turf we land on. + var/atom/A = thing + if (A == target) + hit = TRUE + thrownthing.throw_impact(A, speed) + break + if (!hit) + thrownthing.throw_impact(get_turf(thrownthing), speed) // we haven't hit something yet and we still must, let's hit the ground. + + if(ismob(thrownthing)) + var/mob/M = thrownthing + M.inertia_dir = init_dir + + if(t_target && !QDELETED(thrownthing)) + thrownthing.throw_impact(t_target, speed) + + if (callback) + callback.Invoke() + + if (!QDELETED(thrownthing)) + thrownthing.fall() + + qdel(src) + +/datum/thrownthing/proc/hit_atom(atom/A) + finalize(hit=TRUE, t_target=A) + +/datum/thrownthing/proc/hitcheck(var/turf/T) + var/atom/movable/hit_thing + for (var/thing in T) + var/atom/movable/AM = thing + if (AM == thrownthing || (AM == thrower && !ismob(thrownthing))) + continue + if (!AM.density || AM.throwpass)//check if ATOM_FLAG_CHECKS_BORDER as an atom_flag is needed + continue + if (!hit_thing || AM.layer > hit_thing.layer) + hit_thing = AM + + if(hit_thing) + finalize(hit=TRUE, t_target=hit_thing) + return TRUE \ No newline at end of file diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index c4d8bcc3d4..c866711ab5 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -8,6 +8,8 @@ var/datum/hud/H = user.hud_used var/obj/screen/craft/C = new() C.icon = H.ui_style + C.color = H.ui_color + C.alpha = H.ui_alpha LAZYADD(H.other_important, C) CL.screen += C RegisterSignal(C, COMSIG_CLICK, .proc/component_ui_interact) @@ -392,7 +394,7 @@ cur_subcategory = subcats[1] else cur_subcategory = CAT_NONE - + var/list/data = list() data["busy"] = busy data["category"] = cur_category 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/atoms_movable.dm b/code/game/atoms_movable.dm index 9d61505cc6..195e02e8fa 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -256,10 +256,6 @@ . = TRUE return . -//oldloc = old location on atom, inserted when forceMove is called and ONLY when forceMove is called! -/atom/movable/Crossed(atom/movable/AM, oldloc) - return - /atom/movable/Bump(atom/A) if(!A) CRASH("Bump was called with no argument.") @@ -422,92 +418,24 @@ continue src.throw_impact(A,speed) -/atom/movable/proc/throw_at(atom/target, range, speed, thrower) - if(!target || !src) - return 0 - if(target.z != src.z) - return 0 - //use a modified version of Bresenham's algorithm to get from the atom's current position to that of the target - src.throwing = 1 - src.thrower = thrower - src.throw_source = get_turf(src) //store the origin turf - src.pixel_z = 0 - if(usr) - if(HULK in usr.mutations) - src.throwing = 2 // really strong throw! +/atom/movable/proc/throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, datum/callback/callback) //If this returns FALSE then callback will not be called. + . = TRUE + if (!target || speed <= 0 || QDELETED(src) || (target.z != src.z)) + return FALSE - var/dist_travelled = 0 - var/dist_since_sleep = 0 - var/area/a = get_area(src.loc) + if (pulledby) + pulledby.stop_pulling() - var/dist_x = abs(target.x - src.x) - var/dist_y = abs(target.y - src.y) + var/datum/thrownthing/TT = new(src, target, range, speed, thrower, callback) + throwing = TT - var/dx - if (target.x > src.x) - dx = EAST - else - dx = WEST - - var/dy - if (target.y > src.y) - dy = NORTH - else - dy = SOUTH - - var/error - var/major_dir - var/major_dist - var/minor_dir - var/minor_dist - if(dist_x > dist_y) - error = dist_x/2 - dist_y - major_dir = dx - major_dist = dist_x - minor_dir = dy - minor_dist = dist_y - else - error = dist_y/2 - dist_x - major_dir = dy - major_dist = dist_y - minor_dir = dx - minor_dist = dist_x - - range = min(dist_x + dist_y, range) - - while(src && target && src.throwing && istype(src.loc, /turf) \ - && ((abs(target.x - src.x)+abs(target.y - src.y) > 0 && dist_travelled < range) \ - || (a && a.has_gravity == 0) \ - || istype(src.loc, /turf/space))) - // only stop when we've gone the whole distance (or max throw range) and are on a non-space tile, or hit something, or hit the end of the map, or someone picks it up - var/atom/step - if(error >= 0) - step = get_step(src, major_dir) - error -= minor_dist - else - step = get_step(src, minor_dir) - error += major_dist - if(!step) // going off the edge of the map makes get_step return null, don't let things go off the edge - break - src.Move(step) - hit_check(speed) - dist_travelled++ - dist_since_sleep++ - if(dist_since_sleep >= speed) - dist_since_sleep = 0 - sleep(1) - a = get_area(src.loc) - // and yet it moves - if(src.does_spin) - src.SpinAnimation(speed = 4, loops = 1) - - //done throwing, either because it hit something or it finished moving - if(isobj(src)) src.throw_impact(get_turf(src),speed) - src.throwing = 0 - src.thrower = null - src.throw_source = null - fall() + pixel_z = 0 + if(spin && does_spin) + SpinAnimation(4,1) + SSthrowing.processing[src] = TT + if (SSthrowing.state == SS_PAUSED && length(SSthrowing.currentrun)) + SSthrowing.currentrun[src] = TT //Overlays /atom/movable/overlay diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm index 8371c395a4..3d945e5816 100644 --- a/code/game/dna/dna2_helpers.dm +++ b/code/game/dna/dna2_helpers.dm @@ -260,6 +260,7 @@ /mob/living/carbon/human/proc/force_update_organs() for(var/obj/item/organ/O as anything in organs + internal_organs) O.species = species + species.post_spawn_special(src) //VOREStation Add End // Used below, simple injection modifier. diff --git a/code/game/machinery/clawmachine.dm b/code/game/machinery/clawmachine.dm new file mode 100644 index 0000000000..ff65f31c84 --- /dev/null +++ b/code/game/machinery/clawmachine.dm @@ -0,0 +1,209 @@ + +//Original Codebase created by Shadowfire117#1269 - Ported from CHOMPstation +//Modified by GhostActual#2055 to produce Claw Machine + +/* + * Space Crane + */ + +/obj/machinery/clawmachine + name = "Space Crane" + desc = "Try your luck at winning a cute plush toy! No refunds, and whining won't win you anything." + icon = 'icons/obj/computer.dmi' + icon_state = "clawmachine" + anchored = 1 + density = 1 + power_channel = EQUIP + use_power = USE_POWER_IDLE + idle_power_usage = 10 + active_power_usage = 100 + light_power = 0.9 + light_range = 2 + light_color = "#B1FBBFF" + var/isbroken = 0 //1 if someone banged it with something heavy + var/ispowered = 1 //starts powered, changes with power_change() + var/busy = 0 + var/symbol1 = null + var/symbol2 = null + var/symbol3 = null + var/list/prizes = list(/obj/random/carp_plushie, + /obj/item/toy/plushie/nymph, + /obj/item/toy/plushie/teshari, + /obj/item/toy/plushie/mouse, + /obj/item/toy/plushie/kitten, + /obj/item/toy/plushie/lizard, + /obj/item/toy/plushie/spider, + /obj/item/toy/plushie/farwa, + /obj/item/toy/plushie/corgi, + /obj/item/toy/plushie/girly_corgi, + /obj/item/toy/plushie/robo_corgi, + /obj/item/toy/plushie/octopus, + /obj/item/toy/plushie/face_hugger, + /obj/item/toy/plushie/red_fox, + /obj/item/toy/plushie/black_fox, + /obj/item/toy/plushie/marble_fox, + /obj/item/toy/plushie/blue_fox, + /obj/item/toy/plushie/orange_fox, + /obj/item/toy/plushie/coffee_fox, + /obj/item/toy/plushie/pink_fox, + /obj/item/toy/plushie/purple_fox, + /obj/item/toy/plushie/crimson_fox, + /obj/item/toy/plushie/deer, + /obj/item/toy/plushie/black_cat, + /obj/item/toy/plushie/grey_cat, + /obj/item/toy/plushie/white_cat, + /obj/item/toy/plushie/orange_cat, + /obj/item/toy/plushie/siamese_cat, + /obj/item/toy/plushie/tabby_cat, + /obj/item/toy/plushie/tuxedo_cat, + /obj/item/toy/plushie/borgplushie/medihound, + /obj/item/toy/plushie/borgplushie/scrubpuppy, + /obj/item/toy/plushie/borgplushie/drakiesec, + /obj/item/toy/plushie/borgplushie/drakiemed, + /obj/item/toy/plushie/otter + ) + +/obj/machinery/clawmachine/update_icon() + cut_overlays() + if(!ispowered || isbroken) + icon_state = "clawmachine_off" + if(isbroken) //If the thing is smashed, add crack overlay on top of the unpowered sprite. + add_overlay("clawmachine_broken") + set_light(0) + set_light_on(FALSE) + return + + icon_state = "clawmachine" + set_light(2) + set_light_on(TRUE) + return + +/obj/machinery/clawmachine/power_change() + if(isbroken) //Broken shit can't be powered. + return + ..() + if(!(stat & NOPOWER)) + ispowered = 1 + update_icon() + else + spawn(rand(0, 15)) + ispowered = 0 + update_icon() + +/obj/machinery/clawmachine/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(busy) + to_chat(user,"The claw machine is currently running. ") + return + if(W.is_wrench()) + playsound(src, W.usesound, 100, 1) + if(anchored) + user.visible_message("[user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.") + else + user.visible_message("[user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.") + + if(do_after(user, 20 * W.toolspeed)) + if(!src) return + to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") + anchored = !anchored + return + + if(!anchored) + to_chat(user," The machine isn't secured.") + return + + var/handled = 0 + var/paid = 0 + + if(istype(W, /obj/item/weapon/spacecash)) + var/obj/item/weapon/spacecash/C = W + paid = insert_cash(C, user) + handled = 1 + if(paid) + return + if(handled) + SStgui.update_uis(src) + return // don't smack that machine with your 2 chips + + else if(!(stat & NOPOWER)) + return + + else if(isbroken) + return + +/obj/machinery/clawmachine/proc/prizevend() + if(LAZYLEN(prizes)) + var/prizeselect = pickweight(prizes) + new prizeselect(src.loc) + +/obj/machinery/clawmachine/proc/insert_cash(var/obj/item/weapon/spacecash/cashmoney, mob/user) + if (ispowered == 0) + return + if (isbroken) + return + if(busy) + to_chat(user,"The claw machine is currently running. ") + return + if(cashmoney.worth < 5) + to_chat(user,"You dont have enough Thalers to play! ") + return + + to_chat(user,"You put 5 Thalers in the claw machine and press start.") + cashmoney.worth -= 5 + cashmoney.update_icon() + + if(cashmoney.worth <= 0) + usr.drop_from_inventory(cashmoney) + qdel(cashmoney) + cashmoney.update_icon() + + busy = 1 + icon_state = "clawmachine_play" + playsound(src.loc, 'sound/machines/clawmachine_play.ogg', 50, 0) + + var/slot1 = rand(0,4) + switch(slot1) + if(0 to 2) symbol1 = "one" + if(3 to 4) symbol1 = "two" + + var/slot2 = rand(0,4) + switch(slot2) + if(0 to 2) symbol2 = "one" + if(3 to 4) symbol2 = "two" + + var/slot3 = rand(0,4) + switch(slot3) + if(0 to 2) symbol3 = "one" + if(3 to 4) symbol3 = "two" + + var/output //Output variable to send out in chat after the large if statement. + var/winnings = 0 //If you win a toy or not + var/delaytime = 7 SECONDS + + spawn(delaytime) + to_chat(user,"The clam machine lights up and starts to play!") + + if (symbol1 == "one" && symbol2 == "one" && symbol3 == "one") + output = "Hooray! You Win!" + winnings = TRUE + + if (symbol1 == "two" && symbol2 == "two" && symbol3 == "two") + output = "Hooray! You Win!!" + winnings = TRUE + + icon_state = initial(icon_state) // Set it back to the original iconstate. + + if(!output) // Is there anything to output? If not, consider it a loss. + to_chat(user,"Better luck next time!") + busy = FALSE + return + + to_chat(user,output) //Output message + + if(winnings) //Did the person win? + icon_state = "clawmachine_win" + prizevend() + playsound(src.loc, 'sound/machines/clawmachine_win.ogg', 50, 0) + spawn(delaytime) + icon_state = "clawmachine" + + busy = FALSE \ No newline at end of file diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index a5e38b6de5..b4d66b3a08 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -40,7 +40,7 @@ var/atom/movable/AM = pick_n_take(special_prizes) AM.forceMove(get_turf(src)) special_prizes -= AM - + else if(LAZYLEN(prizes)) var/prizeselect = pickweight(prizes) new prizeselect(src.loc) @@ -1322,7 +1322,7 @@ gameStatus = "CLAWMACHINE_NEW" emagged = 1 return 1 - + /obj/machinery/computer/arcade/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/stack/arcadeticket)) var/obj/item/stack/arcadeticket/T = O diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index ac06e34a86..d6847d7cf4 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -66,6 +66,21 @@ . = list() + // Connecty + if(initial(icon_state) == "computer") + var/append_string = "" + var/left = turn(dir, 90) + var/right = turn(dir, -90) + var/turf/L = get_step(src, left) + var/turf/R = get_step(src, right) + var/obj/machinery/computer/LC = locate() in L + var/obj/machinery/computer/RC = locate() in R + if(LC && LC.dir == dir && initial(LC.icon_state) == "computer") + append_string += "_L" + if(RC && RC.dir == dir && initial(RC.icon_state) == "computer") + append_string += "_R" + icon_state = "computer[append_string]" + if(icon_keyboard) if(stat & NOPOWER) playsound(src, 'sound/machines/terminal_off.ogg', 50, 1) @@ -76,6 +91,7 @@ var/overlay_state = icon_screen if(stat & BROKEN) overlay_state = "[icon_state]_broken" + . += mutable_appearance(icon, overlay_state) . += emissive_appearance(icon, overlay_state) playsound(src, 'sound/machines/terminal_on.ogg', 50, 1) diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 12027e3259..955b99009a 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -12,8 +12,8 @@ name = "space jukebox" desc = "Filled with songs both past and present!" icon = 'icons/obj/jukebox.dmi' - icon_state = "jukebox2-nopower" - var/state_base = "jukebox2" + icon_state = "jukebox-nopower" + var/state_base = "jukebox" anchored = TRUE density = TRUE power_channel = EQUIP diff --git a/code/game/mecha/equipment/weapons/ballistic/mortar.dm b/code/game/mecha/equipment/weapons/ballistic/mortar.dm index c192d0fc9b..cc20f82acf 100644 --- a/code/game/mecha/equipment/weapons/ballistic/mortar.dm +++ b/code/game/mecha/equipment/weapons/ballistic/mortar.dm @@ -18,7 +18,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/mortar/action_checks(atom/target) var/turf/MT = get_turf(chassis) var/turf/TT = get_turf(target) - if(!MT.outdoors || !TT.outdoors) + if(!MT.is_outdoors() || !TT.is_outdoors()) to_chat(chassis.occupant, "\The [src]'s control system prevents you from firing due to a blocked firing arc.") return 0 return ..() \ No newline at end of file diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index e4ecebfc24..11e722d744 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -184,3 +184,10 @@ stack_trace("Directional light cone deleted, but not by our component") return QDEL_HINT_LETMELIVE return ..() + +/obj/effect/overlay/closet_door + anchored = TRUE + plane = FLOAT_PLANE + layer = FLOAT_LAYER + vis_flags = VIS_INHERIT_ID + appearance_flags = KEEP_TOGETHER | LONG_GLIDE | PIXEL_SCALE diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index 957cd246e6..56cc000dc9 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -220,7 +220,7 @@ var/global/list/tele_landmarks = list() // Terrible, but the alternative is loop if(!istype(candidate) || istype(candidate, /turf/simulated/sky)) safety-- continue - else if(candidate && !candidate.outdoors) + else if(candidate && !candidate.is_outdoors()) safety-- continue else diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 18c152c770..8c4efa8d3f 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -26,6 +26,7 @@ closet_appearance = null open_sound = 'sound/items/zip.ogg' close_sound = 'sound/items/zip.ogg' + door_anim_time = 0 //Unsupported var/item_path = /obj/item/bodybag density = FALSE storage_capacity = (MOB_MEDIUM * 2) - 1 diff --git a/code/game/objects/items/poi_items.dm b/code/game/objects/items/poi_items.dm index 2c05f0cfca..8e65ac005b 100644 --- a/code/game/objects/items/poi_items.dm +++ b/code/game/objects/items/poi_items.dm @@ -65,6 +65,7 @@ closet_appearance = null catalogue_data = list(/datum/category_item/catalogue/information/objects/oldreactor) climbable = FALSE + door_anim_time = 0 //Unsupported starts_with = list( /obj/item/weapon/fuel_assembly/deuterium = 6) diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 4161ae740b..b36078028b 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -139,3 +139,61 @@ desc = "A stylish wallet typically used by women." icon_state = "girl_wallet" item_state_slots = list(slot_r_hand_str = "wowallet", slot_l_hand_str = "wowallet") + +//Casino Wallet + +/obj/item/weapon/storage/wallet/casino + name = "casino wallet" + desc = "A fancy casino wallet with flashy lights, oooh~" + icon = 'icons/obj/casino.dmi' + icon_state = "casinowallet_black" + can_hold = list( + /obj/item/weapon/spacecash, + /obj/item/weapon/card, + /obj/item/clothing/mask/smokable/cigarette/, + /obj/item/device/flashlight/pen, + /obj/item/device/tape, + /obj/item/weapon/cartridge, + /obj/item/device/encryptionkey, + /obj/item/seeds, + /obj/item/stack/medical, + /obj/item/weapon/coin, + /obj/item/weapon/dice, + /obj/item/weapon/disk, + /obj/item/weapon/implanter, + /obj/item/weapon/flame/lighter, + /obj/item/weapon/flame/match, + /obj/item/weapon/forensics, + /obj/item/weapon/glass_extra, + /obj/item/weapon/haircomb, + /obj/item/weapon/hand, + /obj/item/weapon/key, + /obj/item/weapon/lipstick, + /obj/item/weapon/paper, + /obj/item/weapon/pen, + /obj/item/weapon/photo, + /obj/item/weapon/reagent_containers/dropper, + /obj/item/weapon/sample, + /obj/item/weapon/tool/screwdriver, + /obj/item/weapon/stamp, + /obj/item/clothing/accessory/permit, + /obj/item/clothing/accessory/badge, + /obj/item/weapon/makeover, + /obj/item/weapon/spacecasinocash, + /obj/item/weapon/casino_platinum_chip, + /obj/item/weapon/deck + ) + +/obj/item/weapon/storage/wallet/casino/verb/toggle_design() + set category = "Object" + set name = "Toggle design" + set src in usr + + if (icon_state == "casinowallet_black") + icon_state = "casinowallet_brown" + return + if (icon_state == "casinowallet_brown") + icon_state = "casinowallet_white" + return + else + icon_state = "casinowallet_black" \ No newline at end of file diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm index f61567d6de..61a7448300 100644 --- a/code/game/objects/random/mapping.dm +++ b/code/game/objects/random/mapping.dm @@ -1378,7 +1378,7 @@ spawn_nothing_percentage = 20 var/override_outdoors = FALSE // Do we override our chosen turf's outdoors? - var/turf_outdoors = TRUE // Will our turf be outdoors? + var/turf_outdoors = OUTDOORS_AREA // Will our turf be outdoors? /obj/random/turf/spawn_item() var/build_path = item_to_spawn() @@ -1400,7 +1400,7 @@ desc = "This is a random lava spawn." override_outdoors = TRUE - turf_outdoors = FALSE + turf_outdoors = OUTDOORS_NO /obj/random/turf/lava/item_to_spawn() return pick(prob(5);/turf/simulated/floor/lava, diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm index fb27ea6977..7a91c6ad8f 100644 --- a/code/game/objects/structures/crates_lockers/__closets.dm +++ b/code/game/objects/structures/crates_lockers/__closets.dm @@ -36,6 +36,19 @@ var/closet_appearance = /decl/closet_appearance // The /decl that defines what decals we end up with, that makes our look unique + /// Currently animating the door transform + var/is_animating_door = FALSE + /// Length of time (ds) to animate the door transform + var/door_anim_time = 2.0 + /// Amount to 'squish' the full width of the door by + var/door_anim_squish = 0.30 + /// Virtual angle at which the door is opened to (136 by default, so not a full 180) + var/door_anim_angle = 136 + /// Offset for the door hinge location from centerline + var/door_hinge = -6.5 + /// Our visual object for the closet door + var/obj/effect/overlay/closet_door/door_obj + /obj/structure/closet/Initialize() ..() return INITIALIZE_HINT_LATELOAD @@ -66,6 +79,10 @@ color = null update_icon() +/obj/structure/closet/Destroy() + . = ..() + qdel_null(door_obj) + /obj/structure/closet/examine(mob/user) . = ..() if(Adjacent(user) || isobserver(user)) @@ -134,7 +151,7 @@ playsound(src, open_sound, 15, 1, -3) if(initial(density)) density = !density - update_icon() + animate_door() return 1 /obj/structure/closet/proc/close() @@ -159,7 +176,7 @@ playsound(src, close_sound, 15, 1, -3) if(initial(density)) density = !density - update_icon() + animate_door(TRUE) return 1 //Cham Projector Exception @@ -214,10 +231,11 @@ /obj/structure/closet/proc/toggle(mob/user as mob) + if(is_animating_door) + return if(!(opened ? close() : open())) to_chat(user, "It won't budge!") return - update_icon() // this should probably use dump_contents() /obj/structure/closet/ex_act(severity) @@ -481,8 +499,45 @@ spawn(1) qdel(src) return 1 -// Just a generic cabinet for mappers to use -/obj/structure/closet/cabinet - name = "cabinet" - icon = 'icons/obj/closets/bases/cabinet.dmi' - closet_appearance = /decl/closet_appearance/cabinet +/obj/structure/closet/proc/animate_door(closing = FALSE) + if(!door_anim_time) + update_icon() + return + if(!door_obj) + door_obj = new + vis_contents |= door_obj + door_obj.icon = icon + door_obj.icon_state = "door_front" + is_animating_door = TRUE + if(!closing) + update_icon() + var/num_steps = door_anim_time / world.tick_lag + for(var/I in 0 to num_steps) + var/angle = door_anim_angle * (closing ? 1 - (I/num_steps) : (I/num_steps)) + var/matrix/M = get_door_transform(angle) + var/door_state = angle >= 90 ? "door_back" : "door_front" + var/door_layer = angle >= 90 ? FLOAT_LAYER : ABOVE_MOB_LAYER + + if(I == 0) + door_obj.transform = M + door_obj.icon_state = door_state + door_obj.layer = door_layer + else if(I == 1) + animate(door_obj, transform = M, icon_state = door_state, layer = door_layer, time = world.tick_lag, flags = ANIMATION_END_NOW) + else + animate(transform = M, icon_state = door_state, layer = door_layer, time = world.tick_lag) + addtimer(CALLBACK(src,.proc/end_door_animation,closing),door_anim_time,TIMER_UNIQUE|TIMER_OVERRIDE) + +/obj/structure/closet/proc/end_door_animation(closing = FALSE) + is_animating_door = FALSE + if(closing) + // There's not really harm in leaving it on, but, one less atom to send to clients to render when lockers are closed + vis_contents -= door_obj + update_icon() + +/obj/structure/closet/proc/get_door_transform(angle) + var/matrix/M = matrix() + M.Translate(-door_hinge, 0) + M.Multiply(matrix(cos(angle), 0, 0, -sin(angle) * door_anim_squish, 1, 0)) + M.Translate(door_hinge, 0) + return M diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm index 9075c87272..eb1ab2d780 100644 --- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm +++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm @@ -33,6 +33,8 @@ var/icon/closed_locked_welded_icon var/icon/closed_unlocked_icon var/icon/closed_unlocked_welded_icon + var/icon/door_front_icon + var/icon/door_back_icon // Create open icon. var/icon/new_icon = new @@ -40,6 +42,10 @@ open_icon.Blend(icon(base_icon, "open"), ICON_OVERLAY) open_icon.Blend(color, BLEND_ADD) open_icon.Blend(icon(base_icon, "interior"), ICON_OVERLAY) + + door_back_icon = icon(base_icon, "door_back") + door_back_icon.Blend(color, BLEND_ADD) + if(decal_icon) for(var/thing in decals) var/icon/this_decal_icon = icon(decal_icon, "[thing]_open") @@ -47,6 +53,8 @@ open_icon.Blend(this_decal_icon, ICON_OVERLAY) // Generate basic closed icons. + door_front_icon = icon(base_icon, "door_front") + door_front_icon.Blend(color, BLEND_ADD) closed_emagged_icon = icon(base_icon, "base") if(can_lock) closed_emagged_icon.Blend(icon(base_icon, "lock"), ICON_OVERLAY) @@ -56,6 +64,10 @@ var/icon/this_decal_icon = icon(decal_icon, thing) this_decal_icon.Blend(decals[thing], BLEND_ADD) closed_emagged_icon.Blend(this_decal_icon, ICON_OVERLAY) + door_front_icon.Blend(this_decal_icon, ICON_OVERLAY) + + door_front_icon.AddAlphaMask(icon(base_icon, "door_front")) // Remove pesky 'more than just door' decals + closed_locked_icon = icon(closed_emagged_icon) closed_unlocked_icon = icon(closed_emagged_icon) @@ -83,13 +95,15 @@ closed_emagged_welded_icon.Blend(sparks, ICON_OVERLAY) // Insert our bevy of icons into the final icon file. - new_icon.Insert(open_icon, "open") - new_icon.Insert(closed_emagged_icon, "closed_emagged") - new_icon.Insert(closed_emagged_welded_icon, "closed_emagged_welded") - new_icon.Insert(closed_locked_icon, "closed_locked") - new_icon.Insert(closed_locked_welded_icon, "closed_locked_welded") - new_icon.Insert(closed_unlocked_icon, "closed_unlocked") - new_icon.Insert(closed_unlocked_welded_icon, "closed_unlocked_welded") + new_icon.Insert(open_icon, "open") + new_icon.Insert(closed_emagged_icon, "closed_emagged") + new_icon.Insert(closed_emagged_welded_icon, "closed_emagged_welded") + new_icon.Insert(closed_locked_icon, "closed_locked") + new_icon.Insert(closed_locked_welded_icon, "closed_locked_welded") + new_icon.Insert(closed_unlocked_icon, "closed_unlocked") + new_icon.Insert(closed_unlocked_welded_icon, "closed_unlocked_welded") + new_icon.Insert(door_front_icon, "door_front") + new_icon.Insert(door_back_icon, "door_back") // Set icon! icon = new_icon diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm index 3865641552..b42bbcb778 100644 --- a/code/game/objects/structures/crates_lockers/closets/coffin.dm +++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm @@ -7,6 +7,7 @@ seal_tool = /obj/item/weapon/tool/screwdriver breakout_sound = 'sound/weapons/tablehit1.ogg' closet_appearance = null // Special icon for us + door_anim_time = 0 //Unsupported /* Graves */ /obj/structure/closet/grave @@ -20,6 +21,7 @@ max_closets = 1 opened = 1 closet_appearance = null // Special icon for us + door_anim_time = 0 //Unsupported /obj/structure/closet/grave/attack_hand(mob/user as mob) if(opened) diff --git a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm index 72a9188d12..0e7763e827 100644 --- a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm @@ -1,4 +1,5 @@ /obj/structure/closet/crate/critter name = "critter crate" desc = "A crate which can sustain life for a while." - closet_appearance = /decl/closet_appearance/large_crate/critter \ No newline at end of file + closet_appearance = /decl/closet_appearance/large_crate/critter + door_anim_time = 0 //Unsupported \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm index 19d3f8b452..d024a71582 100644 --- a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm @@ -13,6 +13,7 @@ opened = 0 sealed = 0 //Don't touch this. health = 100 + door_anim_time = 0 //Unsupported /obj/structure/closet/secure_closet/egg/update_icon() if(opened) diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 6ba78a90a0..2023737b8f 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -1,7 +1,9 @@ /obj/structure/closet/cabinet name = "cabinet" desc = "Old will forever be in fashion." + icon = 'icons/obj/closets/bases/cabinet.dmi' closet_appearance = /decl/closet_appearance/cabinet + door_anim_time = 0 //Unsupported /obj/structure/closet/acloset name = "strange closet" diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 4f73d4151c..e1a58bb0ca 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -1,8 +1,16 @@ -/* Closets for specific jobs +/* + * Closets for specific jobs * Contains: * Bartender * Janitor * Lawyer + * Janitorial Equipment + * + * + * These have been removed from the map for the most part, however + * do not remove these in case people want to make maps or POIs + * with these closets. + * */ /* @@ -28,7 +36,8 @@ /obj/item/clothing/under/dress/dress_saloon, /obj/item/clothing/accessory/wcoat = 2, /obj/item/clothing/shoes/black = 2, - /obj/item/clothing/shoes/laceup) + /obj/item/clothing/shoes/laceup + ) /* * Chef @@ -45,7 +54,8 @@ /obj/item/weapon/storage/box/mousetraps = 2, /obj/item/clothing/under/rank/chef, /obj/item/clothing/head/chefhat, - /obj/item/weapon/storage/bag/food = 2) + /obj/item/weapon/storage/bag/food = 2 + ) /* * Janitor @@ -68,7 +78,8 @@ /obj/item/device/lightreplacer, /obj/item/weapon/storage/bag/trash, /obj/item/weapon/storage/belt/janitor, - /obj/item/clothing/shoes/galoshes) + /obj/item/clothing/shoes/galoshes + ) /* * Lawyer @@ -97,4 +108,23 @@ /obj/item/clothing/glasses/sunglasses/big = 2, /obj/item/clothing/under/lawyer/blue = 2, /obj/item/clothing/under/lawyer/blue/skirt = 2, - /obj/item/device/tape/random = 2) \ No newline at end of file + /obj/item/device/tape/random = 2 + ) + +/* + * Janitorial Equipment + */ +/obj/structure/closet/jequipcloset + name = "custodial equipment closet" + desc = "It's a storage unit for janitorial clothes and gear." + closet_appearance = /decl/closet_appearance/wardrobe/janitor + + starts_with = list( + /obj/item/device/flashlight = 5, + /obj/item/clothing/suit/caution = 12, + /obj/item/device/lightreplacer = 3, + /obj/item/weapon/storage/bag/trash = 3, + /obj/item/weapon/storage/box/lights/mixed = 3, + /obj/item/weapon/storage/box/mousetraps = 1, + /obj/item/weapon/grenade/chem_grenade/cleaner = 4 + ) \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm index cd51af7b2a..da49626d58 100644 --- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm @@ -1,5 +1,20 @@ -//Gun Cabinets +/* + * Closets for Virgo + * Contains: + * Gun Cabinets + * Explorer + * Pathfinder + * SAR/Field Medic + * Pilot/Navigator + * Exotic Seeds + * Autolok Suit + * Emergency Suit (Wall) + * + */ +/* + * Gun Cabinets + */ /obj/structure/closet/secure_closet/guncabinet/sidearm name = "emergency weapon cabinet" req_one_access = list(access_armory,access_captain) @@ -7,7 +22,6 @@ starts_with = list( /obj/item/weapon/gun/energy/gun = 4) - /obj/structure/closet/secure_closet/guncabinet/rifle name = "rifle cabinet" req_one_access = list(access_explorer,access_brig) @@ -33,8 +47,9 @@ /obj/item/weapon/cell/device/weapon = 2, /obj/item/clothing/accessory/permit/gun/planetside) -//Explorer Lockers - +/* + * Explorer + */ /obj/structure/closet/secure_closet/explorer name = "explorer locker" req_access = list(access_explorer) @@ -73,8 +88,52 @@ starts_with += /obj/item/weapon/storage/backpack/dufflebag/explorer return ..() -//SAR Lockers +/* + * Pathfinder + */ +/obj/structure/closet/secure_closet/pathfinder + name = "pathfinder locker" + req_access = list(access_gateway) + closet_appearance = /decl/closet_appearance/secure_closet/expedition/pathfinder + starts_with = list( + /obj/item/clothing/under/explorer, + /obj/item/clothing/suit/storage/hooded/explorer, + /obj/item/clothing/mask/gas/explorer, + /obj/item/weapon/storage/belt/explorer/pathfinder, + /obj/item/clothing/shoes/boots/winter/explorer, + /obj/item/clothing/gloves/black, + /obj/item/device/radio/headset/pathfinder, + /obj/item/device/radio/headset/pathfinder/alt, + /obj/item/weapon/cartridge/explorer, + /obj/item/device/flashlight, + /obj/item/device/gps/explorer, + /obj/item/weapon/storage/box/flare, + /obj/item/weapon/storage/box/explorerkeys, + /obj/item/device/geiger, + /obj/item/weapon/cell/device, + /obj/item/device/radio, + /obj/item/device/bluespaceradio/tether_prelinked, + /obj/item/stack/marker_beacon/thirty, + /obj/item/weapon/material/knife/tacknife/survival, + /obj/item/weapon/material/knife/machete/deluxe, + /obj/item/clothing/accessory/holster/machete, + /obj/random/explorer_shield, + /obj/item/weapon/reagent_containers/food/snacks/liquidfood, + /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, + /obj/item/device/cataloguer/compact/pathfinder, + /obj/item/device/mapping_unit) + +/obj/structure/closet/secure_closet/pathfinder/Initialize() + if(prob(50)) + starts_with += /obj/item/weapon/storage/backpack + else + starts_with += /obj/item/weapon/storage/backpack/satchel/norm + return ..() + +/* + * SAR/Field Medic + */ /obj/structure/closet/secure_closet/sar name = "field medic locker" desc = "Supplies for a wilderness first responder." @@ -124,8 +183,9 @@ starts_with += /obj/item/weapon/storage/backpack/dufflebag/med return ..() -//Pilot Locker - +/* + * Pilot/Navigator + */ /obj/structure/closet/secure_closet/pilot name = "pilot locker" req_access = list(access_pilot) @@ -161,48 +221,9 @@ starts_with += /obj/item/weapon/storage/backpack/satchel/norm return ..() -/obj/structure/closet/secure_closet/pathfinder - name = "pathfinder locker" - req_access = list(access_gateway) - closet_appearance = /decl/closet_appearance/secure_closet/expedition/pathfinder - - starts_with = list( - /obj/item/clothing/under/explorer, - /obj/item/clothing/suit/storage/hooded/explorer, - /obj/item/clothing/mask/gas/explorer, - /obj/item/weapon/storage/belt/explorer/pathfinder, - /obj/item/clothing/shoes/boots/winter/explorer, - /obj/item/clothing/gloves/black, - /obj/item/device/radio/headset/pathfinder, - /obj/item/device/radio/headset/pathfinder/alt, - /obj/item/weapon/cartridge/explorer, - /obj/item/device/flashlight, - /obj/item/device/gps/explorer, - /obj/item/weapon/storage/box/flare, - /obj/item/weapon/storage/box/explorerkeys, - /obj/item/device/geiger, - /obj/item/weapon/cell/device, - /obj/item/device/radio, - /obj/item/device/bluespaceradio/tether_prelinked, - /obj/item/stack/marker_beacon/thirty, - /obj/item/weapon/material/knife/tacknife/survival, - /obj/item/weapon/material/knife/machete/deluxe, - /obj/item/clothing/accessory/holster/machete, - /obj/random/explorer_shield, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood, - /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, - /obj/item/device/cataloguer/compact/pathfinder, - /obj/item/device/mapping_unit) - -/obj/structure/closet/secure_closet/pathfinder/Initialize() - if(prob(50)) - starts_with += /obj/item/weapon/storage/backpack - else - starts_with += /obj/item/weapon/storage/backpack/satchel/norm - return ..() - -//Exotic Seeds Crate - +/* + * Exotic Seeds + */ /obj/structure/closet/crate/hydroponics/exotic name = "exotic seeds crate" desc = "All you need to destroy that pesky planet." @@ -215,6 +236,9 @@ /obj/item/seeds/libertymycelium, /obj/item/seeds/reishimycelium) +/* + * Autolok Suit + */ /obj/structure/closet/autolok_wall name = "autolok suit storage" desc = "It's wall-mounted storage unit for an AutoLok suit." @@ -231,6 +255,9 @@ /obj/item/device/suit_cooling_unit/emergency ) +/* + * Emergency Suit (Wall) + */ /obj/structure/closet/emergsuit_wall name = "emergency suit storage" desc = "It's wall-mounted storage unit for an emergency suit." diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 32ec022f71..2c69bef104 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -304,3 +304,4 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br //too small to put a man in large = 0 + door_anim_time = 0 // Unsupported diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 9b66918be0..c930b032a1 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -7,6 +7,7 @@ anchored = TRUE health = 0 //destroying the statue kills the mob within blocks_emissive = EMISSIVE_BLOCK_UNIQUE + door_anim_time = 0 // Why is this a closet?? var/intialTox = 0 //these are here to keep the mob from taking damage from things that logically wouldn't affect a rock var/intialFire = 0 //it's a little sloppy I know but it was this or the GODMODE flag. Lesser of two evils. var/intialBrute = 0 diff --git a/code/game/objects/structures/crates_lockers/closets/walllocker.dm b/code/game/objects/structures/crates_lockers/closets/walllocker.dm index f140e7380f..0bf549f06a 100644 --- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm @@ -10,6 +10,7 @@ anchored = TRUE store_mobs = 0 wall_mounted = 1 + door_anim_time = 0 // Unsupported //spawns 2 sets of breathmask, emergency oxy tank and crowbar diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index eec6a8d892..bc178de97e 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -7,6 +7,7 @@ closet_appearance = /decl/closet_appearance/crate climbable = TRUE dir = 4 //Spawn facing 'forward' by default. + door_anim_time = 0 //Unsupported until appropriate sprites are available var/points_per_crate = 5 var/rigged = 0 diff --git a/code/game/objects/structures/dancepole_vr.dm b/code/game/objects/structures/dancepole_vr.dm index 3a548f1133..90270b88ce 100644 --- a/code/game/objects/structures/dancepole_vr.dm +++ b/code/game/objects/structures/dancepole_vr.dm @@ -2,10 +2,22 @@ /obj/structure/dancepole name = "dance pole" desc = "Engineered for your entertainment" - icon = 'icons/obj/objects_vr.dmi' - icon_state = "dancepole" + icon = 'icons/obj/casino.dmi' + icon_state = "dance_pole" density = FALSE anchored = TRUE + density = 0 + +/obj/structure/dancepole/attack_hand(mob/user) + dance(user) + user.spin(32,2) + ..() + +/obj/structure/dancepole/proc/dance(mob/user) + if(layer == BELOW_MOB_LAYER) + layer = ABOVE_MOB_LAYER + else + layer = BELOW_MOB_LAYER /obj/structure/dancepole/attackby(var/obj/item/O as obj, var/mob/user as mob) if(O.is_screwdriver()) @@ -22,4 +34,4 @@ if(!src) return to_chat(user, "You dissasembled \the [src]!") new /obj/item/stack/material/steel(src.loc, 1) - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index fdfae03727..bbcd3e8840 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -2,26 +2,23 @@ name = "extinguisher cabinet" desc = "A small wall mounted cabinet designed to hold a fire extinguisher." icon = 'icons/obj/closet.dmi' - icon_state = "extinguisher_closed" + icon_state = "extinguisher" // map preview sprite layer = ABOVE_WINDOW_LAYER anchored = TRUE density = FALSE var/obj/item/weapon/extinguisher/has_extinguisher var/opened = 0 -/obj/structure/extinguisher_cabinet/New(var/loc, var/dir, var/building = 0) - ..() +/obj/structure/extinguisher_cabinet/Initialize(var/mapload, var/dir, var/building = 0) + . = ..() if(building) - if(loc) - src.loc = loc - pixel_x = (dir & 3)? 0 : (dir == 4 ? -27 : 27) pixel_y = (dir & 3)? (dir ==1 ? -27 : 27) : 0 - update_icon() - return else has_extinguisher = new/obj/item/weapon/extinguisher(src) + + update_icon() /obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user) if(isrobot(user)) @@ -79,13 +76,17 @@ update_icon() /obj/structure/extinguisher_cabinet/update_icon() - if(!opened) - icon_state = "extinguisher_closed" - return + var/suffix = "empty" if(has_extinguisher) if(istype(has_extinguisher, /obj/item/weapon/extinguisher/mini)) - icon_state = "extinguisher_mini" + suffix = "mini" else - icon_state = "extinguisher_full" - else - icon_state = "extinguisher_empty" + suffix = "standard" + + icon_state = "[initial(icon_state)][opened ? "" : "_closed"]_[suffix]" + +/obj/structure/extinguisher_cabinet/old + name = "extinguisher cabinet" + desc = "A classic small wall mounted cabinet designed to hold a fire extinguisher." + icon = 'icons/obj/closet.dmi' + icon_state = "oldextinguisher" // map preview sprite diff --git a/code/game/objects/structures/salvageable.dm b/code/game/objects/structures/salvageable.dm index 0a35848d8d..2073e15034 100644 --- a/code/game/objects/structures/salvageable.dm +++ b/code/game/objects/structures/salvageable.dm @@ -364,3 +364,30 @@ /obj/item/weapon/computer_hardware/card_slot = 40, /obj/item/weapon/computer_hardware/network_card/advanced = 40 ) + + +/obj/structure/salvageable/slotmachine1 + name = "broken slot machine" + icon_state = "slot1" + salvageable_parts = list( + /obj/item/stack/cable_coil{amount = 5} = 90, + /obj/item/weapon/stock_parts/console_screen = 90, + /obj/item/stack/cable_coil{amount = 5} = 90, + /obj/item/stack/material/glass{amount = 5} = 90, + /obj/item/weapon/stock_parts/capacitor = 60, + /obj/item/weapon/stock_parts/capacitor = 60, + /obj/item/weapon/computer_hardware/network_card/advanced = 40 + ) + +/obj/structure/salvageable/slotmachine2 + name = "broken slot machine" + icon_state = "slot2" + salvageable_parts = list( + /obj/item/stack/cable_coil{amount = 5} = 90, + /obj/item/weapon/stock_parts/console_screen = 90, + /obj/item/stack/cable_coil{amount = 5} = 90, + /obj/item/stack/material/glass{amount = 5} = 90, + /obj/item/weapon/stock_parts/capacitor = 60, + /obj/item/weapon/stock_parts/capacitor = 60, + /obj/item/weapon/computer_hardware/network_card/advanced = 40 + ) \ No newline at end of file diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 4a3c5b53ff..690164e265 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -275,6 +275,43 @@ icon_state = "pewend_right" base_icon = "pewend_right" +// Metal benches from Skyrat +/obj/structure/bed/chair/sofa/bench + name = "metal bench" + desc = "Almost as comfortable as waiting at a bus station for hours on end." + base_icon = "benchmiddle" + icon_state = "benchmiddle" + applies_material_colour = FALSE + color = null + var/padding_color = "#CC0000" + +/obj/structure/bed/chair/sofa/bench/Initialize() + . = ..() + var/mutable_appearance/MA + // If we're north-facing, metal goes above mob, padding overlay goes below mob. + if((dir & NORTH) && !corner_piece) + plane = MOB_PLANE + layer = ABOVE_MOB_LAYER + MA = mutable_appearance(icon, icon_state = "o[icon_state]", layer = BELOW_MOB_LAYER, plane = MOB_PLANE, appearance_flags = KEEP_APART|RESET_COLOR) + // Else just normal plane and layer for everything, which will be below mobs. + else + MA = mutable_appearance(icon, icon_state = "o[icon_state]", appearance_flags = KEEP_APART|RESET_COLOR) + MA.color = padding_color + add_overlay(MA) + +/obj/structure/bed/chair/sofa/bench/left + icon_state = "bench_left" + base_icon = "bench_left" + +/obj/structure/bed/chair/sofa/bench/right + icon_state = "bench_right" + base_icon = "bench_right" + +/obj/structure/bed/chair/sofa/bench/corner + icon_state = "benchcorner" + base_icon = "benchcorner" + //corner_piece = TRUE // These sprites work fine without the parent doing layer shenanigans + // Corporate sofa - one color fits all /obj/structure/bed/chair/sofa/corp name = "black leather sofa" 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 a5af6b9463..fe806c79bd 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..e03eff3e0c --- /dev/null +++ b/code/game/turfs/simulated/fancy_shuttles.dm @@ -0,0 +1,332 @@ +/** + * 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 + +// Reinforced hull steel +/turf/simulated/wall/fancy_shuttle/Initialize(mapload, materialtype, rmaterialtype, girdertype) + . = ..(mapload, MAT_STEELHULL, MAT_STEELHULL, MAT_STEELHULL) + +/turf/simulated/wall/fancy_shuttle/window + opacity = FALSE + icon_state = "hull_transparent" + +/turf/simulated/wall/fancy_shuttle/window/attack_generic(mob/user, damage, attack_message) + take_damage(damage) + return damage + +/turf/simulated/wall/fancy_shuttle/nondense + density = FALSE + blocks_air = FALSE + opacity = FALSE + icon_state = "hull_nondense" + +/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 ..() + +// No girders, and Eris plating +/turf/simulated/wall/fancy_shuttle/dismantle_wall(var/devastated, var/explode, var/no_product) + + playsound(src, 'sound/items/Welder.ogg', 100, 1) + if(!no_product && !devastated) + material.place_dismantled_product(src) + if (!reinf_material) + material.place_dismantled_product(src) + + clear_plants() + material = get_material_by_name("placeholder") + reinf_material = null + girder_material = null + + ChangeTurf(/turf/simulated/floor/plating/eris/under) + +/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' + +/** + * Explo shuttle + * North facing: W:13, H:18 + */ +/obj/effect/fancy_shuttle/exploration + icon = 'icons/turf/fancy_shuttles/exploration_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/exploration.dmi' +/obj/effect/fancy_shuttle_floor_preview/exploration + icon = 'icons/turf/fancy_shuttles/exploration_preview.dmi' + +/** + * Sec shuttle + * North facing: W:13, H:18 + */ +/obj/effect/fancy_shuttle/security + icon = 'icons/turf/fancy_shuttles/security_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/security.dmi' +/obj/effect/fancy_shuttle_floor_preview/security + icon = 'icons/turf/fancy_shuttles/security_preview.dmi' + +/** + * Med shuttle + * North facing: W:13, H:18 + */ +/obj/effect/fancy_shuttle/medical + icon = 'icons/turf/fancy_shuttles/medical_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/medical.dmi' +/obj/effect/fancy_shuttle_floor_preview/medical + icon = 'icons/turf/fancy_shuttles/medical_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/simulated/floor_attackby.dm b/code/game/turfs/simulated/floor_attackby.dm index 8342a5d6e8..4f70fc5918 100644 --- a/code/game/turfs/simulated/floor_attackby.dm +++ b/code/game/turfs/simulated/floor_attackby.dm @@ -46,10 +46,10 @@ return // Create a ceiling to shield from the weather - if(src.outdoors) + if(src.is_outdoors()) for(var/dir in cardinal) var/turf/A = get_step(src, dir) - if(A && !A.outdoors) + if(A && !A.is_outdoors()) if(expended_tile || R.use(1)) make_indoors() playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) diff --git a/code/game/turfs/simulated/floor_icon.dm b/code/game/turfs/simulated/floor_icon.dm index d975f81090..420d8628b5 100644 --- a/code/game/turfs/simulated/floor_icon.dm +++ b/code/game/turfs/simulated/floor_icon.dm @@ -87,7 +87,7 @@ var/image/no_ceiling_image = null // Show 'ceilingless' overlay. var/turf/above = GetAbove(src) - if(above && isopenspace(above) && !istype(src, /turf/simulated/floor/outdoors)) // This won't apply to outdoor turfs since its assumed they don't have a ceiling anyways. + if(!is_outdoors() && above && isopenspace(above)) // This won't apply to outdoor turfs since its assumed they don't have a ceiling anyways. add_overlay(no_ceiling_image) // Update our 'them-to-us' edges, aka edges from external turfs we feel should spill onto us diff --git a/code/game/turfs/simulated/lava.dm b/code/game/turfs/simulated/lava.dm index f2902abdfe..e44ac49a66 100644 --- a/code/game/turfs/simulated/lava.dm +++ b/code/game/turfs/simulated/lava.dm @@ -17,11 +17,11 @@ initial_flooring = /decl/flooring/lava // Defining this in case someone DOES step on lava and survive. Somehow. /turf/simulated/floor/lava/outdoors - outdoors = TRUE + outdoors = OUTDOORS_YES // For maximum pedantry. /turf/simulated/floor/lava/Initialize() - if(!outdoors) + if(!is_outdoors()) name = "magma" update_icon() update_light() diff --git a/code/game/turfs/simulated/outdoors/outdoors.dm b/code/game/turfs/simulated/outdoors/outdoors.dm index 8ca1659d1b..84c91366f1 100644 --- a/code/game/turfs/simulated/outdoors/outdoors.dm +++ b/code/game/turfs/simulated/outdoors/outdoors.dm @@ -1,11 +1,16 @@ var/list/turf_edge_cache = list() -/turf/ +/turf // If greater than 0, this turf will apply edge overlays on top of other turfs cardinally adjacent to it, if those adjacent turfs are of a different icon_state, // and if those adjacent turfs have a lower edge_blending_priority. var/edge_blending_priority = 0 // Outdoors var determines if the game should consider the turf to be 'outdoors', which controls certain things such as weather effects. - var/outdoors = FALSE + var/outdoors = OUTDOORS_AREA + +/area + // If a turf's `outdoors` variable is set to `OUTDOORS_AREA`, + // it will decide if it's outdoors or not when being initialized based on this var. + var/outdoors = OUTDOORS_NO /turf/simulated/floor/outdoors name = "generic ground" @@ -13,7 +18,7 @@ var/list/turf_edge_cache = list() icon = 'icons/turf/outdoors.dmi' icon_state = null edge_blending_priority = 1 - outdoors = TRUE // This variable is used for weather effects. + outdoors = OUTDOORS_YES // This variable is used for weather effects. can_dirty = FALSE // Looks hideous with dirt on it. can_build_into_floor = TRUE @@ -21,31 +26,51 @@ var/list/turf_edge_cache = list() var/list/turf_layers = list(/turf/simulated/floor/outdoors/rocks) /turf/simulated/floor/Initialize(mapload) - if(outdoors) + if(is_outdoors()) SSplanets.addTurf(src) . = ..() /turf/simulated/floor/Destroy() - if(outdoors) + if(is_outdoors()) SSplanets.removeTurf(src) return ..() +// Turfs can decide if they should be indoors or outdoors. +// By default they choose based on their area's setting. +// This helps cut down on ten billion `/outdoors` subtypes being needed. +/turf/proc/is_outdoors() + return FALSE + +/turf/simulated/is_outdoors() + switch(outdoors) + if(OUTDOORS_YES) + return TRUE + if(OUTDOORS_NO) + return FALSE + if(OUTDOORS_AREA) + var/area/A = loc + if(A.outdoors == OUTDOORS_YES) + return TRUE + return FALSE + +/// Makes the turf explicitly outdoors. /turf/simulated/proc/make_outdoors() - if(outdoors) + if(is_outdoors()) // Already outdoors. return - outdoors = TRUE + outdoors = OUTDOORS_YES SSplanets.addTurf(src) +/// Makes the turf explicitly indoors. /turf/simulated/proc/make_indoors() - if(!outdoors) + if(!is_outdoors()) // Already indoors. return - outdoors = FALSE + outdoors = OUTDOORS_NO SSplanets.removeTurf(src) /turf/simulated/post_change() ..() // If it was outdoors and still is, it will not get added twice when the planet controller gets around to putting it in. - if(outdoors) + if(is_outdoors()) make_outdoors() else make_indoors() @@ -63,7 +88,7 @@ var/list/turf_edge_cache = list() edge_blending_priority = 1 /turf/simulated/floor/outdoors/rocks/caves - outdoors = FALSE + outdoors = OUTDOORS_NO // This proc adds a 'layer' on top of the turf. /turf/simulated/floor/outdoors/proc/promote(var/new_turf_type) diff --git a/code/game/turfs/simulated/outdoors/outdoors_vr.dm b/code/game/turfs/simulated/outdoors/outdoors_vr.dm index a7233b4329..9e5f6961c9 100644 --- a/code/game/turfs/simulated/outdoors/outdoors_vr.dm +++ b/code/game/turfs/simulated/outdoors/outdoors_vr.dm @@ -1,7 +1,7 @@ /turf/simulated/floor/tiled/asteroid_steel/outdoors name = "weathered tiles" desc = "Old tiles left out in the elements." - outdoors = 1 + outdoors = OUTDOORS_YES edge_blending_priority = 1 /turf/simulated/floor/outdoors/newdirt diff --git a/code/game/turfs/simulated/outdoors/sky.dm b/code/game/turfs/simulated/outdoors/sky.dm index 3188302288..2f9f8106bb 100644 --- a/code/game/turfs/simulated/outdoors/sky.dm +++ b/code/game/turfs/simulated/outdoors/sky.dm @@ -4,7 +4,7 @@ desc = "Hope you don't have a fear of heights." icon = 'icons/turf/floors.dmi' icon_state = "sky_slow" - outdoors = TRUE + outdoors = OUTDOORS_YES // Assume there's a vacuum for the purposes of avoiding active edges at initialization, as well as ZAS fun if a window breaks. oxygen = 0 diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm index 72edce4503..036cfd5728 100644 --- a/code/game/turfs/simulated/wall_attacks.dm +++ b/code/game/turfs/simulated/wall_attacks.dm @@ -171,7 +171,7 @@ return // Create a ceiling to shield from the weather - if(outdoors) + if(is_outdoors()) if(expended_tile || R.use(1)) // Don't need to check adjacent turfs for a wall, we're building on one make_indoors() if(!expended_tile) // Would've already played a sound diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm index eaef2357b8..d1f0dd37dd 100644 --- a/code/game/turfs/simulated/water.dm +++ b/code/game/turfs/simulated/water.dm @@ -8,7 +8,7 @@ var/under_state = "rock" edge_blending_priority = -1 movement_cost = 4 - outdoors = TRUE + outdoors = OUTDOORS_YES layer = WATER_FLOOR_LAYER @@ -106,12 +106,12 @@ name = "pool" desc = "Don't worry, it's not closed." under_state = "pool" - outdoors = FALSE + outdoors = OUTDOORS_NO /turf/simulated/floor/water/deep/pool name = "deep pool" desc = "Don't worry, it's not closed." - outdoors = FALSE + outdoors = OUTDOORS_NO /mob/living/proc/can_breathe_water() return FALSE diff --git a/code/game/turfs/simulated/water_vr.dm b/code/game/turfs/simulated/water_vr.dm index ea16037cf7..9063f6afc3 100644 --- a/code/game/turfs/simulated/water_vr.dm +++ b/code/game/turfs/simulated/water_vr.dm @@ -1,5 +1,5 @@ /turf/simulated/floor/water/indoors //because it's nice to be able to use these indoors without having a blizzard ignore walls and areas. - outdoors = FALSE + outdoors = OUTDOORS_NO /turf/simulated/floor/water/deep/indoors - outdoors = FALSE \ No newline at end of file + outdoors = OUTDOORS_NO \ No newline at end of file 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/game/turfs/unsimulated/beach_vr.dm b/code/game/turfs/unsimulated/beach_vr.dm index be3130a72e..6fe6b07b2c 100644 --- a/code/game/turfs/unsimulated/beach_vr.dm +++ b/code/game/turfs/unsimulated/beach_vr.dm @@ -1,5 +1,5 @@ /turf/simulated/floor/beach/sand/outdoors - outdoors = TRUE + outdoors = OUTDOORS_YES /turf/simulated/floor/beach/sand/desert/outdoors - outdoors = TRUE \ No newline at end of file + outdoors = OUTDOORS_YES \ No newline at end of file diff --git a/code/modules/admin/verbs/lightning_strike.dm b/code/modules/admin/verbs/lightning_strike.dm index 96f5419f99..d00fb4a1af 100644 --- a/code/modules/admin/verbs/lightning_strike.dm +++ b/code/modules/admin/verbs/lightning_strike.dm @@ -40,13 +40,13 @@ for(var/obj/machinery/power/thing in range(LIGHTNING_REDIRECT_RANGE, T)) if(istype(thing, /obj/machinery/power/tesla_coil)) var/turf/simulated/coil_turf = get_turf(thing) - if(istype(coil_turf) && thing.anchored && coil_turf.outdoors) + if(istype(coil_turf) && thing.anchored && coil_turf.is_outdoors()) coil = thing break if(istype(thing, /obj/machinery/power/grounding_rod)) var/turf/simulated/rod_turf = get_turf(thing) - if(istype(rod_turf) && thing.anchored && rod_turf.outdoors) + if(istype(rod_turf) && thing.anchored && rod_turf.is_outdoors()) ground = thing if(coil) // Coil gets highest priority. diff --git a/code/modules/ai/ai_holder_combat.dm b/code/modules/ai/ai_holder_combat.dm index edfe3eacc6..29c58e5670 100644 --- a/code/modules/ai/ai_holder_combat.dm +++ b/code/modules/ai/ai_holder_combat.dm @@ -318,6 +318,11 @@ if(D.density) ai_log("destroy_surroundings() : Attacking closed door.", AI_LOG_INFO) return melee_attack(D) + + // Should always be last thing attempted + if(!problem_turf.opacity) + ai_log("destroy_surroundings() : Attacking a transparent (window?) turf.", AI_LOG_INFO) + return melee_attack(problem_turf) ai_log("destroy_surroundings() : Exiting due to nothing to attack.", AI_LOG_INFO) return ATTACK_FAILED // Nothing to attack. diff --git a/code/modules/casino/casino.dm b/code/modules/casino/casino.dm new file mode 100644 index 0000000000..eeb850f688 --- /dev/null +++ b/code/modules/casino/casino.dm @@ -0,0 +1,485 @@ + +//Original Casino Code created by Shadowfire117#1269 - Ported from CHOMPstation +//Modified by GhostActual#2055 for use with VOREstation + +// +//Roulette Table +// + +/obj/structure/casino_table + name = "casino table" + desc = "this is an unremarkable table for a casino." + icon = 'icons/obj/casino.dmi' + icon_state = "roulette_table" + density = 1 + anchored = 1 + climbable = 1 + layer = TABLE_LAYER + throwpass = 1 + var/item_place = 1 //allows items to be placed on the table, but not on benches. + + var/busy = 0 + +/obj/structure/casino_table/attackby(obj/item/W as obj, mob/user as mob) + if(item_place) + user.drop_item(src.loc) + return + +/obj/structure/casino_table/roulette_table + name = "roulette" + desc = "Spin the roulette to try your luck." + icon_state = "roulette_wheel" + +/obj/structure/casino_table/roulette_table/attack_hand(mob/user as mob) + if (busy) + to_chat(user,"You cannot spin now! The roulette is already spinning. ") + return + visible_message("\ [user] spins the roulette and throws inside little ball.") + playsound(src.loc, 'sound/machines/roulette.ogg', 40, 1) + busy = 1 + icon_state = "roulette_wheel_spinning" + var/result = rand(0,36) + var/color = "green" + add_fingerprint(user) + if ((result>0 && result<11) || (result>18 && result<29)) + if (result%2) + color="red" + else + color="black" + if ( (result>10 && result<19) || (result>28) ) + if (result%2) + color="black" + else + color="red" + spawn(5 SECONDS) + visible_message("The roulette stops spinning, the ball landing on [result], [color].") + busy=0 + icon_state = "roulette_wheel" + +/obj/structure/casino_table/roulette_chart + name = "roulette chart" + desc = "Roulette chart. Place your bets!" + icon_state = "roulette_table" + +// +//Blackjack table - no sprite +// + +/obj/structure/casino_table/blackjack_l + name = "gambling table" + desc = "Gambling table, try your luck and skills! " + icon_state = "blackjack_l" + +/obj/structure/casino_table/blackjack_r + name = "gambling table" + desc = "Gambling table, try your luck and skills! " + icon_state = "blackjack_r" + +/obj/structure/casino_table/blackjack_m + name = "gambling table" + desc = "Gambling table, try your luck and skills! " + icon_state = "blackjack_m" + +// +//Wheel. Of. FORTUNE! +// + +/obj/machinery/wheel_of_fortune + name = "wheel of fortune" + desc = "The Wheel of Fortune! Insert chips and may fortune favour the lucky one at the next lottery!" + icon = 'icons/obj/64x64.dmi' + icon_state = "wheel_of_fortune" + density = 1 + anchored = 1 + pixel_x = -16 + + req_access = list(300) + var/interval = 1 + var/busy = 0 + var/public_spin = 0 + var/lottery_sale = "disabled" + var/lottery_price = 100 + var/lottery_entries = 0 + var/lottery_tickets = list() + var/lottery_tickets_ckeys = list() + + var/datum/effect/effect/system/confetti_spread + var/confetti_strength = 15 + + +/obj/machinery/wheel_of_fortune/attack_hand(mob/user as mob) + if (busy) + to_chat(user,"The wheel of fortune is already spinning! ") + return + + if(usr.incapacitated()) + return + if(ishuman(usr) || istype(usr, /mob/living/silicon/robot)) + switch(input(user,"Choose what to do","Wheel Of Fortune") in list("Spin the Wheel! (Not Lottery)", "Set the interval", "Cancel")) + if("Cancel") + return + if("Spin the Wheel! (Not Lottery)") + if(public_spin == 0) + to_chat(user,"The Wheel makes a sad beep, public spins are not enabled right now.. ") + return + else + to_chat(user,"You spin the wheel! ") + spin_the_wheel("not_lottery") + if("Set the interval") + setinterval() + + +/obj/machinery/wheel_of_fortune/attackby(obj/item/weapon/W as obj, mob/user as mob) + if (busy) + to_chat(user,"The wheel of fortune is already spinning! ") + return + + if(usr.incapacitated()) + return + + if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) + if(!check_access(W)) + to_chat(user, "Access Denied.") + return + else + to_chat(user, "Proper access, allowed staff controls.") + if(ishuman(usr) || istype(usr, /mob/living/silicon/robot)) + switch(input(user,"Choose what to do (Management)","Wheel Of Fortune (Management)") in list("Spin the Lottery Wheel!", "Toggle Lottery Sales", "Toggle Public Spins", "Reset Lottery", "Cancel")) + if("Cancel") + return + if("Spin the Lottery Wheel!") + to_chat(user,"You spin the wheel for the lottery! ") + spin_the_wheel("lottery") + + if("Toggle Lottery Sales") + if(lottery_sale == "disabled") + lottery_sale = "enabled" + to_chat(user,"Public Lottery sale has been enabled. ") + else + lottery_sale = "disabled" + to_chat(user,"Public Lottery sale has been disabled. ") + + if("Toggle Public Spins") + if(public_spin == 0) + public_spin = 1 + to_chat(user,"Public spins has been enabled. ") + else + public_spin = 0 + to_chat(user,"Public spins has been disabled. ") + + if("Reset Lottery") + var/confirm = tgui_alert(usr, "Are you sure you want to reset Lottery?", "Confirm Lottery Reset", list("Yes", "No")) + if(confirm == "Yes") + to_chat(user, "Lottery has been Reset!") + lottery_entries = 0 + lottery_tickets = list() + lottery_tickets_ckeys = list() + + if(istype(W, /obj/item/weapon/spacecasinocash)) + if(lottery_sale == "disabled") + to_chat(user, "Lottery sales are currently disabled.") + return + else + if(user.client.ckey in lottery_tickets_ckeys) + to_chat(user, "The scanner beeps in an upset manner, you already have a ticket!") + return + + var/obj/item/weapon/spacecasinocash/C = W + insert_chip(C, user) + +/obj/machinery/wheel_of_fortune/proc/insert_chip(var/obj/item/weapon/spacecasinocash/cashmoney, mob/user) + if (busy) + to_chat(user,"The Wheel of Fortune is busy, wait for it to be done to buy a lottery ticket. ") + return + if(cashmoney.worth < lottery_price) + to_chat(user,"You dont have enough chips to buy a lottery ticket! ") + return + + to_chat(user,"You put [lottery_price] credits worth of chips into the Wheel of Fortune and it pings to notify of your lottery ticket registered!") + cashmoney.worth -= lottery_price + cashmoney.update_icon() + + if(cashmoney.worth <= 0) + usr.drop_from_inventory(cashmoney) + qdel(cashmoney) + cashmoney.update_icon() + + lottery_entries++ + lottery_tickets += "Number.[lottery_entries] [user.name]" + lottery_tickets_ckeys += user.client.ckey + +/obj/machinery/wheel_of_fortune/proc/spin_the_wheel(var/mode) + var/result = 0 + + if(mode == "not_lottery") + busy = 1 + icon_state = "wheel_of_fortune_spinning" + result = rand(1,interval) + + spawn(5 SECONDS) + visible_message("The wheel of fortune stops spinning, the number is [result]!") + src.confetti_spread = new /datum/effect/effect/system/confetti_spread() + src.confetti_spread.attach(src) //If somehow people start dragging slot machine + spawn(0) + for(var/i = 1 to confetti_strength) + src.confetti_spread.start() + sleep(10) + + flick("[icon_state]-winning",src) + busy = 0 + icon_state = "wheel_of_fortune" + + if(mode == "lottery") + if(lottery_entries == 0) + visible_message("There are no tickets in the system!") + return + + busy = 1 + icon_state = "wheel_of_fortune_spinning" + result = pick(lottery_tickets) + + spawn(5 SECONDS) + visible_message("The wheel of fortune stops spinning, and the winner is [result]!") + src.confetti_spread = new /datum/effect/effect/system/confetti_spread() + src.confetti_spread.attach(src) //If somehow people start dragging slot machine + spawn(0) + for(var/i = 1 to confetti_strength) + src.confetti_spread.start() + sleep(10) + + flick("[icon_state]-winning",src) + busy = 0 + icon_state = "wheel_of_fortune" + +/obj/machinery/wheel_of_fortune/verb/setinterval() + set name = "Change interval" + set category = "Object" + set src in view(1) + + if(usr.incapacitated()) + return + if(ishuman(usr) || istype(usr, /mob/living/silicon/robot)) + interval = input("Put the desired interval (1-1000)", "Set Interval") as num + if(interval>1000 || interval<1) + usr << "Invalid interval." + return + usr << "You set the interval to [interval]" + return + +// +//Slave Terminal +// + +/obj/machinery/casinoslave_handler + name = "Sentient Prize Automated Sales Machinery" + desc = "The Sentient Prize Automated Sales Machinery, also known as SPASM! Here one can see who is on sale as sentinet prizes, as well as selling self and also buying prizes." + icon = 'icons/obj/casino.dmi' + icon_state = "casinoslave_hub_off" + density = 1 + anchored = 1 + req_access = list(300) + + var/casinoslave_sale = "disabled" + var/casinoslave_price = 100 + var/collar_list = list() + var/slaves_ckeys_list = list() //Same trick as lottery, to keep life simple + var/obj/item/clothing/accessory/collar/casinoslave/selected_collar = null + +/obj/machinery/casinoslave_handler/attack_hand(mob/living/user as mob) + if(usr.incapacitated()) + return + if(casinoslave_sale == "disabled") + to_chat(user,"The SPASM is disabled. ") + return + + if(ishuman(usr) || istype(usr, /mob/living/silicon/robot)) + switch(input(user,"Choose what to do","SPASM") in list("Show selected Prize", "Select Prize", "Become Prize (Please examine yourself first)", "Cancel")) + if("Cancel") + return + if("Show selected Prize") + if(QDELETED(selected_collar)) + collar_list -= selected_collar + slaves_ckeys_list -= selected_collar.slaveckey + to_chat(user, "No collar is currently selected or the currently selected one has been destroyed or disabled.") + selected_collar = null + return + to_chat(user, "Sentient Prize information") + to_chat(user, "Name: [selected_collar.slavename]") + to_chat(user, "Description: [selected_collar.slaveflavor]") + to_chat(user, "OOC: [selected_collar.slaveooc]") + if(selected_collar.ownername != null) + to_chat(user, "This prize is already owned by [selected_collar.ownername]") + + if("Select Prize") + selected_collar = tgui_input_list(user, "Select a prize", "Chose a collar", collar_list) + if(QDELETED(selected_collar)) + collar_list -= selected_collar + slaves_ckeys_list -= selected_collar.slaveckey + to_chat(user, "No collars to chose, or selected collar has been destroyed or deactived, selection has been removed from list.") + selected_collar = null + return + + if("Become Prize (Please examine yourself first)") //Its awkward, but no easy way to obtain flavor_text due to server not loading text of mob until its been examined at least once. + var/safety_ckey = user.client.ckey + if(safety_ckey in slaves_ckeys_list) + to_chat(user, "The SPASM beeps in an upset manner, you already have a collar!") + return + var/confirm = tgui_alert(usr, "Are you sure you want to become a sentient prize?", "Confirm Sentient Prize", list("Yes", "No")) + if(confirm == "Yes") + to_chat(user, "You are now a prize!") + if(safety_ckey in slaves_ckeys_list) + to_chat(user, "The SPASM beeps in an upset manner, you already have a collar!") + return + slaves_ckeys_list += user.ckey + var/obj/item/clothing/accessory/collar/casinoslave/C = new(src.loc) + C.slavename = "[user.name]" + C.slaveckey = "[user.ckey]" + C.slaveflavor = user.flavor_text + C.slaveooc = user.ooc_notes + C.name = "Sentient Prize Collar: Available! [user.name] purchaseable at the SPASM!" + C.desc = "SPASM collar. The tags shows in flashy colorful text the wearer is [user.name] and is currently available to buy at the Sentient Prize Automated Sales Machinery!" + C.icon_state = "casinoslave_available" + C.update_icon() + collar_list += C + + spawn_casinochips(casinoslave_price, src.loc) + +/obj/machinery/casinoslave_handler/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(usr.incapacitated()) + return + + if(istype(W, /obj/item/weapon/spacecasinocash)) + if(casinoslave_sale == "disabled") + to_chat(user, "Sentient Prize sales are currently disabled.") + return + if(!selected_collar.ownername) + var/obj/item/weapon/spacecasinocash/C = W + if(user.client.ckey == selected_collar.slaveckey) + insert_chip(C, user, "selfbuy") + return + else + insert_chip(C, user, "buy") + return + else + to_chat(user, "This Sentient Prize is already owned! If you are the owner you can release the prize by swiping the collar on the SPASM!") + return + + if(istype(W, /obj/item/clothing/accessory/collar/casinoslave)) + var/obj/item/clothing/accessory/collar/casinoslave/C = W + if(user.name != C.slavename && user.name != C.ownername) + to_chat(user, "This Sentient Prize collar isn't yours, please give it to the one it tagged for, belongs to, or a casino staff member!") + return + if(user.name == C.slavename) + if(!C.ownername) + to_chat(user,"If collar isn't disabled and entry removed, please select your entry and insert chips. Or contact staff if you need assistance. ") + return + else + to_chat(user,"If collar isn't disabled and entry removed, please ask your owner to free you with collar swipe on the SPASM, or contact staff if you need assistance. ") + return + if(user.name == C.ownername) + var/confirm = tgui_alert(usr, "Are you sure you want to wipe [C.slavename] entry?", "Confirm Sentient Prize Release", list("Yes", "No")) + if(confirm == "Yes") + to_chat(user, "[C.slavename] collar has been deleted from registry!") + C.icon_state = "casinoslave" + C.update_icon() + C.name = "a disabled Sentient Prize Collar: [C.slavename]" + C.desc = "A collar worn by sentient prizes registered to a SPASM. The tag says its registered to [C.slavename], but harsh red text informs you its been disabled." + slaves_ckeys_list -= C.slaveckey + C.slaveckey = null + collar_list -= C + + if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) + if(!check_access(W)) + to_chat(user, "Access Denied.") + return + else + to_chat(user, "Proper access, allowed staff controls.") + if(ishuman(usr) || istype(usr, /mob/living/silicon/robot)) + switch(input(user,"Choose what to do (Management)","SPASM (Management)") in list("Toggle Sentient Prize Sales", "Wipe Selected Prize Entry", "Change Prize Value", "Cancel")) + if("Cancel") + return + + if("Toggle Sentient Prize Sales") + if(casinoslave_sale == "disabled") + casinoslave_sale = "enabled" + icon_state = "casinoslave_hub_on" + update_icon() + to_chat(user,"Prize sale has been enabled. ") + else + casinoslave_sale = "disabled" + icon_state = "casinoslave_hub_off" + update_icon() + to_chat(user,"Prize sale has been disabled. ") + + if("Wipe Selected Prize Entry") + if(!selected_collar) + to_chat(user, "No collar selected!") + return + if(QDELETED(selected_collar)) + collar_list -= selected_collar + slaves_ckeys_list -= selected_collar.slaveckey + to_chat(user, "Collar has been destroyed!") + selected_collar = null + return + var/safety_ckey = selected_collar.slaveckey + var/confirm = tgui_alert(usr, "Are you sure you want to wipe [selected_collar.slavename] entry?", "Confirm Sentient Prize", list("Yes", "No")) + if(confirm == "Yes") + if(safety_ckey == selected_collar.slaveckey) + to_chat(user, "[selected_collar.slavename] collar has been deleted from registry!") + selected_collar.icon_state = "casinoslave" + selected_collar.update_icon() + selected_collar.name = "a disabled Sentient Prize Collar: [selected_collar.slavename]" + selected_collar.desc = "A collar worn by sentient prizes registered to a SPASM. The tag says its registered to [selected_collar.slavename], but harsh red text informs you its been disabled." + slaves_ckeys_list -= selected_collar.slaveckey + selected_collar.slaveckey = null + collar_list -= selected_collar + selected_collar = null + else + to_chat(user, "Registry deletion aborted! Changed collar selection!") + return + + if("Change Prize Value") + setprice(user) + +/obj/machinery/casinoslave_handler/proc/insert_chip(var/obj/item/weapon/spacecasinocash/cashmoney, mob/user, var/buystate) + if(cashmoney.worth < casinoslave_price) + to_chat(user,"You dont have enough chips to pay for the sentient prize! ") + return + + cashmoney.worth -= casinoslave_price + cashmoney.update_icon() + + if(cashmoney.worth <= 0) + usr.drop_from_inventory(cashmoney) + qdel(cashmoney) + cashmoney.update_icon() + + if(buystate == "selfbuy") + to_chat(user,"You put [casinoslave_price] credits worth of chips into the SPASM and nullify your collar! ") + selected_collar.icon_state = "casinoslave" + selected_collar.update_icon() + selected_collar.name = "a disabled Sentient Prize Collar: [selected_collar.slavename]" + selected_collar.desc = "A collar worn by sentient prizes registered to a SPASM. The tag says its registered to [selected_collar.slavename], but harsh red text informs you its been disabled." + slaves_ckeys_list -= selected_collar.slaveckey + selected_collar.slaveckey = null + collar_list -= selected_collar + selected_collar = null + + if(buystate == "buy") + to_chat(user,"You put [casinoslave_price] credits worth of chips into the SPASM and it pings to inform you bought [selected_collar.slavename]! ") + selected_collar.icon_state = "casinoslave_owned" + selected_collar.update_icon() + selected_collar.ownername = user.name + selected_collar.name = "Sentient Prize Collar: [selected_collar.slavename] owned by [selected_collar.ownername]!" + selected_collar.desc = "A collar worn by sentient prizes registered to a SPASM. The tag says its registered to [selected_collar.slavename] and they are owned by [selected_collar.ownername]." + selected_collar = null + +/obj/machinery/casinoslave_handler/proc/setprice(mob/living/user as mob) + if(usr.incapacitated()) + return + if(ishuman(usr) || istype(usr, /mob/living/silicon/robot)) + casinoslave_price = input("Select the desired price (1-1000)", "Set Price") as num + if(casinoslave_price>1000 || casinoslave_price<1) + to_chat(user,"Invalid price. ") + return + to_chat(user,"You set the price to [casinoslave_price] ") diff --git a/code/modules/casino/casino_book.dm b/code/modules/casino/casino_book.dm new file mode 100644 index 0000000000..1f80817112 --- /dev/null +++ b/code/modules/casino/casino_book.dm @@ -0,0 +1,284 @@ + +//Original Casino Code created by Shadowfire117#1269 - Ported from CHOMPstation +//Modified by GhostActual#2055 for use with VOREstation + +// +//Casino Manual - NEEDS EDITING +// + +/obj/item/weapon/book/manual/casino + name = "A dummy guide to losing your thalers" + icon = 'icons/obj/casino.dmi' + icon_state ="casinomanual" + author = "Sleazy Serpent Saren" + w_class = 2 // To allow it to be stuffed away into wallets for easy readings during events + title = "A dummy guide to losing your thalers" + dat = {" + + + + + +

Contents

+
    +
  1. Foreword: Welcome to gambling!
    2. +
  2. Blackjack
    3. +
  3. Roulette
    4. +
  4. Poker
    5. +
  5. Cards against the galaxy
    6. +
  6. Prizes
    7. +
  7. Sentient prizes
    8. +
+
+

Foreword: Welcome to gambling!

+ In this book I'll teach you all about how to gamble your money away or at least get lucky and win some! This book also has a handy little overview of the prizes one can earn and the limitations of what can do with the living and breathing ones.
+ (This book will also contain out of character information to help people be aware of how touchy subjects like sentient prizes are to be handled.) + +

Blackjack

+ First up is the classic sport of blackjack, blackjack is played normally between a gambler and a dealer, the goal is to have the higher number than the opponent but not go above 21 or it will be a bust and one loses automatically.
+ The values of cards are as follow: + + A game of blackjack begins with the dealer giving the gambler two cards, in normal blackjack all cards dealt to gambler and dealer are always shown. The two cards dealt have their values put together, the gambler has three choices, stand, hit, or double down. + + When it becomes the dealer's turn they do the same as the gambler, though their only goal is to get a higher or equal value to gambler. The dealer cant double down, and the large majority of casino's has the rule that a dealer cant draw anymore cards once they reach or go above a value. The most common value is 17, and there are two variants to that rule, soft and hard 17. + + The casino who supplies this version of the manual follows the rule of hard 17.
+ The game ends when the dealer busts, reaches the threshold of what they are allowed to draw, or if they get a higher value than the gambler. Again, the one who has the highest value that isnt higher than 21 wins, but if both has the same value no one wins and the bet goes back to the gambler.
+ And thats it! Now go out there and gamble your savings away! This casino allows bets between 5 and 50 with double down ignoring that limit!

+ + But wait! Theres more! Theres also group blackjack! This game is a little different, the dealer can be part of it or simple deal for players, this game works differently with everyone keeping their hands hidden, everyone makes initial bets, gets two facedown cards, then its a matter of trying to get as good a hand as possible, but if you go bust, its over. But dont tell or show until everyone reveals! If youre going down, its best if youre opponents dont know they simply can play safe and win, if youre lucky everyone else gets themselves busted and you dont lose your beloved chips!
+ Its kinda like texas hold em in a way, everyone draws, folks can raise bets or fold, then draw more. Rinse and repeat until no one wants to raise any more nor draw cards, if everyone except one person has folded, they win by default even if they have busted, cause they dont need to reveal their hand that game, so you can choose to either sit and wait and fold if someone raise the bets, or you can gamble and make it look like you have an amazing hand and win by default since everyone else folds and no one is wise that you had a bust! This game has turned from simple probability and chance against the dealer to a game of risk and deception, fun fun fun! + +

Roulette

+ So this game of roulette is all about chance! what happens is that people bet on different odds and hope for the best as the dealer rolls the ball and makes that roulette thingy make than fun addicting spin! Once it lands on a number between 0 and 36 its either bust or payout! Pretty simple, right?
+ Everyone starts by putting their bets down, people can bet more than once before the ball goes rolling, the odds and their payoffs are these: + + Theres not much more to it! Bets made, ball rolls, number announced, people win, people lose! Bets allowed here are from 1 to 25 per bet. Oh, im also being told this casino has the fancy rule that if ball lands on 0, one wins at least one bet no matter what it is! So lets hope you got that big bet on a single number! + +

Poker

+ Aaah yes, good old poker. This casino runs by the rules of texas hold em, though the might be a little modified to be simpler for the average joe. In a game of poker it can be a single gambler and a dealer against each other, but most often its the dealer making the game proceed while several gamblers fights tooth and nail to steal each others chips, but the dealer can still join in on the free for all if they so wish!
+ To simply explain the game, people gamble with each other, a game of trying to get the best hand and raise bets or back out depending on what the outcome may be. The game starts with everyone betting a certain amount, it can be 5 or 10 chips depending on dealer, but if one wants to join, there needs to be chips on that table! Once everyone has made their initial bet, everyone gets two cards face down, these are kept hidden, no one not even dealer gets to see players cards until the end, not even folded cards are to be shown unless wanted to, sometimes its better making people unsure if you dropped out with bad cards or if you have other motives, deception is a large part of this game!
+ With everyone having cards dealt, its time for the dealer to lay three on the table face up, these cards are 3 of 5 cards in the community pool, everyone can use these cards to make sets like pairs and such, this doesnt mean they are taken, multiple people can use the same community card for their own sets!
+ With the community having three we enter the second betting stage, here people have two options, standing or raising. Standing means you dont want to raise, raising explains itself, though if someone bets, people have three options, commit putting the chips in to risk as much as the raised bet, but if one doesnt have enough, then they can still go all in with their remaining chips, one can also drop out if its too risky, the chips bet will remain on the table, but at least you wont lose more eh? Final one is to raise further, sometimes people can dare each other to raise more, but its not allowed for someone to raise, then raise further if no one else raises after them!
+ As said earlier, we got like a community pool of 5 cards total, this time another card is revealed and we enter a new betting phase, then the final fifth card is revealed and final bets are made, and then the cards are revealed so it can be determined who has the best hand! If two or more have equally good sets, then the chips are split evenly between them.
+ But notice, if someone is left because everyone else didnt dare to raise with their bet, they can decide to not reveal their hand, they might have had a winning hand, or maybe its terrible and they just bluffed their way to victory, only they know and can decide if they want to expose their cards to gloat or confuse their opponents. So in summary, the game can be simple, but hard to master!

+ And here is the order of winning hands folks! + + Wew, what a long lesson, but thats how one does the Texas hold em here at this casino, hope you guys have fun winning and losing your hard earned cash with this one! + +

Cards against the galaxy

+ + So hear this, NT is now sponsoring team building at the casino, so folks who wants to just relax with friends, play some games, earn chips with no risk, even the ones broke can join in on a fun game of Cards against the galaxy and have fun!
+ The idea is that once a round has concluded and a casino member is present to see the game being actually played, everyone gets 10 chips while the one who won the round gets 25 instead! Interested? Good! Its easy and simple to play and very fun and vulgar!

+ + The game is best played with at least 4 players and starts with everyone drawing 7 white cards, the person who most recently pooped starts as the 'card czar', but folks can agree on another criteria for the czar or simply pick one. Each round the current card czar draws a black card that has text written on it and blank lines, everyone aside from the czar takes a white card from their hand for every blank line which they find funny in that sentence and puts on the table face down with the others. The card czar cant know who has which white card and simply reads the black card with the white ones, the most funniest combination is choosen by the czar and the one who made that combination is the current rounds winner and the next rounds czar. At the end of each round everyone makes sure to draw enough white card to have 7 on hand and if theres a casino staff member playing or watching, they note down or hand out chips for everyone, and if they are playing, they get to add chips to their own personal stockpile too!
+ Thats it for cards against the galaxy! Simple, fun and vulgar, whats there not to love? + +

Prizes

+ + Hey folks, welcome to the prize section! This part is definently important for you folks operating the prize booth! First off I wanna tell you some great news! Nanotransen has gone along with a nice deal that allows crew to occasionally keep their hard earned rewards on station for a limited time, now you can enjoy your new fancy toolbelt or bluespace beaker for more than just the shift where the casino comes around!
+ ((Be aware, there can be limitations on how many rewards you get to keep after the shift, it might be unfair if some shows up and wins one thing, while they watch as command staff crew with high background income as well as hyperactive miners walks home with 20 prizes they get to enjoy while having almost done no gambling at all.))

+ + Lets get to the prizes and exchange rate before we get started on the stuff specifically for the booth operators, so heres the current prizes one can win and their costs! Be aware there might be new prizes or absent ones from time to time!
+ + EXCHANGE RATE
+ FROM = TO
+ 5 Thalers = 1 casino chip
+ 1 casino chip = 5 Thalers

+ + The special sentient prize is 100 chips! More about it in section below!

+ + Melee weapons + + Guns and 'guns' ((disclaimer, giving out guns will mean you get a weapons license as well with the shifts you have it, abusing these weapons will quickly get them removed!)) + + Gear + + Masks and hats - EVERYTHING IS 50 except chameleon! + + Costumes - All costumes are 100 except the hoodies which are 50! + + Toys and misc - ALL THESE ARE 50 + + Booze - ALL BOOZE IS 50 + + Pets + + Mechs + + Implants + + + Thats it for prizes!

+ + Now comes the part for the both operators, you got a very important job, it has a lot of responsibility, so it means that you gotta put that first before your own fun, cause unless you do it, a lot of folks are gonna be left sad and dissappointed they cant get any goodies! But the process is simple and can be quick, someone comes to you, they want some chips, or thalers back or a prize, you simply check this nice guide above to determine cost and ask for the amount of thalers or chips needed, if its a prize, then you follow this procedure: +
    +
  1. First get the thalers or chips for payment.
    2. +
  2. Before giving the prize you take out your prize winner folder and a piece of paper, this paper will be named after the one getting the reward and will have further prizes noted down into it, so make sure its safe in that folder!
    3. +
  3. You write at the top of the document the winner's name, then below write in big letters 'PRIZES' and put each new reward on its own line! ((You skip to a new line by writing < br > without the space between the br and the clamps))
    4. +
  4. Once written down, you just put the paper back in the folder and hand over the prize!
    5. +
+ ((When shift is nearing its end you pray to staff or DM the one responsible for the event, they will get the folder and copy paste all the reward info before shift is over and ensure people get their rewards. This is a very important job and we understand it might not be so fun being restricted during an event, but just like the rest of volunteer staff, you get rewarded with guaranteed prizes to enjoy after the shift for being a big help!))
+ ((This gets to the sour part, cheating and giving others and yourself free prizes and/or chips is absolutely forbidden, this has OOC consequences and will likely blacklist you from being important roles in future events. Though dont fear getting punished even if you havent done anything wrong, we will rather let cheaters slip than let honest players get wrongfully punished!)) + +

Sentient prizes

+ Goodness me this is quite the casino huh? Who would have thought one could win other people as a prize? Well you can do just about anything you want with them! Be it just company, some less children friendly company, heck you can even eat them or make them eat you! The options and possibilities are quite frankly limitless!
+ Now you might ask, how does one get these fancy prizes? Well they can be obtained by checking in at the exchange both and see the list of prizes, there might be none, there might be many, it depends on volunteers and losers! This brings us first to volunteers and then to losers!
+ Volunteering is simple! Anyone can walk up to the booth and ask to be a sentient prize, what this means is that you get a nice sum of 150 chips for you to do whatever you want, but someone might come at any point and claim you!
+ Losers are obtained differently, if youre completly busted and have nothing left, you become a prize that the one you lost to can do whatever they want with, this means both gamblers and dealers can end up as a prize, though if for whatever reason you dont become their prize, you get added to the list for someone else to enjoy. Becoming a prize means you also get 100 chips in compensation!
+ + Now hear this! The casino has decided that to spice things up, folks can bet themselves at any time and arent already a prize on the list! Doesnt matter if youre rich or broke, playing blackjack or roulette, you can bet yourself in any game and youre worth 250 chips! But be careful, cause if you lose, youre the winners prize! They can keep you, give you to someone else. or to the prize booth and get the chips you would have gotten as volunteer! But if given to the booth, the winner cant buy their prize back for the lower cost!

+ + ((Sour part again, but very important. These sentient prizes can be fun, but one thing always dictates how these things goes down, preferences and ooc wants. If preferences dont line up and people dont agree to do winner/loser scene it becomes sentient prize on list. And someone cant win a prize if the prize ooc doesnt want to do what the winner wants to do. We still wish people to try and reach out and try things with new people and/or new things they are comfortable doing, but never shall anyone be forced into a situation they dont want!)) + + + + "} \ No newline at end of file diff --git a/code/modules/casino/casino_cards.dm b/code/modules/casino/casino_cards.dm new file mode 100644 index 0000000000..9df021abbe --- /dev/null +++ b/code/modules/casino/casino_cards.dm @@ -0,0 +1,48 @@ + +//Original Casino Code created by Shadowfire117#1269 - Ported from CHOMPstation +//Modified by GhostActual#2055 for use with VOREstation + +/obj/item/weapon/deck/cards/casino/New() + var/datum/playingcard/casino/P + for(var/suit in list("spades","clubs","diamonds","hearts")) + + var/colour + if(suit == "spades" || suit == "clubs") + colour = "black_" + else + colour = "red_" + + for(var/number in list("ace","two","three","four","five","six","seven","eight","nine","ten")) + P = new() + P.name = "[number] of [suit]" + P.card_icon = "casino_[colour]num" + P.back_icon = "casino_card_back" + cards += P + + for(var/number in list("jack","queen","king")) + P = new() + P.name = "[number] of [suit]" + P.card_icon = "casino_[colour]col" + P.back_icon = "casino_card_back" + cards += P + +/datum/playingcard/casino + name = "playing card" + card_icon = "card_back" + back_icon = "card_back" + +/obj/item/weapon/deck/casino + w_class = ITEMSIZE_SMALL + icon = 'icons/obj/playing_cards.dmi' + +/obj/item/weapon/deck/holder/casino //WIP In future do a cool holder + name = "card box" + desc = "A small leather case to show how classy you are compared to everyone else." + icon = 'icons/obj/playing_cards.dmi' + icon_state = "card_holder" + +/obj/item/weapon/deck/cards/casino + name = "deck of casino cards" + desc = "A deck of playing cards from the golden goose casino, comes without a joker card!" + icon = 'icons/obj/playing_cards.dmi' + icon_state = "casino_deck" \ No newline at end of file diff --git a/code/modules/casino/casino_prize_vendor.dm b/code/modules/casino/casino_prize_vendor.dm new file mode 100644 index 0000000000..0672170d8f --- /dev/null +++ b/code/modules/casino/casino_prize_vendor.dm @@ -0,0 +1,305 @@ + +//Original Casino Code created by Shadowfire117#1269 - Ported from CHOMPstation +//Modified by GhostActual#2055 for use with VOREstation + +// Use this define to register a prize! +// * n - The proper name of the purchasable +// * o - The object type path of the purchasable to spawn +// * r - The amount to dispense +// * p - The price of the purchasable in chips +// * l - The restriction of the item +#define CASINO_PRIZE(n, o, r, p, l) n = new /datum/data/casino_prize(n, o, r, p, l) + +/datum/data/casino_prize + var/equipment_path = null + var/equipment_amt = 1 + var/cost = 0 + var/category = null + var/restriction = null + +/datum/data/casino_prize/New(name, path, amt, cost, restriction) + src.name = name + src.equipment_path = path + src.equipment_amt = amt + src.cost = cost + src.category = category + src.restriction = restriction + +/obj/machinery/casino_prize_dispenser + name = "Casino Prize Exchanger" + desc = "Exchange your chips to obtain wonderful prizes! Hoepfully you'll get to keep some of them for a while." + icon = 'icons/obj/casino.dmi' + icon_state ="casino_prize_dispenser" + var/icon_vend ="casino_prize_dispenser-vend" + anchored = 1 + density = 1 + opacity = 0 + var/list/item_list + + clicksound = "button" + var/vending_sound = "machines/vending/vending_drop.ogg" + + // Power + use_power = USE_POWER_IDLE + idle_power_usage = 10 + var/vend_power_usage = 150 //actuators and stuff + + // Vending-related + var/datum/data/casino_prize/currently_vending = null // What we're requesting payment for right now + var/list/log = list() //Log only SS13 staff is allowed to look at, CKEYS are listed here for record keeping of prizes and players for events! + + var/category_weapons = 1 //For listing categories, if false then prizes of this categories cant be obtained nor bought for post-shift enjoyment + var/category_gear = 1 //If 1 prizes will be only logged + var/category_clothing = 1 //If 2 prizes will both be logged and spawned + var/category_misc = 1 + var/category_drinks = 1 + var/category_implants = 1 + var/category_event = 1 //For special events, holidays, etc + +/obj/machinery/casino_prize_dispenser/Initialize() + . = ..() + power_change() + + item_list = list() + item_list["Weapons"] = list( + CASINO_PRIZE("Scepter", /obj/item/weapon/scepter, 1, 500, "weapons"), + CASINO_PRIZE("Chain of Command", /obj/item/weapon/melee/chainofcommand, 1, 250, "weapons"), + CASINO_PRIZE("Size Gun", /obj/item/weapon/gun/energy/sizegun, 1, 100, "weapons"), + CASINO_PRIZE("Advanced Particle Rifle", /obj/item/weapon/gun/energy/particle/advanced, 1, 500, "weapons"), + CASINO_PRIZE("Temperature Gun", /obj/item/weapon/gun/energy/temperature, 1, 250, "weapons"), + CASINO_PRIZE("Alien Pistol", /obj/item/weapon/gun/energy/alien, 1, 1000, "weapons"), + CASINO_PRIZE("Floral Gun", /obj/item/weapon/gun/energy/floragun, 1, 250, "weapons"), + CASINO_PRIZE("Net Gun", /obj/item/weapon/gun/energy/netgun, 1, 500, "weapons"), + ) + item_list["Gear"] = list( + CASINO_PRIZE("Experimental Welder", /obj/item/weapon/weldingtool/experimental, 1, 500, "gear"), + CASINO_PRIZE("Chameleon Tie", /obj/item/clothing/accessory/chameleon, 1, 250, "gear"), + CASINO_PRIZE("Chemsprayer", /obj/item/weapon/reagent_containers/spray/chemsprayer, 1, 250, "gear"), + CASINO_PRIZE("Bluespace Beaker", /obj/item/weapon/reagent_containers/glass/beaker/bluespace, 1, 200, "gear"), + CASINO_PRIZE("Cryo Beaker", /obj/item/weapon/reagent_containers/glass/beaker/noreact, 1, 200, "gear"), + ) + item_list["Clothing"] = list( + CASINO_PRIZE("Shark mask", /obj/item/clothing/mask/shark, 1, 50, "clothing"), + CASINO_PRIZE("Pig mask", /obj/item/clothing/mask/pig, 1, 50, "clothing"), + CASINO_PRIZE("Luchador mask", /obj/item/clothing/mask/luchador, 1, 50, "clothing"), + CASINO_PRIZE("Horse mask", /obj/item/clothing/mask/horsehead, 1, 50, "clothing"), + CASINO_PRIZE("Goblin mask", /obj/item/clothing/mask/goblin, 1, 50, "clothing"), + CASINO_PRIZE("Fake moustache", /obj/item/clothing/mask/fakemoustache, 1, 50, "clothing"), + CASINO_PRIZE("Dolphin mask", /obj/item/clothing/mask/dolphin, 1, 50, "clothing"), + CASINO_PRIZE("Demon mask", /obj/item/clothing/mask/demon, 1, 50, "clothing"), + CASINO_PRIZE("Chameleon mask", /obj/item/clothing/under/chameleon, 1, 250, "clothing"), + CASINO_PRIZE("Ian costume", /obj/item/clothing/suit/storage/hooded/ian_costume, 1, 50, "clothing"), + CASINO_PRIZE("Carp costume", /obj/item/clothing/suit/storage/hooded/carp_costume, 1, 50, "clothing"), + ) + item_list["Miscellaneous"] = list( + CASINO_PRIZE("Toy sword", /obj/item/toy/sword, 1, 50, "misc"), + CASINO_PRIZE("Waterflower", /obj/item/weapon/reagent_containers/spray/waterflower, 1, 50, "misc"), + CASINO_PRIZE("Horse stick", /obj/item/toy/stickhorse, 1, 50, "misc"), + CASINO_PRIZE("Katana", /obj/item/toy/katana, 1, 50, "misc"), + CASINO_PRIZE("Conch", /obj/item/toy/eight_ball/conch, 1, 50, "misc"), + CASINO_PRIZE("Eight ball", /obj/item/toy/eight_ball, 1, 50, "misc"), + CASINO_PRIZE("Foam sword", /obj/item/weapon/material/sword/foam, 1, 50, "misc"), + CASINO_PRIZE("Whistle", /obj/item/toy/bosunwhistle, 1, 50, "misc"), + CASINO_PRIZE("Golden cup", /obj/item/weapon/reagent_containers/food/drinks/golden_cup, 1, 50, "misc"), + CASINO_PRIZE("Quality cigars", /obj/item/weapon/storage/fancy/cigar/havana, 1, 50, "misc"), + CASINO_PRIZE("Casino wallet (kept after event)", /obj/item/weapon/storage/wallet/casino, 1, 50, "misc"), + CASINO_PRIZE("Casino cards", /obj/item/weapon/deck/cards/casino, 1, 50, "misc"), + ) + item_list["Drinks"] = list( + CASINO_PRIZE("Redeemer's brew", /obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew, 1, 50, "drinks"), + CASINO_PRIZE("Poison wine", /obj/item/weapon/reagent_containers/food/drinks/bottle/pwine, 1, 50, "drinks"), + CASINO_PRIZE("Patron", /obj/item/weapon/reagent_containers/food/drinks/bottle/patron, 1, 50, "drinks"), + CASINO_PRIZE("Holy water", /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, 1, 50, "drinks"), + CASINO_PRIZE("Goldschlager", /obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager, 1, 50, "drinks"), + CASINO_PRIZE("Champagne", /obj/item/weapon/reagent_containers/food/drinks/bottle/champagne, 1, 50, "drinks"), + CASINO_PRIZE("Bottle of Nothing", /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing, 1, 50, "drinks"), + CASINO_PRIZE("Whiskey bliss", /obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey, 1, 50, "drinks"), + ) + + item_list["Implants"] = list( + CASINO_PRIZE("Implanter (Remember to get one unless you want to borrow from station!)", /obj/item/weapon/implanter, 1, 100, "implants"), + CASINO_PRIZE("Implant: Tazer", /obj/item/weapon/implantcase/taser, 1, 1000, "implants"), + CASINO_PRIZE("Implant: Medkit", /obj/item/weapon/implantcase/medkit, 1, 500, "implants"), + CASINO_PRIZE("Implant: Shades", /obj/item/weapon/implantcase/shades, 1, 750, "implants"), + CASINO_PRIZE("Implant: Sprinter", /obj/item/weapon/implantcase/sprinter, 1, 1500, "implants"), + CASINO_PRIZE("Implant: Toolkit", /obj/item/weapon/implantcase/toolkit, 1, 500, "implants"), + CASINO_PRIZE("Implant: Language", /obj/item/weapon/implantcase/vrlanguage, 1, 1000, "implants"), + CASINO_PRIZE("Implant: Analyzer", /obj/item/weapon/implantcase/analyzer, 1, 500, "implants"), + CASINO_PRIZE("Implant: Size control", /obj/item/weapon/implant/sizecontrol , 1, 500, "implants"), + ) + + item_list["Event"] = list( + ) + +/obj/machinery/casino_prize_dispenser/power_change() + ..() + if(stat & BROKEN) + icon_state = "[initial(icon_state)]-broken" + else + if(!(stat & NOPOWER)) + icon_state = initial(icon_state) + else + spawn(rand(0, 15)) + icon_state = "[initial(icon_state)]-off" + +/obj/machinery/casino_prize_dispenser/attack_hand(mob/user as mob) + if(stat & (BROKEN|NOPOWER)) + return + tgui_interact(user) + +/obj/machinery/casino_prize_dispenser/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(currently_vending) + if(istype(W, /obj/item/weapon/spacecasinocash)) + to_chat(usr, "Please select prize on display with sufficient amount of chips.") + else + SStgui.update_uis(src) + return // don't smack that machine with your 2 chips + + if(istype(W, /obj/item/weapon/spacecasinocash)) + attack_hand(user) + return + ..() + +/obj/machinery/casino_prize_dispenser/proc/pay_with_chips(var/obj/item/weapon/spacecasinocash/cashmoney, mob/user, var/price) + //"cashmoney_:[cashmoney] user:[user] currently_vending:[currently_vending]" + if(price > cashmoney.worth) + to_chat(usr, "\icon[cashmoney] That is not enough chips.") + return 0 + + if(istype(cashmoney, /obj/item/weapon/spacecasinocash)) + visible_message("\The [usr] inserts some chips into \the [src].") + cashmoney.worth -= price + + if(cashmoney.worth <= 0) + usr.drop_from_inventory(cashmoney) + qdel(cashmoney) + else + cashmoney.update_icon() + return 1 + +/obj/machinery/casino_prize_dispenser/ui_assets(mob/user) + return list( + get_asset_datum(/datum/asset/spritesheet/vending), + ) + +/obj/machinery/casino_prize_dispenser/tgui_data(mob/user) + var/list/data[0] + + data["items"] = list() + for(var/cat in item_list) + var/list/cat_items = list() + for(var/prize_name in item_list[cat]) + var/datum/data/casino_prize/prize = item_list[cat][prize_name] + cat_items[prize_name] = list("name" = prize_name, "price" = prize.cost, "restriction" = prize.restriction) + data["items"][cat] = cat_items + return data + +/obj/machinery/casino_prize_dispenser/tgui_interact(mob/user, datum/tgui/ui = null) + // Open the window + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "CasinoPrizeDispenser", name) + ui.open() + +/obj/machinery/casino_prize_dispenser/tgui_act(action, params) + if(stat & (BROKEN|NOPOWER)) + return + if(usr.stat || usr.restrained()) + return + if(..()) + return TRUE + . = TRUE + switch(action) + if("purchase") + var/paid = FALSE + var/category = params["cat"] + var/restriction_category = params["restriction"] + var/restriction_check = 0 + var/item_given = FALSE + var/name = params["name"] + var/price = params["price"] + var/datum/data/casino_prize/bi = item_list[category][name] + switch(restriction_category) + if("weapons") + restriction_check = category_weapons + if("gear") + restriction_check = category_gear + if("clothing") + restriction_check = category_clothing + if("misc") + restriction_check = category_misc + if("drinks") + restriction_check = category_drinks + if("implants") + restriction_check = category_implants + if("event") + restriction_check = category_event + else + to_chat(usr, "Prize checkout error has occured, purchase cancelled.") + return FALSE + + if(restriction_check < 1) + to_chat(usr, "[name] is restricted, this prize can't be bought.") + return FALSE + if(restriction_check > 1) + item_given = TRUE + + if(price <= 0 && item_given == TRUE) + vend(bi, usr) + return TRUE + + currently_vending = bi + + if(istype(usr.get_active_hand(), /obj/item/weapon/spacecasinocash)) + var/obj/item/weapon/spacecasinocash/cash = usr.get_active_hand() + paid = pay_with_chips(cash, usr, price) + else + to_chat(usr, "Payment failure: Improper payment method, please provide chips.") + return TRUE // we set this because they shouldn't even be able to get this far, and we want the UI to update. + if(paid) + if(item_given == TRUE) + vend(bi, usr) + + speak("Thank you for your purchase, your [bi] has been logged.") + do_logging(currently_vending, usr, bi) + . = TRUE + else + to_chat(usr, "Payment failure: unable to process payment.") + +/obj/machinery/casino_prize_dispenser/proc/vend(datum/data/casino_prize/bi, mob/user) + SStgui.update_uis(src) + + if(ispath(bi.equipment_path, /obj/item/stack)) + var/obj/item/stack/S = new bi.equipment_path(loc) + S.amount = bi.equipment_amt + playsound(src, 'sound/machines/vending/vending_drop.ogg', 100, 1) + return TRUE + + for(var/i in 1 to bi.equipment_amt) + new bi.equipment_path(loc) + playsound(src, 'sound/machines/vending/vending_drop.ogg', 100, 1) + + currently_vending = null + use_power(vend_power_usage) //actuators and stuff + flick("[icon_state]-vend",src) + + +/obj/machinery/casino_prize_dispenser/proc/do_logging(item, mob/user, datum/data/casino_prize/bi) + var/prize_log = "{ckey:[user.ckey]character_name:[user.name]item_path: [bi.equipment_path]}" + log[++log.len] = prize_log + //Currently doesnt have an ingame way to show. Can only be viewed through View-Variables, to ensure theres no chance of players ckeys exposed - Jack + +/obj/machinery/casino_prize_dispenser/proc/speak(var/message) + if(stat & NOPOWER) + return + + if(!message) + return + + for(var/mob/O in hearers(src, null)) + O.show_message("\The [src] beeps, \"[message]\"",2) + return + +/obj/machinery/casino_prize_dispenser/process() //Might not need this, but just to be safe for now + if(stat & (BROKEN|NOPOWER)) + return \ No newline at end of file diff --git a/code/modules/casino/premium_dispenser.dm b/code/modules/casino/premium_dispenser.dm new file mode 100644 index 0000000000..91b4833d6e --- /dev/null +++ b/code/modules/casino/premium_dispenser.dm @@ -0,0 +1,69 @@ + +//Original Casino Code created by Shadowfire117#1269 - Ported from CHOMPstation +//Modified by GhostActual#2055 for use with VOREstation + +/obj/machinery/chemical_dispenser/premium + name = "premium drink dispensary" + desc = "A specialty dispenser unit designed with Bluespace Technology." + icon = 'icons/obj/casino.dmi' + icon_state = "premiumdispenser" + ui_title = "Premium Drink Dispensary" + accept_drinking = 1 + var/max_cartridges = 90 + +/obj/machinery/chemical_dispenser/premium/full + spawn_cartridges = list( + /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon_lime, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/sodawater, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/tonic, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/beer, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/gin, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/rum, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/tequila, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/vermouth, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/cognac, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/cider, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/ale, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/mead, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/water, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/ice, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/cream, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/tea, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/icetea, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/cola, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/smw, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/dr_gibb, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/spaceup, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/tonic, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/sodawater, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon_lime, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/watermelon, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/cafe_latte, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/soy_latte, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/hot_coco, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/milk, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/cream, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/tea, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/ice, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/mint, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/orange, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/lime, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/berry, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/greentea, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/decaf + ) \ No newline at end of file diff --git a/code/modules/casino/premium_vendors.dm b/code/modules/casino/premium_vendors.dm new file mode 100644 index 0000000000..8107585745 --- /dev/null +++ b/code/modules/casino/premium_vendors.dm @@ -0,0 +1,129 @@ + +//Original Casino Code created by Shadowfire117#1269 - Ported from CHOMPstation +//Modified by GhostActual#2055 for use with VOREstation + +// +//The code for Casino Vendors +//Devs Feel free to modify this to vend what you please +// + +/obj/machinery/vending/deluxe_boozeomat + name = "Premium Drink Distributor" + desc = "A top of the line drink vendor that carries some of the finest drinks." + icon = 'icons/obj/casino.dmi' + icon_state = "premiumbooze" + products = list(/obj/item/weapon/glass_extra/stick = 50, + /obj/item/weapon/glass_extra/straw = 50, + /obj/item/weapon/reagent_containers/food/drinks/glass2/square = 25, + /obj/item/weapon/reagent_containers/food/drinks/glass2/rocks = 25, + /obj/item/weapon/reagent_containers/food/drinks/glass2/shake = 25, + /obj/item/weapon/reagent_containers/food/drinks/glass2/cocktail = 25, + /obj/item/weapon/reagent_containers/food/drinks/glass2/shot = 25, + /obj/item/weapon/reagent_containers/food/drinks/glass2/pint = 25, + /obj/item/weapon/reagent_containers/food/drinks/glass2/mug = 25, + /obj/item/weapon/reagent_containers/food/drinks/glass2/wine = 25, + /obj/item/weapon/reagent_containers/food/drinks/glass2/carafe = 2, + /obj/item/weapon/reagent_containers/food/drinks/glass2/pitcher = 2, + /obj/item/weapon/reagent_containers/food/drinks/metaglass = 25, + /obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint = 25, + /obj/item/weapon/reagent_containers/food/drinks/bottle/gin = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/cognac = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/rum = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/sake = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/patron = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/champagne = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 15, + /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper = 15, + /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 15, + /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/silverdragon = 15, + /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/meteor = 15, + /obj/item/weapon/reagent_containers/food/drinks/bottle/small/litebeer = 15, + /obj/item/weapon/reagent_containers/food/drinks/bottle/small/cider = 15, + /obj/item/weapon/reagent_containers/food/drinks/cans/tonic = 50, + /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 50, + /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 50, + /obj/item/weapon/reagent_containers/food/drinks/tea = 50, + /obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 15, + /obj/item/weapon/reagent_containers/food/drinks/bottle/space_up = 15, + /obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind = 15, + /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/lemonjuice = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/applejuice = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/milk = 10, + /obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 10, + /obj/item/weapon/reagent_containers/food/drinks/ice = 10 + ) + + contraband = list() + vend_delay = 15 + idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. + req_access = list(access_bar) + req_log_access = access_bar + has_logs = 1 + vending_sound = "machines/vending/vending_cans.ogg" + +/obj/machinery/vending/deluxe_dinner + name = "Premium Dining Distributor" + desc = "A top of the line drink vendor that carries some of the finest foods in the frontier." + icon = 'icons/obj/casino.dmi' + icon_state = "premiumfood" + products = list(/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger = 30, + /obj/item/weapon/reagent_containers/food/snacks/meatsteak = 30, + /obj/item/weapon/reagent_containers/food/snacks/fries = 30, + /obj/item/weapon/reagent_containers/food/snacks/onionrings = 30, + /obj/item/weapon/reagent_containers/food/snacks/cheeseburrito= 30, + /obj/item/weapon/reagent_containers/food/snacks/enchiladas= 30, + /obj/item/weapon/reagent_containers/food/snacks/meatburrito= 30, + /obj/item/weapon/reagent_containers/food/snacks/taco= 30, + /obj/item/weapon/reagent_containers/food/snacks/cheesenachos= 30, + /obj/item/weapon/reagent_containers/food/snacks/cubannachos= 30, + /obj/item/weapon/reagent_containers/food/snacks/stew= 20, + /obj/item/weapon/reagent_containers/food/snacks/roastbeef = 20, + /obj/item/weapon/reagent_containers/food/snacks/aesirsalad = 20, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi = 20, + /obj/item/weapon/reagent_containers/food/snacks/kitsuneudon = 20, + /obj/item/weapon/reagent_containers/food/snacks/baguette = 30, + /obj/item/weapon/reagent_containers/food/snacks/appletart = 30, + /obj/item/weapon/reagent_containers/food/snacks/muffin = 30, + /obj/item/weapon/reagent_containers/food/snacks/berrymuffin = 30, + /obj/item/weapon/reagent_containers/food/snacks/cherrypie = 30, + /obj/item/weapon/reagent_containers/food/snacks/croissant = 30, + /obj/item/weapon/reagent_containers/food/snacks/pie = 30, + /obj/item/weapon/reagent_containers/food/snacks/poppypretzel = 30, + /obj/item/weapon/reagent_containers/food/snacks/sugarcookie = 30, + /obj/item/weapon/reagent_containers/food/snacks/waffles = 30, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake = 2, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake = 2, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake = 2, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake = 2, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake = 2, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake = 2, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake = 2, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake = 2, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake = 2 + ) + + contraband = list() + vend_delay = 15 + idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. + req_access = list(access_bar) + req_log_access = access_bar + has_logs = 1 + vending_sound = "machines/vending/vending_cans.ogg" \ No newline at end of file diff --git a/code/modules/casino/slots.dm b/code/modules/casino/slots.dm new file mode 100644 index 0000000000..773c1d15e0 --- /dev/null +++ b/code/modules/casino/slots.dm @@ -0,0 +1,462 @@ + +//Original Casino Code created by Shadowfire117#1269 - Ported from CHOMPstation +//Modified by GhostActual#2055 for use with VOREstation + +/* + * Slot Machine + */ + +/obj/machinery/slot_machine + name = "slot machine" + desc = "A gambling machine designed to give you false hope and rob you of your wealth, hence why it's often called a one armed bandit." + icon = 'icons/obj/casino.dmi' + icon_state = "slotmachine" + anchored = 1 + density = 1 + power_channel = EQUIP + use_power = USE_POWER_IDLE + idle_power_usage = 10 + active_power_usage = 100 + light_power = 0.9 + light_range = 2 + light_color = "#B1FBBFF" + var/isbroken = 0 //1 if someone banged it with something heavy + var/ispowered = 1 //starts powered, changes with power_change() + var/busy = 0 + var/symbol1 = null + var/symbol2 = null + var/symbol3 = null + + var/datum/effect/effect/system/confetti_spread + var/confetti_strength = 8 + +/obj/machinery/slot_machine/update_icon() + cut_overlays() + if(!ispowered || isbroken) + icon_state = "slotmachine_off" + if(isbroken) //If the thing is smashed, add crack overlay on top of the unpowered sprite. + add_overlay("slotmachine_broken") + set_light(0) + set_light_on(FALSE) + return + + icon_state = "slotmachine" + set_light(2) + set_light_on(TRUE) + return + +/obj/machinery/slot_machine/power_change() + if(isbroken) //Broken shit can't be powered. + return + ..() + if(!(stat & NOPOWER)) + ispowered = 1 + update_icon() + else + spawn(rand(0, 15)) + ispowered = 0 + update_icon() + +/obj/machinery/slot_machine/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(busy) + to_chat(user,"The slot machine is currently running. ") + return + if(W.is_wrench()) + playsound(src, W.usesound, 100, 1) + if(anchored) + user.visible_message("[user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.") + else + user.visible_message("[user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.") + + if(do_after(user, 20 * W.toolspeed)) + if(!src) return + to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") + anchored = !anchored + return + + if(!anchored) + to_chat(user," The slot machine isn't secured.") + return + + var/handled = 0 + var/paid = 0 + + if(istype(W, /obj/item/weapon/spacecasinocash)) + var/obj/item/weapon/spacecasinocash/C = W + paid = insert_chip(C, user) + handled = 1 + + if(paid) + return + if(handled) + SStgui.update_uis(src) + return // don't smack that machine with your 2 chips + + else if(!(stat & NOPOWER)) + return + + else if(isbroken) + return + +/obj/machinery/slot_machine/proc/insert_chip(var/obj/item/weapon/spacecasinocash/cashmoney, mob/user) + if (ispowered == 0) + return + if (isbroken) + return + if (busy) + to_chat(user,"The slot machine is currently rolling. ") + return + if(cashmoney.worth < 5) + to_chat(user,"You dont have enough chips to gamble! ") + return + + to_chat(user,"You puts 5 credits in the slot machine and presses start.") + cashmoney.worth -= 5 + cashmoney.update_icon() + + if(cashmoney.worth <= 0) + usr.drop_from_inventory(cashmoney) + qdel(cashmoney) + cashmoney.update_icon() + + busy = 1 + icon_state = "slotmachine_rolling" + playsound(src.loc, 'sound/machines/slotmachine_pull.ogg', 15, 1) + + var/slot1 = rand(0,9) + switch(slot1) + if(0 to 3) symbol1 = "cherry" + if(4 to 4) symbol1 = "lemon" + if(5 to 5) symbol1 = "bell" + if(6 to 6) symbol1 = "four leaf clover" + if(7 to 7) symbol1 = "seven" + if(8 to 8) symbol1 = "diamond" + if(9 to 9) symbol1 = "platinum coin" + + var/slot2 = rand(0,16) + switch(slot2) + if(0 to 5) symbol2 = "cherry" + if(6 to 7) symbol2 = "lemon" + if(8 to 9) symbol2 = "bell" + if(10 to 11) symbol2 = "four leaf clover" + if(12 to 13) symbol2 = "seven" + if(14 to 15) symbol2 = "diamond" + if(16) symbol2 = "platinum coin" + + var/slot3 = rand(0,9) + switch(slot3) + if(0 to 3) symbol3 = "cherry" + if(4 to 4) symbol3 = "lemon" + if(5 to 5) symbol3 = "bell" + if(6 to 6) symbol3 = "four leaf clover" + if(7 to 7) symbol3 = "seven" + if(8 to 8) symbol3 = "diamond" + if(9 to 9) symbol3 = "platinum coin" + + var/output //Output variable to send out in chat after the large if statement. + var/winnings = 0 //How much money will be given if any. + var/platinumwin = 0 // If you win the platinum chip or not + var/celebrate = 0 + var/delaytime = 5 SECONDS + + + spawn(delaytime) + to_chat(user,"The slot machine flashes with bright colours as the slots lights up with a [symbol1], a [symbol2] and a [symbol3]!") + + if (symbol1 == "cherry" && symbol2 == "cherry" && symbol3 == "cherry") + output = "Three cherries! The slot machine deposits chips worth 25 credits!" + winnings = 25 + + if ((symbol1 != "cherry" && symbol2 == "cherry" && symbol3 == "cherry") || (symbol1 == "cherry" && symbol2 != "cherry" && symbol3 == "cherry") ||(symbol1 == "cherry" && symbol2 == "cherry" && symbol3 != "cherry")) + output = "Two cherries! The slot machine deposits a 10 credit chip!" + winnings = 10 + + if (symbol1 == "lemon" && symbol2 == "lemon" && symbol3 == "lemon") + output = "Three lemons! The slot machine deposits a 50 credit chip!" + winnings = 50 + + if (symbol1 == "watermelon" && symbol2 == "watermelon" && symbol3 == "watermelon") + output = "Three watermelons! The slot machine deposits chips worth 75 credits!" + winnings = 75 + + if (symbol1 == "bell" && symbol2 == "bell" && symbol3 == "bell") + output = "Three bells! The slot machine deposits chips a 100 credit chip!" + winnings = 100 + + if (symbol1 == "four leaf clover" && symbol2 == "four leaf clover" && symbol3 == "four leaf clover") + output = "Three four leaf clovers! The slot machine deposits a 200 credit chip!" + winnings = 200 + + if (symbol1 == "seven" && symbol2 == "seven" && symbol3 == "seven") + output = "Three sevens! The slot machine deposits a 500 credit chip!" + winnings = 500 + celebrate = 1 + + if (symbol1 == "diamond" && symbol2 == "diamond" && symbol3 == "diamond") + output = "Three diamonds! The slot machine deposits a 1000 credit chip!" + winnings = 1000 + celebrate = 1 + + if (symbol1 == "platinum coin" && symbol2 == "platinum coin" && symbol3 == "platinum coin") + output = "Three platinum coins! The slot machine deposits a platinum chip!" + platinumwin = TRUE; + celebrate = 1 + + icon_state = initial(icon_state) // Set it back to the original iconstate. + + if(!output) // Is there anything to output? If not, consider it a loss. + to_chat(user,"Better luck next time!") + busy = FALSE + return + + to_chat(user,output) //Output message + + if(platinumwin) // Did they win the platinum chip? + new /obj/item/weapon/casino_platinum_chip(src.loc) + playsound(src.loc, 'sound/machines/slotmachine.ogg', 25, 1) + + if(winnings) //Did the person win? + icon_state = "slotmachine_winning" + playsound(src.loc, 'sound/machines/slotmachine.ogg', 25, 1) + spawn(delaytime) + spawn_casinochips(winnings, src.loc) + icon_state = "slotmachine" + + if(celebrate) // Happy celebrations! + src.confetti_spread = new /datum/effect/effect/system/confetti_spread() + src.confetti_spread.attach(src) //If somehow people start dragging slot machine + spawn(0) + for(var/i = 1 to confetti_strength) + src.confetti_spread.start() + sleep(10) + + busy = FALSE + +/* + * Station Slot Machine (takes space cash instead of chips) + */ + +/obj/machinery/station_slot_machine + name = "station slot machine" + desc = "A gambling machine owned by NanoTrasen, designed to take Thalers as opposed to casino chips." + icon = 'icons/obj/casino.dmi' + icon_state = "ntslotmachine" + anchored = 1 + density = 1 + power_channel = EQUIP + use_power = USE_POWER_IDLE + idle_power_usage = 10 + active_power_usage = 100 + light_power = 0.9 + light_range = 2 + light_color = "#B1FBBFF" + var/isbroken = 0 //1 if someone banged it with something heavy + var/ispowered = 1 //starts powered, changes with power_change() + var/busy = 0 + var/symbol1 = null + var/symbol2 = null + var/symbol3 = null + + var/datum/effect/effect/system/confetti_spread + var/confetti_strength = 8 + +/obj/machinery/station_slot_machine/update_icon() + cut_overlays() + if(!ispowered || isbroken) + icon_state = "ntslotmachine_off" + if(isbroken) //If the thing is smashed, add crack overlay on top of the unpowered sprite. + add_overlay("ntslotmachine_broken") + set_light(0) + set_light_on(FALSE) + return + + icon_state = "ntslotmachine" + set_light(2) + set_light_on(TRUE) + return + +/obj/machinery/station_slot_machine/power_change() + if(isbroken) //Broken shit can't be powered. + return + ..() + if(!(stat & NOPOWER)) + ispowered = 1 + update_icon() + else + spawn(rand(0, 15)) + ispowered = 0 + update_icon() + +/obj/machinery/station_slot_machine/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(busy) + to_chat(user,"The slot machine is currently running. ") + return + if(W.is_wrench()) + playsound(src, W.usesound, 100, 1) + if(anchored) + user.visible_message("[user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.") + else + user.visible_message("[user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.") + + if(do_after(user, 20 * W.toolspeed)) + if(!src) return + to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") + anchored = !anchored + return + + if(!anchored) + to_chat(user," The slot machine isn't secured.") + return + + var/handled = 0 + var/paid = 0 + + if(istype(W, /obj/item/weapon/spacecash)) + var/obj/item/weapon/spacecash/C = W + paid = insert_cash(C, user) + handled = 1 + if(paid) + return + if(handled) + SStgui.update_uis(src) + return // don't smack that machine with your 2 chips + + else if(!(stat & NOPOWER)) + return + + else if(isbroken) + return + +/obj/machinery/station_slot_machine/proc/insert_cash(var/obj/item/weapon/spacecash/cashmoney, mob/user) + if (ispowered == 0) + return + if (isbroken) + return + if (busy) + to_chat(user,"The slot machine is currently rolling. ") + return + if(cashmoney.worth < 5) + to_chat(user,"You dont have enough Thalers to gamble! ") + return + + to_chat(user,"You puts 5 Thalers in the slot machine and presses start.") + cashmoney.worth -= 5 + cashmoney.update_icon() + + if(cashmoney.worth <= 0) + usr.drop_from_inventory(cashmoney) + qdel(cashmoney) + cashmoney.update_icon() + + busy = 1 + icon_state = "ntslotmachine_rolling" + playsound(src.loc, 'sound/machines/slotmachine_pull.ogg', 15, 1) + + var/slot1 = rand(0,9) + switch(slot1) + if(0 to 3) symbol1 = "cherry" + if(4 to 4) symbol1 = "lemon" + if(5 to 5) symbol1 = "bell" + if(6 to 6) symbol1 = "four leaf clover" + if(7 to 7) symbol1 = "seven" + if(8 to 8) symbol1 = "diamond" + if(9 to 9) symbol1 = "platinum coin" + + var/slot2 = rand(0,16) + switch(slot2) + if(0 to 5) symbol2 = "cherry" + if(6 to 7) symbol2 = "lemon" + if(8 to 9) symbol2 = "bell" + if(10 to 11) symbol2 = "four leaf clover" + if(12 to 13) symbol2 = "seven" + if(14 to 15) symbol2 = "diamond" + if(16) symbol2 = "platinum coin" + + var/slot3 = rand(0,9) + switch(slot3) + if(0 to 3) symbol3 = "cherry" + if(4 to 4) symbol3 = "lemon" + if(5 to 5) symbol3 = "bell" + if(6 to 6) symbol3 = "four leaf clover" + if(7 to 7) symbol3 = "seven" + if(8 to 8) symbol3 = "diamond" + if(9 to 9) symbol3 = "platinum coin" + + var/output //Output variable to send out in chat after the large if statement. + var/winnings = 0 //How much money will be given if any. + var/platinumwin = 0 // If you win the platinum chip or not + var/celebrate = 0 + var/delaytime = 5 SECONDS + + + spawn(delaytime) + to_chat(user,"The slot machine flashes with bright colours as the slots lights up with a [symbol1], a [symbol2] and a [symbol3]!") + + if (symbol1 == "cherry" && symbol2 == "cherry" && symbol3 == "cherry") + output = "Three cherries! The slot machine deposits 25 Thalers!" + winnings = 25 + + if ((symbol1 != "cherry" && symbol2 == "cherry" && symbol3 == "cherry") || (symbol1 == "cherry" && symbol2 != "cherry" && symbol3 == "cherry") ||(symbol1 == "cherry" && symbol2 == "cherry" && symbol3 != "cherry")) + output = "Two cherries! The slot machine deposits 10 Thalers!" + winnings = 10 + + if (symbol1 == "lemon" && symbol2 == "lemon" && symbol3 == "lemon") + output = "Three lemons! The slot machine deposits 50 Thalers!" + winnings = 50 + + if (symbol1 == "watermelon" && symbol2 == "watermelon" && symbol3 == "watermelon") + output = "Three watermelons! The slot machine deposits 75 Thalers!" + winnings = 75 + + if (symbol1 == "bell" && symbol2 == "bell" && symbol3 == "bell") + output = "Three bells! The slot machine deposits 100 Thalers!" + winnings = 100 + + if (symbol1 == "four leaf clover" && symbol2 == "four leaf clover" && symbol3 == "four leaf clover") + output = "Three four leaf clovers! The slot machine deposits 200 Thalers!" + winnings = 200 + + if (symbol1 == "seven" && symbol2 == "seven" && symbol3 == "seven") + output = "Three sevens! The slot machine deposits 500 Thalers!" + winnings = 500 + celebrate = 1 + + if (symbol1 == "diamond" && symbol2 == "diamond" && symbol3 == "diamond") + output = "Three diamonds! The slot machine deposits 1000 Thalers!" + winnings = 1000 + celebrate = 1 + + if (symbol1 == "platinum coin" && symbol2 == "platinum coin" && symbol3 == "platinum coin") + output = "Three platinum coins! The slot machine deposits a platinum chip!" + platinumwin = TRUE; + celebrate = 1 + + icon_state = initial(icon_state) // Set it back to the original iconstate. + + if(!output) // Is there anything to output? If not, consider it a loss. + to_chat(user,"Better luck next time!") + busy = FALSE + return + + to_chat(user,output) //Output message + + if(platinumwin) // Did they win the platinum chip? + new /obj/item/weapon/casino_platinum_chip(src.loc) + playsound(src.loc, 'sound/machines/slotmachine.ogg', 25, 1) + + if(winnings) //Did the person win? + icon_state = "ntslotmachine_winning" + playsound(src.loc, 'sound/machines/slotmachine.ogg', 25, 1) + spawn(delaytime) + spawn_money(winnings, src.loc) + icon_state = "ntslotmachine" + + if(celebrate) // Happy celebrations! + src.confetti_spread = new /datum/effect/effect/system/confetti_spread() + src.confetti_spread.attach(src) //If somehow people start dragging slot machine + spawn(0) + for(var/i = 1 to confetti_strength) + src.confetti_spread.start() + sleep(10) + + busy = FALSE diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 9e7de66c34..aa7b3b7c3a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -166,7 +166,7 @@ ) gear_tweaks += new/datum/gear_tweak/path(labcoats) -/datum/gear/suit/labcoat/emt +/datum/gear/suit/labcoat_emt display_name = "labcoat, EMT" path = /obj/item/clothing/suit/storage/toggle/labcoat/emt allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") @@ -551,6 +551,18 @@ ) gear_tweaks += new/datum/gear_tweak/path(jacket) +/datum/gear/suit/miscellaneous/light_jacket + display_name = "light jacket selection" + path = /obj/item/clothing/suit/storage/toggle/light_jacket + +/datum/gear/suit/miscellaneous/light_jacket/New() + ..() + var/list/jacket = list( + "grey light jacket" = /obj/item/clothing/suit/storage/toggle/light_jacket, + "dark blue light jacket" = /obj/item/clothing/suit/storage/toggle/light_jacket/blue + ) + gear_tweaks += new/datum/gear_tweak/path(jacket) + /datum/gear/suit/miscellaneous/peacoat display_name = "peacoat" path = /obj/item/clothing/suit/storage/toggle/peacoat diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index a4b59ac612..7aa7e43385 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -726,6 +726,19 @@ item_state_slots = list(slot_r_hand_str = "med_dep_jacket", slot_l_hand_str = "med_dep_jacket") flags_inv = HIDEHOLSTER +/obj/item/clothing/suit/storage/toggle/light_jacket + name = "grey light jacket" + desc = "A light, cozy jacket. Now in grey." + icon_state = "grey_dep_jacket" + item_state_slots = list(slot_r_hand_str = "grey_dep_jacket", slot_l_hand_str = "grey_dep_jacket") + flags_inv = HIDEHOLSTER + +/obj/item/clothing/suit/storage/toggle/light_jacket/blue + name = "dark blue light jacket" + desc = "A light, cozy jacket. Now in dark blue." + icon_state = "blue_dep_jacket" + item_state_slots = list(slot_r_hand_str = "blue_dep_jacket", slot_l_hand_str = "blue_dep_jacket") + /* * Track Jackets */ diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index a35580499d..1a4c93eb67 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -374,4 +374,31 @@ icon_override = 'icons/inventory/accessory/mob_vr.dmi' icon_state = "talon_pin" item_state = "talonpin" - overlay_state = "talonpin" \ No newline at end of file + overlay_state = "talonpin" + +//Casino Slave Collar + +/obj/item/clothing/accessory/collar/casinoslave + name = "a disabled Sentient Prize Collar" + desc = "A collar worn by sentient prizes registered to a SPASM. Although the red text on it shows its disconnected and nonfunctional." + + icon_state = "casinoslave" + item_state = "casinoslave" + overlay_state = "casinoslave" + + var/slavename = null //Name for system to put on collar description + var/ownername = null //Name for system to put on collar description + var/slaveckey = null //Ckey for system to check who is the person and ensure no abuse of system or errors + var/slaveflavor = null //Description to show on the SPASM + var/slaveooc = null //OOC text to show on the SPASM + +/obj/item/clothing/accessory/collar/casinoslave/attack_self(mob/user as mob) + //keeping it blank so people don't tag and reset collar status + +/obj/item/clothing/accessory/collar/casinoslave_fake + name = "a Sentient Prize Collar" + desc = "A collar worn by sentient prizes registered to a SPASM. This one has been disconnected from the system and is now an accessory!" + + icon_state = "casinoslave_owned" + item_state = "casinoslave_owned" + overlay_state = "casinoslave_owned" \ No newline at end of file diff --git a/code/modules/economy/casinocash.dm b/code/modules/economy/casinocash.dm new file mode 100644 index 0000000000..25486c33f8 --- /dev/null +++ b/code/modules/economy/casinocash.dm @@ -0,0 +1,207 @@ + +//Original Casino Code created by Shadowfire117#1269 - Ported from CHOMPstation +//Modified by GhostActual#2055 for use with VOREstation + +/obj/machinery/chipmachine + name = "Casino Chip Exchange" + desc = "Takes all your cash and gives you chips back! No change and half refund!" + icon = 'icons/obj/casino.dmi' + icon_state ="chipmachine" + anchored = 1 + +/obj/machinery/chipmachine/attackby(obj/item/I as obj, mob/user as mob) + if(istype(I,/obj/item/weapon/spacecash)) + //consume the money + if(prob(50)) + playsound(loc, 'sound/items/polaroid1.ogg', 50, 1) + else + playsound(loc, 'sound/items/polaroid2.ogg', 50, 1) + + user << "You insert [I] into [src]." + spawn_casinochips(round(I:worth/5), src.loc) + src.attack_hand(user) + qdel(I) + + if(istype(I,/obj/item/weapon/spacecasinocash)) + //consume the chips + if(prob(50)) + playsound(loc, 'sound/items/polaroid1.ogg', 50, 1) + else + playsound(loc, 'sound/items/polaroid2.ogg', 50, 1) + + user << "You insert [I] into [src]." + spawn_money(round(I:worth/5), src.loc) + src.attack_hand(user) + qdel(I) + +/obj/item/weapon/spacecasinocash + name = "broken casino chip" + desc = "It's worth nothing in a casino." + gender = PLURAL + icon = 'icons/obj/casino.dmi' + icon_state = "spacecasinocash1" + opacity = 0 + density = 0 + anchored = 0.0 + force = 1.0 + throwforce = 1.0 + throw_speed = 1 + throw_range = 2 + w_class = ITEMSIZE_SMALL + var/access = list() + access = access_crate_cash + var/worth = 0 + +/obj/item/weapon/spacecasinocash/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W, /obj/item/weapon/spacecasinocash)) + + var/obj/item/weapon/spacecasinocash/SC = W + + SC.adjust_worth(src.worth) + if(istype(user, /mob/living/carbon/human)) + var/mob/living/carbon/human/h_user = user + + h_user.drop_from_inventory(src) + h_user.drop_from_inventory(SC) + h_user.put_in_hands(SC) + user << "You combine the casino chips to a stack of [SC.worth] of credits." + qdel(src) + +/obj/item/weapon/spacecasinocash/update_icon() + overlays.Cut() + name = "[worth] casino credit\s" + if(worth in list(1000,500,200,100,50,20,10,1)) + icon_state = "spacecasinocash[worth]" + desc = "It's a stack of casino chips with a combined value of [worth] credits." + return + var/sum = src.worth + var/num = 0 + for(var/i in list(1000,500,200,100,50,20,10,1)) + while(sum >= i && num < 50) + sum -= i + num++ + var/image/banknote = image('icons/obj/casino.dmi', "spacecasinocash[i]") + var/matrix/M = matrix() + M.Translate(rand(-6, 6), rand(-4, 8)) + M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45)) + banknote.transform = M + src.overlays += banknote + if(num == 0) // Less than one credit, let's just make it look like 1 for ease + var/image/banknote = image('icons/obj/casino.dmi', "spacecasinocash1") + var/matrix/M = matrix() + M.Translate(rand(-6, 6), rand(-4, 8)) + M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45)) + banknote.transform = M + src.overlays += banknote + src.desc = "They are worth [worth] of credits." + +/obj/item/weapon/spacecasinocash/proc/adjust_worth(var/adjust_worth = 0, var/update = 1) + worth += adjust_worth + if(worth > 0) + if(update) + update_icon() + return worth + else + qdel(src) + return 0 + +/obj/item/weapon/spacecasinocash/proc/set_worth(var/new_worth = 0, var/update = 1) + worth = max(0, new_worth) + if(update) + update_icon() + return worth + +/obj/item/weapon/spacecasinocash/attack_self() + var/amount = input(usr, "How much credits worth of chips do you want to take? (0 to [src.worth])", "Take chips", 20) as num + if(!src || QDELETED(src)) + return + amount = round(CLAMP(amount, 0, src.worth)) + + if(!amount) + return + + adjust_worth(-amount) + var/obj/item/weapon/spacecasinocash/SC = new (usr.loc) + SC.set_worth(amount) + usr.put_in_hands(SC) + +/obj/item/weapon/spacecasinocash/c1 + name = "1 credit casino chip" + icon_state = "spacecasinocash1" + desc = "It's worth 1 credit." + worth = 1 + +/obj/item/weapon/spacecasinocash/c10 + name = "10 credit casino chip" + icon_state = "spacecasinocash10" + desc = "It's worth 10 credits." + worth = 10 + +/obj/item/weapon/spacecasinocash/c20 + name = "20 credit casino chip" + icon_state = "spacecasinocash20" + desc = "It's worth 20 credits." + worth = 20 + +/obj/item/weapon/spacecasinocash/c50 + name = "50 credit casino chip" + icon_state = "spacecasinocash50" + desc = "It's worth 50 credits." + worth = 50 + +/obj/item/weapon/spacecasinocash/c100 + name = "100 credit casino chip" + icon_state = "spacecasinocash100" + desc = "It's worth 100 credits." + worth = 100 + +/obj/item/weapon/spacecasinocash/c200 + name = "200 credit casino chip" + icon_state = "spacecasinocash200" + desc = "It's worth 200 credits." + worth = 200 + +/obj/item/weapon/spacecasinocash/c500 + name = "500 credit casino chip" + icon_state = "spacecasinocash500" + desc = "It's worth 500 credits." + worth = 500 + +/obj/item/weapon/spacecasinocash/c1000 + name = "1000 credit casino chip" + icon_state = "spacecasinocash1000" + desc = "It's worth 1000 credits." + worth = 1000 + +/proc/spawn_casinochips(var/sum, spawnloc, mob/living/carbon/human/human_user as mob) + var/obj/item/weapon/spacecasinocash/SC = new (spawnloc) + + SC.set_worth(sum) + if (ishuman(human_user) && !human_user.get_active_hand()) + human_user.put_in_hands(SC) + return + +/obj/item/weapon/casino_platinum_chip + name = "platinum chip" + desc = "Ringa-a-Ding-Ding!" + icon = 'icons/obj/casino.dmi' + icon_state = "platinum_chip" + var/sides = 2 + opacity = 0 + density = 0 + anchored = 0.0 + force = 1.0 + throwforce = 1.0 + throw_speed = 1 + throw_range = 2 + w_class = ITEMSIZE_SMALL + +/obj/item/weapon/casino_platinum_chip/attack_self(mob/user as mob) + var/result = rand(1, sides) + var/comment = "" + if(result == 1) + comment = "Ace" + else if(result == 2) + comment = "Joker" + user.visible_message("[user] has thrown \the [src]. It lands on [comment]! ", \ + "You throw \the [src]. It lands on [comment]! ") \ No newline at end of file diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index 10b8390657..9fe6ebe8fd 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -1149,6 +1149,7 @@ products = list( /obj/item/clothing/under/rank/bartender = 5, /obj/item/clothing/under/rank/bartender/skirt = 5, + /obj/item/clothing/under/waiter = 5, /obj/item/clothing/head/that = 5, /obj/item/clothing/head/flatcap = 5, /obj/item/clothing/shoes/brown = 5, @@ -1192,7 +1193,9 @@ /obj/item/clothing/suit/storage/apron/white = 5, /obj/item/clothing/suit/chef = 5, /obj/item/clothing/suit/chef/classic = 5, - /obj/item/clothing/head/chefhat = 5 + /obj/item/clothing/head/chefhat = 5, + /obj/item/clothing/under/waiter = 5, + /obj/item/clothing/under/sundress = 1 ) req_log_access = access_hop has_logs = 1 @@ -1443,16 +1446,16 @@ icon_state = "janidrobe" req_access = list(access_janitor) products = list( - /obj/item/clothing/under/rank/janitor = 5, - /obj/item/clothing/under/dress/maid/janitor = 5, - /obj/item/device/radio/headset/headset_service = 5, - /obj/item/weapon/cartridge/janitor = 5, - /obj/item/clothing/gloves/black = 5, /obj/item/clothing/head/soft/purple = 5, /obj/item/clothing/head/beret/purple = 5, - /obj/item/clothing/suit/caution = 20, + /obj/item/clothing/head/headband/maid = 5, + /obj/item/device/radio/headset/headset_service = 5, + /obj/item/clothing/under/rank/janitor = 5, + /obj/item/clothing/under/dress/maid/janitor = 5, + /obj/item/clothing/gloves/black = 5, /obj/item/weapon/storage/belt/janitor = 5, - /obj/item/clothing/shoes/galoshes = 5 + /obj/item/clothing/shoes/galoshes = 5, + /obj/item/weapon/cartridge/janitor = 5 ) req_log_access = access_hop has_logs = 1 diff --git a/code/modules/flufftext/look_up.dm b/code/modules/flufftext/look_up.dm index 6be3713c03..10cd25b288 100644 --- a/code/modules/flufftext/look_up.dm +++ b/code/modules/flufftext/look_up.dm @@ -12,7 +12,7 @@ to_chat(usr, span("warning", "You appear to be in a place without any sort of concept of direction. You have bigger problems to worry about.")) return - if(!T.outdoors) // They're inside. + if(!T.is_outdoors()) // They're inside. to_chat(usr, "You see nothing interesting.") return diff --git a/code/modules/food/drinkingglass/extras.dm b/code/modules/food/drinkingglass/extras.dm index eb139a92b7..6605bb937f 100644 --- a/code/modules/food/drinkingglass/extras.dm +++ b/code/modules/food/drinkingglass/extras.dm @@ -69,4 +69,49 @@ glass_desc = "There is a straw in the glass." icon_state = "straw" +// This isn't great code, so if you're doing something that happens many times or isn't user-initiated +// like this is, where it'll likely happen 0-4 times a shift, then don't copy this pattern. +/obj/item/weapon/glass_extra/straw/afterattack(atom/target, mob/user, proximity_flag, click_parameters) + if(ismob(target) && proximity_flag) + // Clicked protean blob + if(istype(target, /mob/living/simple_mob/protean_blob)) + sipp_mob(target, user, "liquid_protean") + return + // Clicked humanoid + else if(ishuman(target)) + var/mob/living/carbon/human/H = target + var/speciesname = H.species?.name + switch(speciesname) + if(SPECIES_PROTEAN) + sipp_mob(target, user, "liquid_protean") + return + if(SPECIES_PROMETHEAN) + sipp_mob(target, user, "nutriment") + return + return ..() + +/obj/item/weapon/glass_extra/straw/proc/sipp_mob(mob/living/victim, mob/user, reagent_type = "nutriment") + if(victim.health <= 0) + to_chat(user, "There's not enough of [victim] left to sip on!") + return + + user.visible_message("[user] starts sipping on [victim] with [src]!", "You start sipping on [victim] with [src].") + if(!do_after(user, 3 SECONDS, victim, exclusive = TASK_ALL_EXCLUSIVE)) + return + + user.visible_message("[user] sips some of [victim] with [src]!", "You take a sip of [victim] with [src]. Yum!") + if(victim.vore_taste) + to_chat(user, "[victim] tastes like... [victim.vore_taste]!") + + victim.apply_damage(5, used_weapon = "straw") + + // If you're human you get the reagent + if(ishuman(user)) + var/mob/living/carbon/human/H = user + H.ingested.add_reagent(reagent_type, 2) + // Anything else just gets some nutrition + else if(isliving(user)) + var/mob/living/L = user + L.adjust_nutrition(30) + #undef DRINK_ICON_FILE diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index dcb1eb5f52..300b8d87f9 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -5752,10 +5752,6 @@ center_of_mass = list("x"=16, "y"=11) bitesize = 6 -/obj/item/weapon/reagent_containers/food/snacks/custardbun/Initialize() - . = ..() - reagents.add_reagent("protein", 2) - /obj/item/weapon/reagent_containers/food/snacks/chickenmomo name = "chicken momo" gender = PLURAL diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm index 4619cf760c..9a71472d6e 100644 --- a/code/modules/food/recipes_grill.dm +++ b/code/modules/food/recipes_grill.dm @@ -252,7 +252,7 @@ /datum/recipe/omurice/face appliance = GRILL - reagents = list("rice" = 5, "ketchup" = 5, "sodiumchloride" = 5, "egg" = 3) + reagents = list("rice" = 5, "ketchup" = 5, "sodiumchloride" = 1, "egg" = 3) result = /obj/item/weapon/reagent_containers/food/snacks/omurice/face /datum/recipe/meatsteak diff --git a/code/modules/lighting/lighting_fake_sun_vr.dm b/code/modules/lighting/lighting_fake_sun_vr.dm index 8f1d68a6f7..41fb677fb6 100644 --- a/code/modules/lighting/lighting_fake_sun_vr.dm +++ b/code/modules/lighting/lighting_fake_sun_vr.dm @@ -100,7 +100,7 @@ var/list/all_turfs = block(locate(1, 1, min), locate(world.maxx, world.maxy, max)) var/list/turfs_to_use = list() for(var/turf/T as anything in all_turfs) - if(T.outdoors) + if(T.is_outdoors()) turfs_to_use += T if(!turfs_to_use.len) diff --git a/code/modules/lighting/lighting_turf.dm b/code/modules/lighting/lighting_turf.dm index d59a4d5315..3ab854a26f 100644 --- a/code/modules/lighting/lighting_turf.dm +++ b/code/modules/lighting/lighting_turf.dm @@ -96,7 +96,7 @@ ///Setter for the byond luminosity var /turf/proc/set_luminosity(new_luminosity, force) // SSplanets handles outdoor turfs - if(outdoors && !force) + if(is_outdoors() && !force) return luminosity = new_luminosity diff --git a/code/modules/metric/activity.dm b/code/modules/metric/activity.dm index c33c88adca..dd93b90179 100644 --- a/code/modules/metric/activity.dm +++ b/code/modules/metric/activity.dm @@ -86,7 +86,7 @@ var/num = 0 for(var/mob/living/L in player_list) var/turf/T = get_turf(L) - if(istype(T) && !istype(T, /turf/space) && T.outdoors) + if(istype(T) && !istype(T, /turf/space) && T.is_outdoors()) . += assess_player_activity(L) num++ if(num) diff --git a/code/modules/metric/count.dm b/code/modules/metric/count.dm index ba3678295f..e0b1843d77 100644 --- a/code/modules/metric/count.dm +++ b/code/modules/metric/count.dm @@ -6,7 +6,7 @@ var/num = 0 for(var/mob/living/L in player_list) var/turf/T = get_turf(L) - if(istype(T) && !istype(T, /turf/space) && T.outdoors) + if(istype(T) && !istype(T, /turf/space) && T.is_outdoors()) if(assess_player_activity(L) >= cutoff) num++ return num diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index c5c939b2f1..dd4993bce2 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -42,7 +42,7 @@ var/global/list/total_extraction_beacons = list() return if(!can_use_indoors) var/turf/T = get_turf(A) - if(T && !T.outdoors) + if(T && !T.is_outdoors()) to_chat(user, "[src] can only be used on things that are outdoors!") return if(!flag) @@ -145,7 +145,7 @@ var/global/list/total_extraction_beacons = list() /obj/item/fulton_core/attack_self(mob/user) var/turf/T = get_turf(user) - var/outdoors = T.outdoors + var/outdoors = T.is_outdoors() if(do_after(user,15,target = user) && !QDELETED(src) && outdoors) new /obj/structure/extraction_point(get_turf(user)) qdel(src) diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 01d9702aa8..0bb9ed463c 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -6,7 +6,7 @@ /mob/living/bot/farmbot name = "Farmbot" desc = "The botanist's best friend." - icon = 'icons/obj/aibots.dmi' + icon = 'icons/obj/chemical_tanks.dmi' icon_state = "farmbot0" health = 50 maxHealth = 50 @@ -38,7 +38,7 @@ /mob/living/bot/farmbot/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = ..() - + data["on"] = on data["tank"] = !!tank if(tank) @@ -105,7 +105,7 @@ else turn_on() . = TRUE - + if(locked) return TRUE switch(action) diff --git a/code/modules/mob/living/carbon/human/examine_vr.dm b/code/modules/mob/living/carbon/human/examine_vr.dm index 8d7c9a767c..d2dcd9bfbd 100644 --- a/code/modules/mob/living/carbon/human/examine_vr.dm +++ b/code/modules/mob/living/carbon/human/examine_vr.dm @@ -110,7 +110,7 @@ if(1000 to 1399) message = "[t_He] [t_has] a rotund, thick gut. It bulges from their body obscenely, close to sagging under its own weight." if(1400 to 1934) // One person fully digested. - message = "[t_He] [t_is] sporting a large, round, sagging stomach. It's contains at least their body weight worth of glorping slush." + message = "[t_He] [t_is] sporting a large, round, sagging stomach. It contains at least their body weight worth of glorping slush." if(1935 to 3004) // Two people. message = "[t_He] [t_is] engorged with a huge stomach that sags and wobbles as they move. [t_He] must have consumed at least twice their body weight. It looks incredibly soft." if(3005 to 4074) // Three people. @@ -193,4 +193,4 @@ else return "[t_He] [t_appear] to be in some sort of torpor." if(feral) - return "[t_He] [t_has] a crazed, wild look in [t_his] eyes!" \ No newline at end of file + return "[t_He] [t_has] a crazed, wild look in [t_his] eyes!" diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 202d0c2f34..fad2b7cf25 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -167,7 +167,7 @@ // I don't like that so I'm commenting it out :) // VOREstation Edit Start /* - if(T.outdoors && (T.z <= SSplanets.z_to_planet.len)) + if((T.is_outdoors()) && (T.z <= SSplanets.z_to_planet.len)) var/datum/planet/P = SSplanets.z_to_planet[z] if(P) var/datum/weather_holder/WH = P.weather_holder diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm index 37872564c3..660845c797 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm @@ -253,4 +253,90 @@ e_icon = 4 H.shadekin_display.icon_state = "shadekin-[l_icon]-[e_icon]" - return \ No newline at end of file + return + +/datum/species/shadekin/proc/get_shadekin_eyecolor(var/mob/living/carbon/human/H) + var/eyecolor_rgb = rgb(H.r_eyes, H.g_eyes, H.b_eyes) + + var/eyecolor_hue = rgb2num(eyecolor_rgb, COLORSPACE_HSV)[1] + var/eyecolor_sat = rgb2num(eyecolor_rgb, COLORSPACE_HSV)[2] + var/eyecolor_val = rgb2num(eyecolor_rgb, COLORSPACE_HSV)[3] + + //First, clamp the saturation/value to prevent black/grey/white eyes + if(eyecolor_sat < 10) + eyecolor_sat = 10 + if(eyecolor_val < 40) + eyecolor_val = 40 + + eyecolor_rgb = rgb(eyecolor_hue, eyecolor_sat, eyecolor_val, space=COLORSPACE_HSV) + + H.r_eyes = rgb2num(eyecolor_rgb)[1] + H.g_eyes = rgb2num(eyecolor_rgb)[2] + H.b_eyes = rgb2num(eyecolor_rgb)[3] + + //Now determine what color we fall into. + var/eyecolor_type = BLUE_EYES + switch(eyecolor_hue) + if(0 to 20) + eyecolor_type = RED_EYES + if(21 to 50) + eyecolor_type = ORANGE_EYES + if(51 to 70) + eyecolor_type = YELLOW_EYES + if(71 to 160) + eyecolor_type = GREEN_EYES + if(161 to 260) + eyecolor_type = BLUE_EYES + if(261 to 340) + eyecolor_type = PURPLE_EYES + if(341 to 360) + eyecolor_type = RED_EYES + + return eyecolor_type + +/datum/species/shadekin/post_spawn_special(var/mob/living/carbon/human/H) + .=..() + + var/eyecolor_type = get_shadekin_eyecolor(H) + + switch(eyecolor_type) + if(BLUE_EYES) + total_health = 100 + energy_light = 0.5 + energy_dark = 0.5 + if(RED_EYES) + total_health = 200 + energy_light = -1 + energy_dark = 0.1 + if(PURPLE_EYES) + total_health = 150 + energy_light = -0.5 + energy_dark = 1 + if(YELLOW_EYES) + total_health = 100 + energy_light = -2 + energy_dark = 3 + if(GREEN_EYES) + total_health = 100 + energy_light = 0.125 + energy_dark = 2 + if(ORANGE_EYES) + total_health = 175 + energy_light = -0.5 + energy_dark = 0.25 + + H.maxHealth = total_health + + H.health = H.maxHealth + +/datum/species/shadekin/produceCopy(var/list/traits, var/mob/living/carbon/human/H, var/custom_base) + + var/datum/species/shadekin/new_copy = ..() + + new_copy.total_health = total_health + + new_copy.energy_light = energy_light + + new_copy.energy_dark = energy_dark + + return new_copy \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_trait.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_trait.dm deleted file mode 100644 index 5948fecc21..0000000000 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_trait.dm +++ /dev/null @@ -1,92 +0,0 @@ -/datum/trait/kintype - sort = TRAIT_SORT_SPECIES - allowed_species = list(SPECIES_SHADEKIN) - var/color = BLUE_EYES - name = "Shadekin Blue Adaptation" - desc = "Makes your shadekin adapted as a Blue eyed kin! This gives you decreased energy regeneration in darkness, decreased regeneration in the light and unchanged health!" - cost = 0 - var_changes = list( "total_health" = 100, - "energy_light" = 0.5, - "energy_dark" = 0.5, - "unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/shadekin, /datum/unarmed_attack/bite/sharp/shadekin,/datum/unarmed_attack/shadekinharmbap)) - custom_only = FALSE - -/datum/trait/kintype/red - name = "Shadekin Red Adaptation" - color = RED_EYES - desc = "Makes your shadekin adapted as a Red eyed kin! This gives you minimal energy regeneration in darkness, moderate degeneration in the light and increased health!" - var_changes = list( "total_health" = 200, - "energy_light" = -1, - "energy_dark" = 0.1, - "unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/shadekin, /datum/unarmed_attack/bite/sharp/shadekin,/datum/unarmed_attack/shadekinharmbap)) - -/datum/trait/kintype/purple - name = "Shadekin Purple Adaptation" - color = PURPLE_EYES - desc = "Makes your shadekin adapted as a Purple eyed kin! This gives you moderate energy regeneration in darkness, minor degeneration in the light and increased health!" - var_changes = list( "total_health" = 150, - "energy_light" = -0.5, - "energy_dark" = 1, - "unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/shadekin, /datum/unarmed_attack/bite/sharp/shadekin,/datum/unarmed_attack/shadekinharmbap)) - -/datum/trait/kintype/yellow - name = "Shadekin Yellow Adaptation" - color = YELLOW_EYES - desc = "Makes your shadekin adapted as a Yellow eyed kin! This gives you the highest energy regeneration in darkness, high degeneration in the light and unchanged health!" - var_changes = list( "total_health" = 100, - "energy_light" = -2, - "energy_dark" = 3, - "unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/shadekin, /datum/unarmed_attack/bite/sharp/shadekin,/datum/unarmed_attack/shadekinharmbap)) - -/datum/trait/kintype/green - name = "Shadekin Green Adaptation" - color = GREEN_EYES - desc = "Makes your shadekin adapted as a Green eyed kin! This gives you high energy regeneration in darkness, minor regeneration in the light and unchanged health!" - var_changes = list( "total_health" = 100, - "energy_light" = 0.125, - "energy_dark" = 2, - "unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/shadekin, /datum/unarmed_attack/bite/sharp/shadekin,/datum/unarmed_attack/shadekinharmbap)) - -/datum/trait/kintype/orange - name = "Shadekin Orange Adaptation" - color = ORANGE_EYES - desc = "Makes your shadekin adapted as a Orange eyed kin! This gives you minor energy regeneration in darkness, moderate degeneration in the light and increased health!" - var_changes = list( "total_health" = 175, - "energy_light" = -0.5, - "energy_dark" = 0.25, - "unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/shadekin, /datum/unarmed_attack/bite/sharp/shadekin,/datum/unarmed_attack/shadekinharmbap)) - -/datum/trait/kintype/apply(var/datum/species/shadekin/S,var/mob/living/carbon/human/H) - if(color && istype(S)) //Sanity check to see if they're actually a shadekin, otherwise just don't do anything. They shouldn't be able to spawn with the trait. - S.kin_type = color - ..(S,H) - switch(color) - if(BLUE_EYES) - H.shapeshifter_set_eye_color("0000FF") - if(RED_EYES) - H.shapeshifter_set_eye_color("FF0000") - if(GREEN_EYES) - H.shapeshifter_set_eye_color("00FF00") - if(PURPLE_EYES) - H.shapeshifter_set_eye_color("FF00FF") - if(YELLOW_EYES) - H.shapeshifter_set_eye_color("FFFF00") - if(ORANGE_EYES) - H.shapeshifter_set_eye_color("FFA500") - - -/datum/unarmed_attack/shadekinharmbap - attack_name = "syphon strike" - attack_verb = list("hit", "clawed", "slashed", "scratched") - attack_sound = 'sound/weapons/slice.ogg' - miss_sound = 'sound/weapons/slashmiss.ogg' - shredding = 0 - -/datum/unarmed_attack/shadekinharmbap/apply_effects(var/mob/living/carbon/human/shadekin/user,var/mob/living/carbon/human/target,var/armour,var/attack_damage,var/zone) - ..() - if(user == target) //Prevent self attack to gain energy - return - var/obj/item/organ/internal/brain/shadekin/shade_organ = user.internal_organs_by_name[O_BRAIN] - if(!istype(shade_organ)) - return - shade_organ.dark_energy = CLAMP(shade_organ.dark_energy + attack_damage,0,shade_organ.max_dark_energy) //Convert Damage done to Energy Gained diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 459f90c5a5..91bc81f210 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -542,3 +542,7 @@ /datum/species/proc/handle_falling(mob/living/carbon/human/H, atom/hit_atom, damage_min, damage_max, silent, planetary) return FALSE + +/datum/species/proc/post_spawn_special(mob/living/carbon/human/H) + return + diff --git a/code/modules/mob/living/carbon/human/species/species_attack_vr.dm b/code/modules/mob/living/carbon/human/species/species_attack_vr.dm index bff44609ea..110b76ef9b 100644 --- a/code/modules/mob/living/carbon/human/species/species_attack_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_attack_vr.dm @@ -49,15 +49,15 @@ target.bloodstr.add_reagent("numbenzyme",attack_damage) /datum/unarmed_attack/claws/shadekin - var/energy_gain = 3 -/datum/unarmed_attack/claws/shadekin/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) +/datum/unarmed_attack/claws/shadekin/apply_effects(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) ..() - user.shadekin_adjust_energy(energy_gain) + if(!(target == user)) + user.shadekin_adjust_energy(attack_damage) /datum/unarmed_attack/bite/sharp/shadekin - var/energy_gain = 3 -/datum/unarmed_attack/bite/sharp/shadekin/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) +/datum/unarmed_attack/bite/sharp/shadekin/apply_effects(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) ..() - user.shadekin_adjust_energy(energy_gain) \ No newline at end of file + if(!(target == user)) + user.shadekin_adjust_energy(attack_damage) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm index 70eb15d659..5de7e16c32 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm @@ -150,8 +150,11 @@ var/datum/species/shapeshifter/promethean/prometheans H.equip_to_slot_or_del(L, slot_in_backpack) /datum/species/shapeshifter/promethean/hug(var/mob/living/carbon/human/H, var/mob/living/target) - - if(H.zone_sel.selecting == "head" || H.zone_sel.selecting == "r_hand" || H.zone_sel.selecting == "l_hand") return ..() //VOREStation Edit + var/static/list/parent_handles = list("head", "r_hand", "l_hand", "mouth") + + if(H.zone_sel.selecting in parent_handles) + return ..() + var/t_him = "them" if(ishuman(target)) var/mob/living/carbon/human/T = target diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 4703c05d18..e2f87a160e 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -848,9 +848,9 @@ if(lying) density = FALSE - if(l_hand) + if(l_hand) unEquip(l_hand) - if(r_hand) + if(r_hand) unEquip(r_hand) for(var/obj/item/weapon/holder/holder in get_mob_riding_slots()) unEquip(holder) @@ -1164,6 +1164,8 @@ screen_icon = new() RegisterSignal(screen_icon, COMSIG_CLICK, .proc/character_setup_click) screen_icon.icon = HUD.ui_style + screen_icon.color = HUD.ui_color + screen_icon.alpha = HUD.ui_alpha LAZYADD(HUD.other_important, screen_icon) user.client?.screen += screen_icon diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index aca27b3791..c374f68d1d 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -66,6 +66,11 @@ var/list/mob_hat_cache = list() can_be_antagged = FALSE + var/static/list/shell_types = list("Classic" = "repairbot", "Eris" = "maintbot") + var/can_pick_shell = TRUE + var/list/shell_accessories + var/can_blitz = FALSE + /mob/living/silicon/robot/drone/Destroy() if(hat) hat.loc = get_turf(src) @@ -82,6 +87,8 @@ var/list/mob_hat_cache = list() hat_x_offset = 1 hat_y_offset = -12 can_pull_mobs = MOB_PULL_SAME + can_pick_shell = FALSE + shell_accessories = list("eyes-constructiondrone") /mob/living/silicon/robot/drone/mining icon_state = "miningdrone" @@ -91,9 +98,10 @@ var/list/mob_hat_cache = list() hat_x_offset = 1 hat_y_offset = -12 can_pull_mobs = MOB_PULL_SAME + can_pick_shell = FALSE + shell_accessories = list("eyes-miningdrone") /mob/living/silicon/robot/drone/New() - ..() verbs += /mob/living/proc/ventcrawl verbs += /mob/living/proc/hide @@ -115,6 +123,12 @@ var/list/mob_hat_cache = list() C.max_damage = 10 verbs -= /mob/living/silicon/robot/verb/Namepick + + if(can_pick_shell) + var/random = pick(shell_types) + icon_state = shell_types[random] + shell_accessories = list("[icon_state]-eyes-blue") + updateicon() updatename() @@ -128,6 +142,11 @@ var/list/mob_hat_cache = list() flavor_text = "It's a tiny little repair drone. The casing is stamped with an corporate logo and the subscript: '[using_map.company_name] Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'" playsound(src, 'sound/machines/twobeep.ogg', 50, 0) +/mob/living/silicon/robot/drone/Login() + . = ..() + if(can_pick_shell) + to_chat(src, "You can select a shell using the 'Robot Commands' > 'Customize Appearance'") + //Redefining some robot procs... /mob/living/silicon/robot/drone/SetName(pickedName as text) // Would prefer to call the grandparent proc but this isn't possible, so.. @@ -142,15 +161,47 @@ var/list/mob_hat_cache = list() name = real_name /mob/living/silicon/robot/drone/updateicon() - cut_overlays() - if(stat == 0) - add_overlay("eyes-[icon_state]") - else - cut_overlay("eyes") + + if(islist(shell_accessories)) + add_overlay(shell_accessories) + if(hat) // Let the drones wear hats. add_overlay(get_hat_icon(hat, hat_x_offset, hat_y_offset)) +/mob/living/silicon/robot/drone/verb/pick_shell() + set name = "Customize Appearance" + set category = "Robot Commands" + + if(!can_pick_shell) + to_chat(src, "You already selected a shell or this drone type isn't customizable.") + return + + var/list/choices = shell_types.Copy() + + if(can_blitz) + choices["Blitz"] = "blitzshell" + + var/shell_choice = tgui_input_list(src, "Select a shell. NOTE: You can only do this once during this drone-lifetime.", "Customize Shell", choices) + if(!shell_choice) + return + + icon_state = choices[shell_choice] + + // If you add more, datumize these. Having 'basically two' is not enough to make me bother though. + shell_accessories = null + if(icon_state in list("repairbot", "maintbot")) + var/eye_color = tgui_input_list(src, "Select eye color:", "Eye Color", list("blue", "red", "orange", "green", "violet")) + if(eye_color) + LAZYADD(shell_accessories, "[icon_state]-eyes-[eye_color]") + if(icon_state == "maintbot") + var/armor_color = tgui_input_list(src, "Select plating color:", "Eye Color", list("blue", "red", "orange", "green", "brown")) + if(armor_color) + LAZYADD(shell_accessories, "[icon_state]-shell-[armor_color]") + + can_pick_shell = FALSE + updateicon() + /mob/living/silicon/robot/drone/choose_icon() return diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm index cc0b3785b6..4efce708e8 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm @@ -136,7 +136,8 @@ if(stat != DEAD && cell) // TODO generalize solar occlusion to charge from the actual sun. - var/new_recharge_state = istype(loc, /turf/simulated/floor/outdoors) || /*, /turf/exterior) */ istype(loc, /turf/space) + var/turf/T = get_turf(src) + var/new_recharge_state = T?.is_outdoors() || isspace(T) if(new_recharge_state != last_recharge_state) last_recharge_state = new_recharge_state if(last_recharge_state) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm index f900622a8d..34a159801f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm @@ -26,24 +26,30 @@ holder_type = /obj/item/weapon/holder/borer ai_holder_type = null // This is player-controlled, always. + var/mob/living/carbon/human/host = null // The humanoid host for the brain worm. + var/mob/living/captive_brain/host_brain // Used for swapping control of the body back and forth. + + var/roundstart = FALSE // If true, spawning won't try to pull a ghost. + var/antag = TRUE // If false, will avoid setting up objectives and events + var/chemicals = 10 // A resource used for reproduction and powers. var/max_chemicals = 250 // Max of said resource. - var/mob/living/carbon/human/host = null // The humanoid host for the brain worm. var/true_name = null // String used when speaking among other worms. - var/mob/living/captive_brain/host_brain // Used for swapping control of the body back and forth. var/controlling = FALSE // Used in human death ceck. var/docile = FALSE // Sugar can stop borers from acting. + var/has_reproduced = FALSE - var/roundstart = FALSE // If true, spawning won't try to pull a ghost. var/used_dominate // world.time when the dominate power was last used. - /mob/living/simple_mob/animal/borer/roundstart roundstart = TRUE +/mob/living/simple_mob/animal/borer/non_antag + antag = FALSE + /mob/living/simple_mob/animal/borer/Login() ..() - if(mind) + if(antag && mind) borers.add_antagonist(mind) /mob/living/simple_mob/animal/borer/Initialize() @@ -54,7 +60,7 @@ true_name = "[pick("Primary","Secondary","Tertiary","Quaternary")] [rand(1000,9999)]" - if(!roundstart) + if(!roundstart && antag) request_player() return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm index 866c595492..39f3a27e87 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm @@ -169,7 +169,8 @@ H.verbs |= /mob/living/carbon/human/proc/psychic_whisper H.verbs |= /mob/living/carbon/human/proc/tackle - H.verbs |= /mob/living/carbon/proc/spawn_larvae + if(antag) + H.verbs |= /mob/living/carbon/proc/spawn_larvae if(H.client) H.ghostize(0) @@ -332,7 +333,8 @@ host.verbs += /mob/living/carbon/proc/release_control host.verbs += /mob/living/carbon/proc/punish_host - host.verbs += /mob/living/carbon/proc/spawn_larvae + if(antag) + host.verbs += /mob/living/carbon/proc/spawn_larvae return diff --git a/code/modules/mob/living/simple_mob/subtypes/horror/Eddy.dm b/code/modules/mob/living/simple_mob/subtypes/horror/Eddy.dm deleted file mode 100644 index 29b7af8d30..0000000000 --- a/code/modules/mob/living/simple_mob/subtypes/horror/Eddy.dm +++ /dev/null @@ -1,57 +0,0 @@ -/mob/living/simple_mob/horror/Eddy - name = "???" - desc = "A dark green, sluglike creature, covered in glowing green ooze, and carrying what look to be eggs on its back." - - icon_state = "Eddy" - icon_living = "Eddy" - icon_dead = "e_head" - icon_rest = "Eddy" - faction = "horror" - icon = 'icons/mob/horror_show/GHPS.dmi' - icon_gib = "generic_gib" - - attack_sound = 'sound/h_sounds/negative.ogg' - - maxHealth = 175 - health = 175 - - melee_damage_lower = 25 - melee_damage_upper = 35 - grab_resist = 100 - - response_help = "pets the" - response_disarm = "bops the" - response_harm = "hits the" - attacktext = list("smashed") - friendly = list("nuzzles", "boops", "bumps against", "leans on") - - - say_list_type = /datum/say_list/Eddy - ai_holder_type = /datum/ai_holder/simple_mob/horror - -/mob/living/simple_mob/horror/Eddy/death() - playsound(src, 'sound/h_sounds/headcrab.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Eddy/bullet_act() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Eddy/attack_hand() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Eddy/hitby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Eddy/attackby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/datum/say_list/Eddy - speak = list("Uuurrgh?","Aauuugghh...", "AAARRRGH!") - emote_hear = list("shrieks horrifically", "groans in pain", "cries", "whines") - emote_see = list("blinks its many eyes", "shakes violently in place", "stares aggressively") - say_maybe_target = list("Uuurrgghhh?") - say_got_target = list("AAAHHHHH!") \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/horror/Master.dm b/code/modules/mob/living/simple_mob/subtypes/horror/Master.dm deleted file mode 100644 index 430cb4e865..0000000000 --- a/code/modules/mob/living/simple_mob/subtypes/horror/Master.dm +++ /dev/null @@ -1,51 +0,0 @@ -/mob/living/simple_mob/horror/Master - name = "Dr. Helix" - desc = "A massive pile of grotesque flesh and bulging tumor like growths. Every inch of its skin is undulating in every direction possible, bringing a literal definition to 'Skin Crawling.' Stuck in the middle of this monstrosity is a large AI core with a bloodied, emaciated man sewn into its circuitry." - - icon_state = "Helix" - icon_living = "Helix" - icon_dead = "m_dead" - icon_rest = "Helix" - faction = "horror" - icon = 'icons/mob/horror_show/master.dmi' - vis_height = 64 - icon_gib = "generic_gib" - anchored = TRUE - - attack_sound = 'sound/h_sounds/shitty_tim.ogg' - - maxHealth = 400 - health = 400 - - melee_damage_lower = 5 - melee_damage_upper = 8 - grab_resist = 100 - - response_help = "pets the" - response_disarm = "bops the" - response_harm = "hits the" - attacktext = list("smushed") - friendly = list("nuzzles", "boops", "bumps against", "leans on") - - - ai_holder_type = null - -/mob/living/simple_mob/horror/Master/death() - playsound(src, 'sound/h_sounds/imbeciles.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Master/bullet_act() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Master/attack_hand() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Master/hitby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Master/attackby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/horror/Rickey.dm b/code/modules/mob/living/simple_mob/subtypes/horror/Rickey.dm deleted file mode 100644 index 01f9b6d7f9..0000000000 --- a/code/modules/mob/living/simple_mob/subtypes/horror/Rickey.dm +++ /dev/null @@ -1,57 +0,0 @@ -/mob/living/simple_mob/horror/Rickey - name = "???" - desc = "What a handsome Man, his mother must think." - - icon_state = "Rickey" - icon_living = "Rickey" - icon_dead = "r_head" - icon_rest = "Rickey" - faction = "horror" - icon = 'icons/mob/horror_show/GHPS.dmi' - icon_gib = "generic_gib" - - attack_sound = 'sound/h_sounds/wor.ogg' - - maxHealth = 175 - health = 175 - - melee_damage_lower = 25 - melee_damage_upper = 35 - grab_resist = 100 - - response_help = "pets the" - response_disarm = "bops the" - response_harm = "hits the" - attacktext = list("smashed") - friendly = list("nuzzles", "boops", "bumps against", "leans on") - - - say_list_type = /datum/say_list/Rickey - ai_holder_type = /datum/ai_holder/simple_mob/horror - -/mob/living/simple_mob/horror/Rickey/death() - playsound(src, 'sound/h_sounds/headcrab.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Rickey/bullet_act() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Rickey/attack_hand() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Rickey/hitby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Rickey/attackby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/datum/say_list/Rickey - speak = list("Uuurrgh?","Aauuugghh...", "AAARRRGH!") - emote_hear = list("shrieks horrifically", "groans in pain", "cries", "whines") - emote_see = list("flexes to no one in particular", "shakes violently in place", "stares aggressively") - say_maybe_target = list("Uuurrgghhh?") - say_got_target = list("AAAHHHHH!") \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/horror/Smiley.dm b/code/modules/mob/living/simple_mob/subtypes/horror/Smiley.dm deleted file mode 100644 index aae4f3cb11..0000000000 --- a/code/modules/mob/living/simple_mob/subtypes/horror/Smiley.dm +++ /dev/null @@ -1,57 +0,0 @@ -/mob/living/simple_mob/horror/Smiley - name = "???" - desc = "A giant hand, with a large, smiling head on top." - - icon_state = "Smiley" - icon_living = "Smiley" - icon_dead = "s_head" - icon_rest = "Smiley" - faction = "horror" - icon = 'icons/mob/horror_show/GHPS.dmi' - icon_gib = "generic_gib" - - attack_sound = 'sound/h_sounds/holla.ogg' - - maxHealth = 175 - health = 175 - - melee_damage_lower = 25 - melee_damage_upper = 35 - grab_resist = 100 - - response_help = "pets the" - response_disarm = "bops the" - response_harm = "hits the" - attacktext = list("smashed") - friendly = list("nuzzles", "boops", "bumps against", "leans on") - - - say_list_type = /datum/say_list/Smiley - ai_holder_type = /datum/ai_holder/simple_mob/horror - -/mob/living/simple_mob/horror/Smiley/death() - playsound(src, 'sound/h_sounds/lynx.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Helix/bullet_act() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Helix/attack_hand() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Helix/hitby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Helix/attackby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/datum/say_list/Smiley - speak = list("Uuurrgh?","Aauuugghh...", "AAARRRGH!") - emote_hear = list("shrieks horrifically", "groans in pain", "cries", "whines") - emote_see = list("squeezes its fingers together", "shakes violently in place", "stares aggressively") - say_maybe_target = list("Uuurrgghhh?") - say_got_target = list("AAAHHHHH!") \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/horror/Steve.dm b/code/modules/mob/living/simple_mob/subtypes/horror/Steve.dm deleted file mode 100644 index 08abc47b4f..0000000000 --- a/code/modules/mob/living/simple_mob/subtypes/horror/Steve.dm +++ /dev/null @@ -1,64 +0,0 @@ -/mob/living/simple_mob/horror/Steve - name = "???" - desc = "A formless blob of flesh with one, giant, everblinking eye. It has a large machine gun and a watercooler stuck stright into its skin." - - icon_state = "Steve" - icon_living = "Steve" - icon_dead = "sg_head" - icon_rest = "Steve" - faction = "horror" - icon = 'icons/mob/horror_show/GHPS.dmi' - icon_gib = "generic_gib" - - attack_sound = 'sound/h_sounds/mumble.ogg' - - maxHealth = 175 - health = 175 - - melee_damage_lower = 25 - melee_damage_upper = 35 - grab_resist = 100 - - projectiletype = /obj/item/projectile/bullet/pistol/medium - projectilesound = 'sound/weapons/Gunshot_light.ogg' - - needs_reload = TRUE - base_attack_cooldown = 5 // Two attacks a second or so. - reload_max = 20 - - response_help = "pets the" - response_disarm = "bops the" - response_harm = "hits the" - attacktext = list("smashed") - friendly = list("nuzzles", "boops", "bumps against", "leans on") - - - say_list_type = /datum/say_list/Steve - ai_holder_type = /datum/ai_holder/simple_mob/horror - -/mob/living/simple_mob/horror/Steve/death() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Steve/bullet_act() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Steve/attack_hand() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Steve/hitby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Steve/attackby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/datum/say_list/Steve - speak = list("Uuurrgh?","Aauuugghh...", "AAARRRGH!") - emote_hear = list("shrieks horrifically", "groans in pain", "cries", "whines") - emote_see = list("blinks aggressively at", "shakes violently in place", "stares aggressively") - say_maybe_target = list("Uuurrgghhh?") - say_got_target = list("AAAHHHHH!") \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/horror/Willy.dm b/code/modules/mob/living/simple_mob/subtypes/horror/Willy.dm deleted file mode 100644 index 0c01c98288..0000000000 --- a/code/modules/mob/living/simple_mob/subtypes/horror/Willy.dm +++ /dev/null @@ -1,57 +0,0 @@ -/mob/living/simple_mob/horror/Willy - name = "???" - desc = "It looks like a giant mascot costume made of flesh and fabric. The two bulging eyes aren't comforting to look at either. At least it smells like a burger and fries." - - icon_state = "Willy" - icon_living = "Willy" - icon_dead = "w_head" - icon_rest = "Willy" - faction = "horror" - icon = 'icons/mob/horror_show/GHPS.dmi' - icon_gib = "generic_gib" - - attack_sound = 'sound/h_sounds/negative.ogg' - - maxHealth = 175 - health = 175 - - melee_damage_lower = 25 - melee_damage_upper = 35 - grab_resist = 100 - - response_help = "pets the" - response_disarm = "bops the" - response_harm = "hits the" - attacktext = list("smashed") - friendly = list("nuzzles", "boops", "bumps against", "leans on") - - - say_list_type = /datum/say_list/Willy - ai_holder_type = /datum/ai_holder/simple_mob/horror - -/mob/living/simple_mob/horror/Willy/death() - playsound(src, 'sound/h_sounds/sampler.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Willy/bullet_act() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Willy/attack_hand() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Willy/hitby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Willy/attackby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/datum/say_list/Willy - speak = list("Uuurrgh?","Aauuugghh...", "AAARRRGH!") - emote_hear = list("shrieks horrifically", "groans in pain", "cries", "whines") - emote_see = list("headbobs", "shakes violently in place", "stares aggressively") - say_maybe_target = list("Uuurrgghhh?") - say_got_target = list("AAAHHHHH!") \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/horror/bradley.dm b/code/modules/mob/living/simple_mob/subtypes/horror/bradley.dm deleted file mode 100644 index f1f1af48aa..0000000000 --- a/code/modules/mob/living/simple_mob/subtypes/horror/bradley.dm +++ /dev/null @@ -1,57 +0,0 @@ -/mob/living/simple_mob/horror/bradley - name = "Bradley" - desc = "What you see is a ball of seemingly melty flesh, stitched together hastily over large, bulging scars. Four metal legs extend out of its sides, The two in the front are larger than the back; and all of the legs are segmented with a unique steel looking metal. In the middle of this monstrosity is a constantly tremmoring eye. While the eye never blinks, it is dyed faintly yellow, with a vertical, read pupil. It seems like it's crying, a weird, oil like liquid seeping from its socket." - - icon_state = "Bradley" - icon_living = "Bradley" - icon_dead = "b_head" - icon_rest = "Bradley" - faction = "horror" - icon = 'icons/mob/horror_show/GHPS.dmi' - icon_gib = "generic_gib" - - attack_sound = 'sound/h_sounds/holla.ogg' - - maxHealth = 175 - health = 175 - - melee_damage_lower = 25 - melee_damage_upper = 35 - grab_resist = 100 - - response_help = "pets the" - response_disarm = "bops the" - response_harm = "hits the" - attacktext = list("mutilated") - friendly = list("nuzzles", "eyeboops", "headbumps against", "leans on") - - - say_list_type = /datum/say_list/bradley - ai_holder_type = /datum/ai_holder/simple_mob/horror - -/mob/living/simple_mob/horror/bradley/death() - playsound(src, 'sound/h_sounds/mumble.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/bradley/bullet_act() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/bradley/attack_hand() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/bradley/hitby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/bradley/attackby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/datum/say_list/bradley - speak = list("Uuurrgh?","Aauuugghh...", "AAARRRGH!") - emote_hear = list("shrieks through its skin", "groans in pain", "creaks", "clanks") - emote_see = list("taps its limbs against the ground", "shakes", "stares aggressively") - say_maybe_target = list("Uuurrgghhh?") - say_got_target = list("AAAHHHHH!") \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/horror/horror .dm b/code/modules/mob/living/simple_mob/subtypes/horror/horror .dm deleted file mode 100644 index b663972372..0000000000 --- a/code/modules/mob/living/simple_mob/subtypes/horror/horror .dm +++ /dev/null @@ -1,27 +0,0 @@ -/mob/living/simple_mob/horror - tt_desc = "Homo Horrificus" - faction = "horror" - icon = 'icons/mob/horror_show/GHPS.dmi' - icon_gib = "generic_gib" - -/datum/ai_holder/simple_mob/horror - hostile = TRUE // The majority of simplemobs are hostile, gaslamps are nice. - cooperative = FALSE - retaliate = TRUE //so the monster can attack back - returns_home = FALSE - can_flee = FALSE - speak_chance = 3 - wander = TRUE - base_wander_delay = 9 - -/mob/living/simple_mob/horror - min_oxy = 0 - max_oxy = 0 - min_tox = 0 - max_tox = 0 - min_co2 = 0 - max_co2 = 0 - min_n2 = 0 - max_n2 = 0 - minbodytemp = 0 - maxbodytemp = 700 diff --git a/code/modules/mob/living/simple_mob/subtypes/horror/sally.dm b/code/modules/mob/living/simple_mob/subtypes/horror/sally.dm deleted file mode 100644 index a737a66587..0000000000 --- a/code/modules/mob/living/simple_mob/subtypes/horror/sally.dm +++ /dev/null @@ -1,57 +0,0 @@ -/mob/living/simple_mob/horror/Sally - name = "???" - desc = "A mass of tentacles hold up a large head, graced with one of the grandest smiles in the galaxy. It's a shame about the constant oil leaking from its eyes." - - icon_state = "Sally" - icon_living = "Sally" - icon_dead = "ws_head" - icon_rest = "Sally" - faction = "horror" - icon = 'icons/mob/horror_show/widehorror.dmi' - icon_gib = "generic_gib" - - attack_sound = 'sound/h_sounds/sampler.ogg' - - maxHealth = 200 - health = 200 - - melee_damage_lower = 30 - melee_damage_upper = 40 - grab_resist = 100 - - response_help = "pets the" - response_disarm = "bops the" - response_harm = "hits the" - attacktext = list("smashed") - friendly = list("nuzzles", "boops", "headbumps against", "leans on") - - - say_list_type = /datum/say_list/Sally - ai_holder_type = /datum/ai_holder/simple_mob/horror - -/mob/living/simple_mob/horror/Sally/death() - playsound(src, 'sound/h_sounds/lynx.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Sally/bullet_act() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Sally/attack_hand() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Sally/hitby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/Sally/attackby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/datum/say_list/Sally - speak = list("Yeeeeee?","Haaah! Gashuuuuuh!", "Gahgahgahgah...") - emote_hear = list("shrieks", "groans in pain", "breathes heavily", "gnashes its teeth") - emote_see = list("wiggles its head", "shakes violently", "stares aggressively") - say_maybe_target = list("Uuurrgghhh?") - say_got_target = list("AAAHHHHH!") \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/horror/shittytim.dm b/code/modules/mob/living/simple_mob/subtypes/horror/shittytim.dm deleted file mode 100644 index 0d00ee6cce..0000000000 --- a/code/modules/mob/living/simple_mob/subtypes/horror/shittytim.dm +++ /dev/null @@ -1,58 +0,0 @@ -/mob/living/simple_mob/horror/BigTim - name = "Shitty Tim" - desc = "A tall figure wearing ripped clothes. Its eyes are placed on the bulb of skin that's folded over the front of its face. He has a gold clock hanging on a gold chain around his neck, and he has a gold and diamond bracelet on his wrist." - - icon_state = "shitty_tim" - icon_living = "shitty_tim" - icon_dead = "tst_head" - icon_rest = "shitty_tim" - faction = "horror" - icon = 'icons/mob/horror_show/tallhorror.dmi' - vis_height = 64 - icon_gib = "generic_gib" - - attack_sound = 'sound/h_sounds/youknowwhoitis.ogg' - - maxHealth = 250 - health = 250 - - melee_damage_lower = 35 - melee_damage_upper = 45 - grab_resist = 100 - - response_help = "pets the" - response_disarm = "bops the" - response_harm = "hits the" - attacktext = list("mutilated") - friendly = list("nuzzles", "boops", "headbumps against", "leans on") - - - say_list_type = /datum/say_list/BigTim - ai_holder_type = /datum/ai_holder/simple_mob/horror - -/mob/living/simple_mob/horror/BigTim/death() - playsound(src, 'sound/h_sounds/shitty_tim.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/BigTim/bullet_act() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/BigTim/attack_hand() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/BigTim/hitby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/BigTim/attackby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/datum/say_list/BigTim - speak = list("Wuuuuuhhuuhhhhh?","Urk! Aaaaahaaa!", "Yuhyuhyuhyuh...") - emote_hear = list("shrieks", "groans in pain", "flaps", "gnashes its teeth") - emote_see = list("jiggles its teeth", "shakes violently", "stares aggressively") - say_maybe_target = list("Uuurrgghhh?") - say_got_target = list("AAAHHHHH!") \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/horror/timling.dm b/code/modules/mob/living/simple_mob/subtypes/horror/timling.dm deleted file mode 100644 index f3a93d7a66..0000000000 --- a/code/modules/mob/living/simple_mob/subtypes/horror/timling.dm +++ /dev/null @@ -1,58 +0,0 @@ -/mob/living/simple_mob/horror/TinyTim - name = "???" - desc = "A tall figure wearing ripped clothes. Its eyes are placed on the bulb of skin that's folded over the front of its face." - - icon_state = "timling" - icon_living = "timling" - icon_dead = "tt_head" - icon_rest = "timling" - faction = "horror" - icon = 'icons/mob/horror_show/tallhorror.dmi' - vis_height = 64 - icon_gib = "generic_gib" - - attack_sound = 'sound/h_sounds/youknowwhoitis.ogg' - - maxHealth = 200 - health = 200 - - melee_damage_lower = 30 - melee_damage_upper = 40 - grab_resist = 100 - - response_help = "pets the" - response_disarm = "bops the" - response_harm = "hits the" - attacktext = list("mutilated") - friendly = list("nuzzles", "boops", "headbumps against", "leans on") - - - say_list_type = /datum/say_list/TinyTim - ai_holder_type = /datum/ai_holder/simple_mob/horror - -/mob/living/simple_mob/horror/TinyTim/death() - playsound(src, 'sound/h_sounds/shitty_tim.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/TinyTim/bullet_act() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/TinyTim/attack_hand() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/TinyTim/hitby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/mob/living/simple_mob/horror/TinyTim/attackby() - playsound(src, 'sound/h_sounds/holla.ogg', 50, 1) - ..() - -/datum/say_list/TinyTim - speak = list("Wuuuuuhhuuhhhhh?","Urk! Aaaaahaaa!", "Yuhyuhyuhyuh...") - emote_hear = list("shrieks", "groans in pain", "flaps", "gnashes its teeth") - emote_see = list("jiggles its teeth", "shakes violently", "stares aggressively") - say_maybe_target = list("Uuurrgghhh?") - say_got_target = list("AAAHHHHH!") \ No newline at end of file diff --git a/code/modules/modular_computers/computers/subtypes/dev_console.dm b/code/modules/modular_computers/computers/subtypes/dev_console.dm index a259651da6..a467a77730 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_console.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_console.dm @@ -16,4 +16,21 @@ steel_sheet_cost = 20 light_strength = 4 max_damage = 300 - broken_damage = 150 \ No newline at end of file + broken_damage = 150 + +/obj/item/modular_computer/console/update_icon() + . = ..() + // Connecty + if(initial(icon_state) == "console") + var/append_string = "" + var/left = turn(dir, -90) + var/right = turn(dir, 90) + var/turf/L = get_step(src, left) + var/turf/R = get_step(src, right) + var/obj/item/modular_computer/console/LC = locate() in L + var/obj/item/modular_computer/console/RC = locate() in R + if(LC && LC.dir == dir && initial(LC.icon_state) == "console") + append_string += "_L" + if(RC && RC.dir == dir && initial(RC.icon_state) == "console") + append_string += "_R" + icon_state = "console[append_string]" diff --git a/code/modules/nifsoft/nif_tgui.dm b/code/modules/nifsoft/nif_tgui.dm index 7be13ceff6..203e0bb858 100644 --- a/code/modules/nifsoft/nif_tgui.dm +++ b/code/modules/nifsoft/nif_tgui.dm @@ -47,7 +47,7 @@ qdel_null(screen_icon) if(ishuman(parent)) owner.verbs -= /mob/living/carbon/human/proc/nif_menu - + /datum/component/nif_menu/proc/create_mob_button(mob/user) var/datum/hud/HUD = user.hud_used @@ -55,9 +55,11 @@ screen_icon = new() RegisterSignal(screen_icon, COMSIG_CLICK, .proc/nif_menu_click) screen_icon.icon = HUD.ui_style + screen_icon.color = HUD.ui_color + screen_icon.alpha = HUD.ui_alpha LAZYADD(HUD.other_important, screen_icon) user.client?.screen += screen_icon - + user.verbs |= /mob/living/carbon/human/proc/nif_menu /datum/component/nif_menu/proc/nif_menu_click(source, location, control, params, user) @@ -118,7 +120,7 @@ data["nif_percent"] = round((durability/initial(durability))*100) data["nif_stat"] = stat - + var/list/modules = list() if(stat == NIF_WORKING) for(var/nifsoft in nifsofts) diff --git a/code/modules/overmap/ships/computers/engine_control.dm b/code/modules/overmap/ships/computers/engine_control.dm index 52342e23d3..1110f6b246 100644 --- a/code/modules/overmap/ships/computers/engine_control.dm +++ b/code/modules/overmap/ships/computers/engine_control.dm @@ -6,6 +6,13 @@ icon_screen = "engines" circuit = /obj/item/weapon/circuitboard/engine +// fancy sprite +/obj/machinery/computer/ship/engines/adv + icon_keyboard = null + icon_state = "adv_engines" + icon_screen = "adv_engines_screen" + light_color = "#05A6A8" + /obj/machinery/computer/ship/engines/tgui_interact(mob/user, datum/tgui/ui) if(!linked) display_reconnect_dialog(user, "ship control systems") diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index e0692314f9..fe24315788 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -30,6 +30,13 @@ GLOBAL_LIST_EMPTY(all_waypoints) var/accellimit = 0.001 //manual limiter for acceleration req_one_access = list(access_pilot) //VOREStation Edit +// fancy sprite +/obj/machinery/computer/ship/helm/adv + icon_keyboard = null + icon_state = "adv_helm" + icon_screen = "adv_helm_screen" + light_color = "#70ffa0" + /obj/machinery/computer/ship/helm/Initialize() . = ..() get_known_sectors() diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index 3775af9a75..9a1c0fb115 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -7,6 +7,13 @@ extra_view = 4 var/obj/machinery/shipsensors/sensors +// fancy sprite +/obj/machinery/computer/ship/sensors/adv + icon_keyboard = null + icon_state = "adv_sensors" + icon_screen = "adv_sensors_screen" + light_color = "#05A6A8" + /obj/machinery/computer/ship/sensors/attempt_hook_up(obj/effect/overmap/visitable/ship/sector) if(!(. = ..())) return 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/overmap/ships/ship_vr.dm b/code/modules/overmap/ships/ship_vr.dm new file mode 100644 index 0000000000..97afe44e72 --- /dev/null +++ b/code/modules/overmap/ships/ship_vr.dm @@ -0,0 +1,48 @@ +/obj/effect/overmap/visitable/ship/Initialize() + . = ..() + listening_objects += src + +/obj/effect/overmap/visitable/ship/Destroy() + listening_objects -= src + return ..() + +/obj/effect/overmap/visitable/ship/MouseDrop(atom/over) + if(!isliving(over) || !Adjacent(over) || !Adjacent(usr)) + return + var/mob/living/L = over + var/confirm = tgui_alert(L, "You COULD eat this spaceship...", "Eat spaceship?", list("Eat it!", "No, thanks.")) + if(confirm == "Eat it!") + var/obj/belly/bellychoice = tgui_input_list(usr, "Which belly?","Select A Belly", L.vore_organs) + if(bellychoice) + L.visible_message("[L] is trying to stuff \the [src] into [L.gender == MALE ? "his" : L.gender == FEMALE ? "her" : "their"] [bellychoice]!","You begin putting \the [src] into your [bellychoice]!") + if(do_after(L, 5 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE)) + forceMove(bellychoice) + SSskybox.rebuild_skyboxes(map_z) + L.visible_message("[L] eats a spaceship! This is totally normal.","You eat the the spaceship! Yum, metal.") + +/obj/effect/overmap/visitable/ship/proc/get_people_in_ship() + . = list() + for(var/mapz in map_z) + var/list/thatz = GLOB.players_by_zlevel[mapz] + . += thatz + +/obj/effect/overmap/visitable/ship/hear_talk(mob/talker, list/message_pieces, verb) + . = ..() + + var/list/listeners = get_people_in_ship() + for(var/mob/M as anything in listeners) + M.hear_say(message_pieces, verb, FALSE, talker) + +/obj/effect/overmap/visitable/ship/show_message(msg, type, alt, alt_type) + . = ..() + + var/list/listeners = get_people_in_ship() + for(var/mob/M as anything in listeners) + M.show_message(msg, type, alt, alt_type) + +/obj/effect/overmap/visitable/ship/see_emote(source, message, m_type) + . = ..() + + var/list/listeners = get_people_in_ship() + for(var/mob/M as anything in listeners) + M.show_message(message, m_type) diff --git a/code/modules/overmap/turfs.dm b/code/modules/overmap/turfs.dm index 9d7a35c226..33c6b7cb04 100644 --- a/code/modules/overmap/turfs.dm +++ b/code/modules/overmap/turfs.dm @@ -10,10 +10,12 @@ var/global/list/map_sectors = list() /turf/unsimulated/map icon = 'icons/turf/space.dmi' icon_state = "map" + alpha = 200 /turf/unsimulated/map/edge opacity = 1 density = TRUE + alpha = 255 var/map_is_to_my var/turf/unsimulated/map/edge/wrap_buddy @@ -75,6 +77,7 @@ var/global/list/map_sectors = list() if(x == global.using_map.overmap_size) I.pixel_x = 5*i + 2 add_overlay(I) + AddElement(/datum/element/turf_z_transparency) /turf/unsimulated/map/Entered(var/atom/movable/O, var/atom/oldloc) ..() diff --git a/code/modules/planet/sif.dm b/code/modules/planet/sif.dm index 1d2e4b0af0..e09b808a3a 100644 --- a/code/modules/planet/sif.dm +++ b/code/modules/planet/sif.dm @@ -296,7 +296,7 @@ var/datum/planet/sif/planet_sif = null for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain @@ -349,7 +349,7 @@ var/datum/planet/sif/planet_sif = null for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain @@ -407,7 +407,7 @@ var/datum/planet/sif/planet_sif = null for(var/mob/living/carbon/H as anything in human_mob_list) if(H.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(H) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to pelt them with ice. // If they have an open umbrella, it'll guard from hail @@ -502,7 +502,7 @@ var/datum/planet/sif/planet_sif = null for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to burn them with ash. L.inflict_heat_damage(rand(1, 3)) @@ -539,7 +539,7 @@ var/datum/planet/sif/planet_sif = null if(L.z in holder.our_planet.expected_z_levels) irradiate_nearby_turf(L) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to irradiate them with fallout. L.rad_act(rand(direct_rad_low, direct_rad_high)) @@ -553,5 +553,5 @@ var/datum/planet/sif/planet_sif = null var/turf/T = pick(turfs) // We get one try per tick. if(!istype(T)) return - if(T.outdoors) + if(T.is_outdoors()) SSradiation.radiate(T, rand(fallout_rad_low, fallout_rad_high)) diff --git a/code/modules/planet/sun.dm b/code/modules/planet/sun.dm index 3903543be6..39dafd5659 100644 --- a/code/modules/planet/sun.dm +++ b/code/modules/planet/sun.dm @@ -117,15 +117,15 @@ // Test for corners for(var/direction in cornerdirs) var/turf/dirturf = get_step(T, direction) - if(dirturf && !dirturf.outdoors) + if(dirturf && !dirturf.is_outdoors()) var/turf/TL = get_step(T, turn(direction, -45)) var/turf/TR = get_step(T, turn(direction, 45)) // If outdoors at 45 degrees are the same, then this is a corner - if(TL && TR && TL.outdoors == TR.outdoors) + if(TL && TR && TL.is_outdoors() == TR.is_outdoors()) var/atom/movable/sun_visuals_overlap/OL // Outer corner - if(TL.outdoors) + if(TL.is_outdoors()) OL = spreads["o[direction]"] // Inner corner else @@ -139,11 +139,11 @@ // Take all orthagonals for(var/direction in cardinal) var/turf/dirturf = get_step(T, direction) - if(dirturf && !dirturf.outdoors) + if(dirturf && !dirturf.is_outdoors()) var/turf/TL = get_step(T, turn(direction, -45)) var/turf/TR = get_step(T, turn(direction, 45)) // End of a wall, the corner will handle it - if(TL && TR && TL.outdoors != TR.outdoors) + if(TL && TR && TL.is_outdoors() != TR.is_outdoors()) continue var/atom/movable/sun_visuals_overlap/OL = spreads["[direction]"] dirturf.vis_contents += OL diff --git a/code/modules/planet/virgo3b_vr.dm b/code/modules/planet/virgo3b_vr.dm index d2faf2315d..822faa2d7e 100644 --- a/code/modules/planet/virgo3b_vr.dm +++ b/code/modules/planet/virgo3b_vr.dm @@ -276,7 +276,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain @@ -327,7 +327,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain @@ -383,7 +383,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null for(var/mob/living/carbon/H as anything in human_mob_list) if(H.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(H) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to pelt them with ice. // If they have an open umbrella, it'll guard from hail @@ -474,7 +474,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to burn them with ash. L.inflict_heat_damage(rand(1, 3)) @@ -511,7 +511,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null if(L.z in holder.our_planet.expected_z_levels) irradiate_nearby_turf(L) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to irradiate them with fallout. L.rad_act(rand(direct_rad_low, direct_rad_high)) @@ -525,6 +525,6 @@ var/datum/planet/virgo3b/planet_virgo3b = null var/turf/T = pick(turfs) // We get one try per tick. if(!istype(T)) return - if(T.outdoors) + if(T.is_outdoors()) SSradiation.radiate(T, rand(fallout_rad_low, fallout_rad_high)) diff --git a/code/modules/planet/virgo4_vr.dm b/code/modules/planet/virgo4_vr.dm index 18f4298aa1..74cd6c33b4 100644 --- a/code/modules/planet/virgo4_vr.dm +++ b/code/modules/planet/virgo4_vr.dm @@ -255,7 +255,7 @@ var/datum/planet/virgo4/planet_virgo4 = null for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain @@ -301,7 +301,7 @@ var/datum/planet/virgo4/planet_virgo4 = null for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain @@ -354,7 +354,7 @@ var/datum/planet/virgo4/planet_virgo4 = null for(var/mob/living/carbon/H as anything in human_mob_list) if(H.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(H) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to pelt them with ice. // If they have an open umbrella, it'll guard from hail @@ -447,7 +447,7 @@ var/datum/planet/virgo4/planet_virgo4 = null for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to burn them with ash. L.inflict_heat_damage(rand(1, 3)) @@ -484,7 +484,7 @@ var/datum/planet/virgo4/planet_virgo4 = null if(L.z in holder.our_planet.expected_z_levels) irradiate_nearby_turf(L) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to irradiate them with fallout. L.rad_act(rand(direct_rad_low, direct_rad_high)) @@ -498,7 +498,7 @@ var/datum/planet/virgo4/planet_virgo4 = null var/turf/T = pick(turfs) // We get one try per tick. if(!istype(T)) return - if(T.outdoors) + if(T.is_outdoors()) SSradiation.radiate(T, rand(fallout_rad_low, fallout_rad_high)) /turf/unsimulated/wall/planetary/normal/virgo4 diff --git a/code/modules/planet/weather.dm b/code/modules/planet/weather.dm index bbe2318a27..c354e8bde3 100644 --- a/code/modules/planet/weather.dm +++ b/code/modules/planet/weather.dm @@ -137,7 +137,7 @@ for(var/mob/M in player_list) // Don't need to care about clientless mobs. if(M.z in our_planet.expected_z_levels) var/turf/T = get_turf(M) - if(!T.outdoors) + if(!T.is_outdoors()) continue to_chat(M, message) @@ -213,7 +213,7 @@ // Otherwise they should hear some sounds, depending on if they're inside or not. var/turf/T = get_turf(M) if(istype(T)) - if(T.outdoors) // Mob is currently outdoors. + if(T.is_outdoors()) // Mob is currently outdoors. hear_outdoor_sounds(M, TRUE) hear_indoor_sounds(M, FALSE) diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index c5021ba960..dcf8dab1bd 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -9,7 +9,7 @@ /obj/machinery/power/smes/batteryrack name = "power cell rack PSU" - desc = "A rack of power cells working as a PSU." + desc = "A rack of power cells working as a PSU. Made from a recycled Breaker Box frame." icon = 'icons/obj/cellrack.dmi' icon_state = "rack" capacity = 0 diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index c47352e09d..58f8ee0275 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -3,7 +3,7 @@ /obj/machinery/containment_field name = "Containment Field" desc = "An energy field." - icon = 'icons/obj/singularity.dmi' + icon = 'icons/obj/machines/field_generator.dmi' icon_state = "Contain_F" anchored = TRUE density = FALSE diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 2c0742c9f4..67524ac86c 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -226,7 +226,7 @@ /var/global/list/magazine_icondata_states = list() /proc/initialize_magazine_icondata(var/obj/item/ammo_magazine/M) - var/typestr = "[M.type]" + var/typestr = M.type if(!(typestr in magazine_icondata_keys) || !(typestr in magazine_icondata_states)) magazine_icondata_cache_add(M) @@ -243,6 +243,6 @@ icon_keys += i ammo_states += ammo_state - magazine_icondata_keys["[M.type]"] = icon_keys - magazine_icondata_states["[M.type]"] = ammo_states + magazine_icondata_keys[M.type] = icon_keys + magazine_icondata_states[M.type] = ammo_states diff --git a/code/modules/projectiles/guns/magnetic/bore.dm b/code/modules/projectiles/guns/magnetic/bore.dm index 3d52f5737e..3cc05cc44b 100644 --- a/code/modules/projectiles/guns/magnetic/bore.dm +++ b/code/modules/projectiles/guns/magnetic/bore.dm @@ -82,7 +82,7 @@ return "It has [mat_storage] out of [max_mat_storage] units of [ammo_material] loaded." else return "It\'s out of [ammo_material]!" - + /obj/item/weapon/gun/magnetic/matfed/attackby(var/obj/item/thing, var/mob/user) if(removable_components) @@ -165,6 +165,7 @@ item_state = "bore" wielded_item_state = "bore-wielded" one_handed_penalty = 5 + fire_delay = 20 projectile_type = /obj/item/projectile/bullet/magnetic/bore diff --git a/code/modules/projectiles/guns/projectile/smartgun.dm b/code/modules/projectiles/guns/projectile/smartgun.dm new file mode 100644 index 0000000000..c74f1b6122 --- /dev/null +++ b/code/modules/projectiles/guns/projectile/smartgun.dm @@ -0,0 +1,150 @@ +/** + * The gun itself + */ +/obj/item/weapon/gun/projectile/smartgun + name = "\improper OP-15 'S.M.A.R.T.' Rifle" + desc = "Suppressive Manual Action Reciprocating Taser rifle. A modified version of an Armadyne heavy machine gun fitted to fire miniature shock-bolts." + description_info = "Alt-click to toggle the rifle's ready state. The rifle can't be unloaded when ready, and requires a few seconds to get ready before firing." + icon = 'icons/obj/guns/projectile/smartgun_item.dmi' + icon_state = "smartgun" + icon_override = 'icons/obj/guns/projectile/smartgun_mob.dmi' + item_state = "smartgun" + origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 6, TECH_BLUESPACE = 4) + w_class = ITEMSIZE_LARGE + matter = list(MAT_STEEL = 6000, MAT_DIAMOND = 2000, MAT_URANIUM = 2000) + recoil = 1 + projectile_type = /obj/item/projectile/bullet/smartgun //Only used for chameleon guns + slot_flags = SLOT_BACK + accuracy = -15 + one_handed_penalty = 50 + + caliber = "smartgun" + handle_casings = EJECT_CASINGS + load_method = MAGAZINE + + magazine_type = null //the type of magazine that the gun comes preloaded with + allowed_magazines = list(/obj/item/ammo_magazine/smartgun) //determines list of which magazines will fit in the gun + + var/closed = TRUE + var/cycling = FALSE + + var/static/mutable_appearance/mag_underlay + +/obj/item/weapon/gun/projectile/smartgun/make_worn_icon(body_type, slot_name, inhands, default_icon, default_layer, icon/clip_mask) + var/image/I = ..() + if(I) + I.pixel_x = -16 + return I + +/obj/item/weapon/gun/projectile/smartgun/loaded + magazine_type = /obj/item/ammo_magazine/smartgun + +/obj/item/weapon/gun/projectile/smartgun/Initialize() + . = ..() + if(!mag_underlay) + mag_underlay = mutable_appearance(icon, icon_state = "smartgun_mag") + +/obj/item/weapon/gun/projectile/smartgun/consume_next_projectile() + if(!closed) + return null + return ..() + +/obj/item/weapon/gun/projectile/smartgun/load_ammo(var/obj/item/A, mob/user) + if(closed) + to_chat(user, "[src] can't be loaded until you un-ready it. (Alt-click)") + return + return ..() + +/obj/item/weapon/gun/projectile/smartgun/unload_ammo(mob/user, var/allow_dump=0) + if(closed) + to_chat(user, "[src] can't be unloaded until you un-ready it. (Alt-click)") + return + return ..() + +/obj/item/weapon/gun/projectile/smartgun/AltClick(mob/user) + if(ishuman(user) && !user.incapacitated() && Adjacent(user)) + if(cycling) + to_chat(user, "[src] is still cycling!") + return + + cycling = TRUE + + if(closed) + icon_state = "[initial(icon_state)]_open" + playsound(src, 'sound/weapons/smartgunopen.ogg', 75, 0) + to_chat(user, "You unready [src] so that it can be reloaded.") + else + icon_state = "[initial(icon_state)]_closed" + playsound(src, 'sound/weapons/smartgunclose.ogg', 75, 0) + to_chat(user, "You ready [src] so that it can be fired.") + addtimer(CALLBACK(src, .proc/toggle_real_state), 2 SECONDS, TIMER_UNIQUE) + +/obj/item/weapon/gun/projectile/smartgun/proc/toggle_real_state() + cycling = FALSE + closed = !closed + +/obj/item/weapon/gun/projectile/smartgun/update_icon() + . = ..() + underlays = null + if(ammo_magazine) + underlays += mag_underlay + +/** + * The bullet that flies through the air + */ +/obj/item/projectile/bullet/smartgun + name = "smartgun rail" + icon_state = "smartgunproj" + icon = 'icons/obj/guns/projectile/smartgun_32.dmi' + fire_sound = 'sound/weapons/Gunshot4.ogg' // hmm + + // Slight damage and big stun + damage_type = BRUTE + damage = 10 + agony = 70 + check_armour = "bullet" + embed_chance = 0 // There's a separate sprite for this, but for now let's just not embed + accuracy = -30 // 2 turfs closer for the purpose of accuracy + + muzzle_type = /obj/effect/projectile/muzzle/lightning + +/obj/item/projectile/bullet/smartgun/launch_projectile(atom/target, target_zone, mob/user, params, angle_override, forced_spread) + . = ..() + if(ismob(target)) + Beam(get_turf(target), icon_state = "sniper_beam", time = 0.25 SECONDS, maxdistance = 15) + set_homing_target(target) + +/** + * The item of ammo that holds the bullet + */ +/obj/item/ammo_casing/smartgun + name = "smartgun rail" + desc = "A smartgun rail casing." + icon = 'icons/obj/guns/projectile/smartgun_32.dmi' + icon_state = "smartguncase" + randpixel = 10 + slot_flags = SLOT_BELT + w_class = ITEMSIZE_SMALL + + leaves_residue = FALSE + caliber = "smartgun" + projectile_type = /obj/item/projectile/bullet/smartgun + +/** + * The magazine that holds the items of ammo + */ +/obj/item/ammo_magazine/smartgun + name = "smartgun magazine" + desc = "A holder for smartgun rails for the S.M.A.R.T. rifle." + icon = 'icons/obj/guns/projectile/smartgun_32.dmi' + icon_state = "smartgunmag" + slot_flags = SLOT_BELT + matter = list(MAT_STEEL = 500) + w_class = ITEMSIZE_SMALL + + mag_type = MAGAZINE + caliber = "smartgun" + max_ammo = 5 + ammo_type = /obj/item/ammo_casing/smartgun + multiple_sprites = TRUE + diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index 42e59d0c98..ce4ac4f1b3 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -1,8 +1,8 @@ /obj/structure/reagent_dispensers name = "Dispenser" desc = "..." - icon = 'icons/obj/objects.dmi' - icon_state = "watertank" + icon = 'icons/obj/chemical_tanks.dmi' + icon_state = "tank" layer = TABLE_LAYER density = TRUE anchored = FALSE @@ -76,14 +76,15 @@ /obj/structure/reagent_dispensers/blob_act() qdel(src) +/* + * Tanks + */ - -//Dispensers +//Water /obj/structure/reagent_dispensers/watertank - name = "watertank" - desc = "A watertank." - icon = 'icons/obj/objects_vr.dmi' //VOREStation Edit - icon_state = "watertank" + name = "water tank" + desc = "A water tank." + icon_state = "water" amount_per_transfer_from_this = 10 /obj/structure/reagent_dispensers/watertank/Initialize() @@ -93,17 +94,17 @@ /obj/structure/reagent_dispensers/watertank/high name = "high-capacity water tank" desc = "A highly-pressurized water tank made to hold vast amounts of water.." - icon_state = "watertank_high" + icon_state = "water_high" /obj/structure/reagent_dispensers/watertank/high/Initialize() . = ..() reagents.add_reagent("water", 4000) +//Fuel /obj/structure/reagent_dispensers/fueltank - name = "fueltank" - desc = "A fueltank." - icon = 'icons/obj/objects_vr.dmi' //VOREStation Edit - icon_state = "weldtank" + name = "fuel tank" + desc = "A fuel tank." + icon_state = "fuel" amount_per_transfer_from_this = 10 var/modded = 0 var/obj/item/device/assembly_holder/rig = null @@ -112,30 +113,45 @@ . = ..() reagents.add_reagent("fuel",1000) -//VOREStation Add /obj/structure/reagent_dispensers/fueltank/high name = "high-capacity fuel tank" desc = "A highly-pressurized fuel tank made to hold vast amounts of fuel." - icon_state = "weldtank_high" + icon_state = "fuel_high" /obj/structure/reagent_dispensers/fueltank/high/Initialize() . = ..() reagents.add_reagent("fuel",4000) +//Foam /obj/structure/reagent_dispensers/foam - name = "foamtank" + name = "foam tank" desc = "A foam tank." - icon = 'icons/obj/objects_vr.dmi' - icon_state = "foamtank" + icon_state = "foam" amount_per_transfer_from_this = 10 /obj/structure/reagent_dispensers/foam/Initialize() . = ..() reagents.add_reagent("firefoam",1000) +//Helium3 +/obj/structure/reagent_dispensers/he3 + name = "/improper He3 tank" + desc = "A Helium3 tank." + icon_state = "he3" + amount_per_transfer_from_this = 10 + +/obj/structure/reagent_dispenser/he3/Initialize() + ..() + reagents.add_reagent("helium3",1000) + +/* + * Misc + */ + /obj/structure/reagent_dispensers/fueltank/barrel name = "hazardous barrel" desc = "An open-topped barrel full of nasty-looking liquid." + icon = 'icons/obj/objects_vr.dmi' icon_state = "barrel" modded = TRUE @@ -433,7 +449,7 @@ /obj/structure/reagent_dispensers/acid/Initialize() . = ..() reagents.add_reagent("sacid", 1000) - + //Cooking oil refill tank /obj/structure/reagent_dispensers/cookingoil name = "cooking oil tank" @@ -457,14 +473,3 @@ reagents.splash_area(get_turf(src), 3) visible_message(span("danger", "The [src] bursts open, spreading oil all over the area.")) qdel(src) - -/obj/structure/reagent_dispensers/he3 - name = "fueltank" - desc = "A fueltank." - icon = 'icons/obj/objects.dmi' - icon_state = "weldtank" - amount_per_transfer_from_this = 10 - -/obj/structure/reagent_dispenser/he3/Initialize() - ..() - reagents.add_reagent("helium3",1000) diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm index 8814bf518e..bd56670ec5 100644 --- a/code/modules/reagents/reactions/instant/drinks.dm +++ b/code/modules/reagents/reactions/instant/drinks.dm @@ -399,7 +399,7 @@ name = "Singulo" id = "singulo" result = "singulo" - required_reagents = list("vodka" = 5, "radium" = 1, "wine" = 5) + required_reagents = list("vodka" = 5, "radium" = 1, "redwine" = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/alliescocktail @@ -505,14 +505,14 @@ name = "Acid Spit" id = "acidspit" result = "acidspit" - required_reagents = list("sacid" = 1, "wine" = 5) + required_reagents = list("sacid" = 1, "redwine" = 5) result_amount = 6 /decl/chemical_reaction/instant/drinks/amasec name = "Amasec" id = "amasec" result = "amasec" - required_reagents = list("iron" = 1, "wine" = 5, "vodka" = 5) + required_reagents = list("iron" = 1, "redwine" = 5, "vodka" = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/changelingsting @@ -661,7 +661,7 @@ name = "Melon Spritzer" id = "melonspritzer" result = "melonspritzer" - required_reagents = list("watermelonjuice" = 2, "wine" = 2, "applejuice" = 1, "limejuice" = 1) + required_reagents = list("watermelonjuice" = 2, "redwine" = 2, "applejuice" = 1, "limejuice" = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/fauxfizz @@ -915,7 +915,7 @@ name = "Wine brandy" id = "winebrandy" result = "winebrandy" - required_reagents = list("wine" = 10) + required_reagents = list("redwine" = 10) catalysts = list("enzyme" = 10) //10u enzyme so it requires more than is usually added. Stops overlap with wine recipe result_amount = 5 @@ -937,7 +937,7 @@ name = "Vesper" id = "vesper" result = "vesper" - required_reagents = list("gin" = 3, "vodka" = 1, "wine" = 1) + required_reagents = list("gin" = 3, "vodka" = 1, "redwine" = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/rotgut diff --git a/code/modules/reagents/reactions/instant/drinks_vr.dm b/code/modules/reagents/reactions/instant/drinks_vr.dm index f234184d86..5f32c7e5f8 100644 --- a/code/modules/reagents/reactions/instant/drinks_vr.dm +++ b/code/modules/reagents/reactions/instant/drinks_vr.dm @@ -60,7 +60,7 @@ name = "Negroni Sbagliato" id = "sbagliato" result = "sbagliato" - required_reagents = list("wine" = 1, "vermouth" = 1, "sodawater" =1) + required_reagents = list("redwine" = 1, "vermouth" = 1, "sodawater" =1) result_amount = 3 /decl/chemical_reaction/instant/drinks/italiancrisis @@ -187,7 +187,7 @@ name = "New York Sour" id = "newyorksour" result = "newyorksour" - required_reagents = list("whiskeysour" = 3, "wine" = 2, "egg" = 1) + required_reagents = list("whiskeysour" = 3, "redwine" = 2, "egg" = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/mudslide diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm index 4eef9c3492..c061368419 100644 --- a/code/modules/reagents/reactions/instant/instant_vr.dm +++ b/code/modules/reagents/reactions/instant/instant_vr.dm @@ -209,7 +209,6 @@ /decl/chemical_reaction/instant/slime_food/on_reaction(var/datum/reagents/holder) var/list/borks = subtypesof(/obj/item/weapon/reagent_containers/food/snacks) - playsound(holder.my_atom, 'sound/effects/phasein.ogg', 100, 1) @@ -416,7 +415,6 @@ blocked += typesof(/mob/living/simple_mob/construct) //Should only exist blocked += typesof(/mob/living/simple_mob/vore/demon) //as player-controlled blocked += typesof(/mob/living/simple_mob/shadekin) //and/or event things - blocked += typesof(/mob/living/simple_mob/horror) var/list/voremobs = typesof(mob_path) - blocked // list of possible hostile mobs playsound(holder.my_atom, 'sound/effects/phasein.ogg', 100, 1) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index da3e3c64de..e2042a9b9d 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -523,6 +523,15 @@ H.vent_gas(loc) qdel(H) +/obj/machinery/disposal/hitby(atom/movable/AM) + . = ..() + if(istype(AM, /obj/item) && !istype(AM, /obj/item/projectile)) + if(prob(75)) + AM.forceMove(src) + visible_message("\The [AM] lands in \the [src].") + else + visible_message("\The [AM] bounces off of \the [src]'s rim!") + /obj/machinery/disposal/CanPass(atom/movable/mover, turf/target) if(istype(mover, /obj/item/projectile)) return 1 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/code/modules/tables/rack_vr.dm b/code/modules/tables/rack_vr.dm index 137dc32fd0..af422bfb0a 100644 --- a/code/modules/tables/rack_vr.dm +++ b/code/modules/tables/rack_vr.dm @@ -1,3 +1,6 @@ +/obj/structure/table/rack + icon = 'icons/obj/objects_vr.dmi' + /obj/structure/table/rack/steel color = "#666666" @@ -8,7 +11,6 @@ /obj/structure/table/rack/shelf name = "shelving" desc = "Some nice metal shelves." - icon = 'icons/obj/objects_vr.dmi' icon_state = "shelf" /obj/structure/table/rack/shelf/steel @@ -17,3 +19,16 @@ /obj/structure/table/rack/shelf/steel/New() material = get_material_by_name(MAT_STEEL) ..() + +// SOMEONE should add cool overlay stuff to this +/obj/structure/table/rack/gun_rack + name = "gun rack" + desc = "Seems like you could prop up some rifles here." + icon_state = "gunrack" + +/obj/structure/table/rack/gun_rack/steel + color = "#666666" + +/obj/structure/table/rack/gun_rack/steel/New() + material = get_material_by_name(MAT_STEEL) + ..() \ No newline at end of file diff --git a/code/modules/ventcrawl/ventcrawl_atmospherics.dm b/code/modules/ventcrawl/ventcrawl_atmospherics.dm index 3ae52380d6..2c2cb6ca9d 100644 --- a/code/modules/ventcrawl/ventcrawl_atmospherics.dm +++ b/code/modules/ventcrawl/ventcrawl_atmospherics.dm @@ -24,7 +24,7 @@ . = ..() /obj/machinery/atmospherics/relaymove(mob/living/user, direction) - if(user.loc != src || !(direction & initialize_directions)) //can't go in a way we aren't connecting to + if(user.loc != src || !(direction & initialize_directions) || !IS_CARDINAL(direction)) //can't go in a way we aren't connecting to return ventcrawl_to(user,findConnecting(direction, user.ventcrawl_layer),direction) diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index a8aea6c376..d62866118c 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -384,8 +384,8 @@ formatted_message = replacetext(raw_message, "%belly", lowertext(name)) formatted_message = replacetext(formatted_message, "%pred", owner) formatted_message = replacetext(formatted_message, "%prey", english_list(contents)) - formatted_message = replacetext(formatted_message, "%count", contents.len) formatted_message = replacetext(formatted_message, "%countprey", living_count) + formatted_message = replacetext(formatted_message, "%count", contents.len) return("[formatted_message]") @@ -656,14 +656,14 @@ struggle_outer_message = replacetext(struggle_outer_message, "%pred", owner) struggle_outer_message = replacetext(struggle_outer_message, "%prey", R) struggle_outer_message = replacetext(struggle_outer_message, "%belly", lowertext(name)) - struggle_outer_message = replacetext(struggle_outer_message, "%count", contents.len) struggle_outer_message = replacetext(struggle_outer_message, "%countprey", living_count) + struggle_outer_message = replacetext(struggle_outer_message, "%count", contents.len) struggle_user_message = replacetext(struggle_user_message, "%pred", owner) struggle_user_message = replacetext(struggle_user_message, "%prey", R) struggle_user_message = replacetext(struggle_user_message, "%belly", lowertext(name)) - struggle_user_message = replacetext(struggle_user_message, "%count", contents.len) struggle_user_message = replacetext(struggle_user_message, "%countprey", living_count) + struggle_user_message = replacetext(struggle_user_message, "%count", contents.len) struggle_outer_message = "[struggle_outer_message]" struggle_user_message = "[struggle_user_message]" diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 41b0bfae1e..15099c56f5 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -121,8 +121,8 @@ formatted_message = replacetext(raw_message, "%belly", lowertext(name)) formatted_message = replacetext(formatted_message, "%pred", owner) formatted_message = replacetext(formatted_message, "%prey", english_list(contents)) - formatted_message = replacetext(formatted_message, "%count", contents.len) formatted_message = replacetext(formatted_message, "%countprey", living_count) + formatted_message = replacetext(formatted_message, "%count", contents.len) to_chat(M, "[formatted_message]") @@ -243,14 +243,14 @@ digest_alert_owner = replacetext(digest_alert_owner, "%pred", owner) digest_alert_owner = replacetext(digest_alert_owner, "%prey", M) digest_alert_owner = replacetext(digest_alert_owner, "%belly", lowertext(name)) - digest_alert_owner = replacetext(digest_alert_owner, "%count", contents.len) digest_alert_owner = replacetext(digest_alert_owner, "%countprey", living_count) + digest_alert_owner = replacetext(digest_alert_owner, "%count", contents.len) digest_alert_prey = replacetext(digest_alert_prey, "%pred", owner) digest_alert_prey = replacetext(digest_alert_prey, "%prey", M) digest_alert_prey = replacetext(digest_alert_prey, "%belly", lowertext(name)) - digest_alert_prey = replacetext(digest_alert_prey, "%count", contents.len) digest_alert_prey = replacetext(digest_alert_prey, "%countprey", living_count) + digest_alert_prey = replacetext(digest_alert_prey, "%count", contents.len) //Send messages to_chat(owner, "[digest_alert_owner]") diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 80ce37c5d5..23dd3eea55 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -936,6 +936,8 @@ screen_icon = new() RegisterSignal(screen_icon, COMSIG_CLICK, .proc/vore_panel_click) screen_icon.icon = HUD.ui_style + screen_icon.color = HUD.ui_color + screen_icon.alpha = HUD.ui_alpha LAZYADD(HUD.other_important, screen_icon) user.client?.screen += screen_icon diff --git a/code/unit_tests/mob_tests.dm b/code/unit_tests/mob_tests.dm index 0c74449d2d..868d93903e 100644 --- a/code/unit_tests/mob_tests.dm +++ b/code/unit_tests/mob_tests.dm @@ -7,7 +7,21 @@ async = 1 /datum/unit_test/space_suffocation/start_test() - var/turf/space/T = locate() + // Get an empty space level instead of just picking a random space turf + var/empty_z = using_map.get_empty_zlevel() + if(!empty_z) + fail("Unable to get empty z-level for suffocation test!") + return 1 + + // Away from map edges so they don't transit while we're testing + var/mid_w = round(world.maxx*0.5) + var/mid_h = round(world.maxy*0.5) + + var/turf/T = locate(mid_w, mid_h, empty_z) + + if(!T) + fail("Unable to find middle turf for suffocation test!") + return 1 H = new(T) startOxyloss = H.getOxyLoss() diff --git a/code/unit_tests/vore_tests_vr.dm b/code/unit_tests/vore_tests_vr.dm index 7d060b1ca4..2bcfcc13fa 100644 --- a/code/unit_tests/vore_tests_vr.dm +++ b/code/unit_tests/vore_tests_vr.dm @@ -91,9 +91,20 @@ fail("[pred.vore_selected].nom_mob([prey]) did not put prey inside [pred]") return 1 else - var/turf/T = locate(/turf/space) + // Get an empty space level instead of just picking a random space turf + var/empty_z = using_map.get_empty_zlevel() + if(!empty_z) + fail("Unable to get empty z-level for vore space protection test!") + return 1 + + // Away from map edges so they don't transit while we're testing + var/mid_w = round(world.maxx*0.5) + var/mid_h = round(world.maxy*0.5) + + var/turf/T = locate(mid_w, mid_h, empty_z) + if(!T) - fail("could not find a space turf for testing") + fail("Unable to get turf for vore space protection test!") return 1 else pred.forceMove(T) diff --git a/icons/_nanomaps/tether_nanomap_z1.png b/icons/_nanomaps/tether_nanomap_z1.png index 860af5469a..b05aa25693 100644 Binary files a/icons/_nanomaps/tether_nanomap_z1.png and b/icons/_nanomaps/tether_nanomap_z1.png differ diff --git a/icons/_nanomaps/tether_nanomap_z3.png b/icons/_nanomaps/tether_nanomap_z3.png index 6dd5c295e7..f06a01fdd6 100644 Binary files a/icons/_nanomaps/tether_nanomap_z3.png and b/icons/_nanomaps/tether_nanomap_z3.png differ diff --git a/icons/_nanomaps/tether_nanomap_z5.png b/icons/_nanomaps/tether_nanomap_z5.png index 385892f83e..f86361257a 100644 Binary files a/icons/_nanomaps/tether_nanomap_z5.png and b/icons/_nanomaps/tether_nanomap_z5.png differ diff --git a/icons/inventory/accessory/item_vr.dmi b/icons/inventory/accessory/item_vr.dmi index fdb8608648..f4b317aba9 100644 Binary files a/icons/inventory/accessory/item_vr.dmi and b/icons/inventory/accessory/item_vr.dmi differ diff --git a/icons/inventory/accessory/mob_vr.dmi b/icons/inventory/accessory/mob_vr.dmi index c5e7908d71..834ba6f831 100644 Binary files a/icons/inventory/accessory/mob_vr.dmi and b/icons/inventory/accessory/mob_vr.dmi differ diff --git a/icons/inventory/accessory/mob_vr_teshari.dmi b/icons/inventory/accessory/mob_vr_teshari.dmi index fce61f2bb8..45e62b9325 100644 Binary files a/icons/inventory/accessory/mob_vr_teshari.dmi and b/icons/inventory/accessory/mob_vr_teshari.dmi differ diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index 82ae304307..602ab0bcd2 100644 Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index f5c48376be..6d959d86d8 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/mob/items/lefthand_suits.dmi b/icons/mob/items/lefthand_suits.dmi index aab06d09ee..fd2c56a4c5 100644 Binary files a/icons/mob/items/lefthand_suits.dmi and b/icons/mob/items/lefthand_suits.dmi differ diff --git a/icons/mob/items/righthand_suits.dmi b/icons/mob/items/righthand_suits.dmi index 6afe96f806..d710deb759 100644 Binary files a/icons/mob/items/righthand_suits.dmi and b/icons/mob/items/righthand_suits.dmi differ diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi index a28378eeef..3157dea03a 100644 Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ diff --git a/icons/mob/screen_full_vore.dmi b/icons/mob/screen_full_vore.dmi index 4d89bd8204..b738cae800 100644 Binary files a/icons/mob/screen_full_vore.dmi and b/icons/mob/screen_full_vore.dmi differ diff --git a/icons/obj/64x64.dmi b/icons/obj/64x64.dmi new file mode 100644 index 0000000000..db555529a7 Binary files /dev/null and b/icons/obj/64x64.dmi differ diff --git a/icons/obj/casino.dmi b/icons/obj/casino.dmi new file mode 100644 index 0000000000..17405361e2 Binary files /dev/null and b/icons/obj/casino.dmi differ diff --git a/icons/obj/chemical_tanks.dmi b/icons/obj/chemical_tanks.dmi new file mode 100644 index 0000000000..2775483204 Binary files /dev/null and b/icons/obj/chemical_tanks.dmi differ diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi index 14f7fba854..b8b832471d 100644 Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ diff --git a/icons/obj/closets/bases/cabinet.dmi b/icons/obj/closets/bases/cabinet.dmi index 236b164ca6..a8c0261900 100644 Binary files a/icons/obj/closets/bases/cabinet.dmi and b/icons/obj/closets/bases/cabinet.dmi differ diff --git a/icons/obj/closets/bases/cart.dmi b/icons/obj/closets/bases/cart.dmi index 852e539b4d..da1b28500b 100644 Binary files a/icons/obj/closets/bases/cart.dmi and b/icons/obj/closets/bases/cart.dmi differ diff --git a/icons/obj/closets/bases/closet.dmi b/icons/obj/closets/bases/closet.dmi index 551435629e..2753b92b91 100644 Binary files a/icons/obj/closets/bases/closet.dmi and b/icons/obj/closets/bases/closet.dmi differ diff --git a/icons/obj/closets/bases/crate.dmi b/icons/obj/closets/bases/crate.dmi index 83500acb3b..d83ac8da7b 100644 Binary files a/icons/obj/closets/bases/crate.dmi and b/icons/obj/closets/bases/crate.dmi differ diff --git a/icons/obj/closets/bases/large_crate.dmi b/icons/obj/closets/bases/large_crate.dmi index fd3400ed72..a8cb85d5ce 100644 Binary files a/icons/obj/closets/bases/large_crate.dmi and b/icons/obj/closets/bases/large_crate.dmi differ diff --git a/icons/obj/closets/decals/closet.dmi b/icons/obj/closets/decals/closet.dmi index a7bb7591b1..97e24b4f50 100644 Binary files a/icons/obj/closets/decals/closet.dmi and b/icons/obj/closets/decals/closet.dmi differ diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi index 165cc44179..5b58a84313 100644 Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ diff --git a/icons/obj/computer_vr.dmi b/icons/obj/computer_vr.dmi index 34716d288c..c75bc3a7b5 100644 Binary files a/icons/obj/computer_vr.dmi and b/icons/obj/computer_vr.dmi differ diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index f229285fe7..9e2f5f10a4 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ diff --git a/icons/obj/guns/projectile/smartgun_32.dmi b/icons/obj/guns/projectile/smartgun_32.dmi new file mode 100644 index 0000000000..82a8e765c4 Binary files /dev/null and b/icons/obj/guns/projectile/smartgun_32.dmi differ diff --git a/icons/obj/guns/projectile/smartgun_item.dmi b/icons/obj/guns/projectile/smartgun_item.dmi new file mode 100644 index 0000000000..69d8095ba5 Binary files /dev/null and b/icons/obj/guns/projectile/smartgun_item.dmi differ diff --git a/icons/obj/guns/projectile/smartgun_mob.dmi b/icons/obj/guns/projectile/smartgun_mob.dmi new file mode 100644 index 0000000000..de816c33be Binary files /dev/null and b/icons/obj/guns/projectile/smartgun_mob.dmi differ diff --git a/icons/obj/jukebox.dmi b/icons/obj/jukebox.dmi index 1ac739dffc..439d460b81 100644 Binary files a/icons/obj/jukebox.dmi and b/icons/obj/jukebox.dmi differ diff --git a/icons/obj/machines/field_generator.dmi b/icons/obj/machines/field_generator.dmi index fcb083f846..45aa7d209c 100644 Binary files a/icons/obj/machines/field_generator.dmi and b/icons/obj/machines/field_generator.dmi differ diff --git a/icons/obj/modular_console.dmi b/icons/obj/modular_console.dmi index 125711410d..60c2c0f25b 100644 Binary files a/icons/obj/modular_console.dmi and b/icons/obj/modular_console.dmi differ diff --git a/icons/obj/objects_vr.dmi b/icons/obj/objects_vr.dmi index 19c7947b4b..467297775f 100644 Binary files a/icons/obj/objects_vr.dmi and b/icons/obj/objects_vr.dmi differ diff --git a/icons/obj/pipes/disposal.dmi b/icons/obj/pipes/disposal.dmi index 21ecaf5280..11be7044bc 100644 Binary files a/icons/obj/pipes/disposal.dmi and b/icons/obj/pipes/disposal.dmi differ diff --git a/icons/obj/playing_cards.dmi b/icons/obj/playing_cards.dmi index 04239be49d..04e7af96fe 100644 Binary files a/icons/obj/playing_cards.dmi and b/icons/obj/playing_cards.dmi differ diff --git a/icons/obj/salvageable.dmi b/icons/obj/salvageable.dmi index ea2004324a..f2e0aaed20 100644 Binary files a/icons/obj/salvageable.dmi and b/icons/obj/salvageable.dmi differ diff --git a/icons/obj/sofas.dmi b/icons/obj/sofas.dmi index 21de5449ea..9864a923ac 100644 Binary files a/icons/obj/sofas.dmi and b/icons/obj/sofas.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index cfd31736e9..aaf1aa1453 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.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/exploration.dmi b/icons/turf/fancy_shuttles/exploration.dmi new file mode 100644 index 0000000000..5da4ff378e Binary files /dev/null and b/icons/turf/fancy_shuttles/exploration.dmi differ diff --git a/icons/turf/fancy_shuttles/exploration_preview.dmi b/icons/turf/fancy_shuttles/exploration_preview.dmi new file mode 100644 index 0000000000..2ed3af4069 Binary files /dev/null and b/icons/turf/fancy_shuttles/exploration_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/medical.dmi b/icons/turf/fancy_shuttles/medical.dmi new file mode 100644 index 0000000000..dc1833cc55 Binary files /dev/null and b/icons/turf/fancy_shuttles/medical.dmi differ diff --git a/icons/turf/fancy_shuttles/medical_preview.dmi b/icons/turf/fancy_shuttles/medical_preview.dmi new file mode 100644 index 0000000000..1b688eb8f0 Binary files /dev/null and b/icons/turf/fancy_shuttles/medical_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/security.dmi b/icons/turf/fancy_shuttles/security.dmi new file mode 100644 index 0000000000..70fdbfbc65 Binary files /dev/null and b/icons/turf/fancy_shuttles/security.dmi differ diff --git a/icons/turf/fancy_shuttles/security_preview.dmi b/icons/turf/fancy_shuttles/security_preview.dmi new file mode 100644 index 0000000000..d0017da2a4 Binary files /dev/null and b/icons/turf/fancy_shuttles/security_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/aro2.dm b/maps/offmap_vr/om_ships/aro2.dm index d31b8f2ca1..d42ef4d6bb 100644 --- a/maps/offmap_vr/om_ships/aro2.dm +++ b/maps/offmap_vr/om_ships/aro2.dm @@ -49,7 +49,7 @@ desc = "A pool of inky-black fluid that shimmers oddly in the light if hit just right." description_info = "Surfluid is KHI's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy." color = "#222222" - outdoors = FALSE + outdoors = OUTDOORS_NO reagent_type = "liquid_protean" // The 'ship' diff --git a/maps/offmap_vr/om_ships/aro3.dm b/maps/offmap_vr/om_ships/aro3.dm index 803f5c1625..791a53a642 100644 --- a/maps/offmap_vr/om_ships/aro3.dm +++ b/maps/offmap_vr/om_ships/aro3.dm @@ -66,13 +66,14 @@ 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" desc = "A pool of inky-black fluid that shimmers oddly in the light if hit just right." description_info = "Surfluid is KHI's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy." color = "#222222" - outdoors = FALSE + outdoors = OUTDOORS_NO reagent_type = "liquid_protean" // The 'ship' @@ -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/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm index bdb401a681..1c040f2c16 100644 --- a/maps/offmap_vr/talon/talon_v2.dmm +++ b/maps/offmap_vr/talon/talon_v2.dmm @@ -165,7 +165,6 @@ /area/talon_v2/engineering/generators) "aq" = ( /obj/machinery/recharge_station, -/obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering/generators) "ar" = ( @@ -5645,12 +5644,18 @@ /turf/simulated/floor/tiled/techfloor, /area/talon_v2/crew_quarters/cap_room) "so" = ( -/obj/item/weapon/storage/dicecup/loaded, +/obj/item/weapon/storage/dicecup/loaded{ + pixel_x = 7; + pixel_y = 11 + }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, /obj/effect/floor_decal/corner/black/diagonal, /obj/structure/table/marble, +/obj/item/weapon/deck/cards{ + pixel_x = 3 + }, /turf/simulated/floor/tiled/white, /area/talon_v2/crew_quarters/bar) "ss" = ( @@ -7128,7 +7133,6 @@ /area/talon_v2/central_hallway/fore) "xq" = ( /obj/effect/floor_decal/corner/black/diagonal, -/obj/item/weapon/deck/cards, /obj/structure/table/marble, /turf/simulated/floor/tiled/white, /area/talon_v2/crew_quarters/bar) @@ -8587,9 +8591,6 @@ }, /turf/simulated/floor/plating, /area/talon_v2/engineering) -"Ct" = ( -/turf/simulated/floor/plating, -/area/talon_v2/crew_quarters/bar) "Cw" = ( /obj/structure/bed/chair/bay/chair{ dir = 1 @@ -26215,7 +26216,7 @@ JO JO qc qI -Ct +oh DU Hl Hl diff --git a/maps/southern_cross/events/wildlife_encounter.dm b/maps/southern_cross/events/wildlife_encounter.dm index 0a045f9f17..57fde54ef1 100644 --- a/maps/southern_cross/events/wildlife_encounter.dm +++ b/maps/southern_cross/events/wildlife_encounter.dm @@ -24,7 +24,9 @@ // continue // Not on the right z-level. if(L.stat) continue // Don't want dead people. - if(istype(get_turf(L), /turf/simulated/floor/outdoors) && istype(get_area(L),/area/surface/outside/wilderness)) + var/turf/T = get_turf(L) + var/area/A = get_area(L) + if(T?.is_outdoors() && istype(A, /area/tether/outpost/exploration_plains)) // VOREStation Edit potential_victims += L if(potential_victims.len) diff --git a/maps/southern_cross/southern_cross_areas.dm b/maps/southern_cross/southern_cross_areas.dm index 94d357763b..4d9c76f95f 100644 --- a/maps/southern_cross/southern_cross_areas.dm +++ b/maps/southern_cross/southern_cross_areas.dm @@ -61,6 +61,7 @@ ambience = AMBIENCE_SIF always_unpowered = TRUE flags = AREA_FLAG_IS_NOT_PERSISTENT + outdoors = OUTDOORS_YES // The area near the outpost, so POIs don't show up right next to the outpost. /area/surface/outside/plains/outpost @@ -163,10 +164,12 @@ /area/surface/outpost/mining_main name = "North Mining Outpost" icon_state = "outpost_mine_main" + outdoors = OUTDOORS_NO /area/surface/outpost/mining_main/exterior name = "North Mining Outpost Exterior" icon_state = "outpost_mine_main" + outdoors = OUTDOORS_YES /area/surface/outpost/mining_main/crew_area name = "North Mining Crew Area" @@ -205,6 +208,7 @@ /area/surface/outpost/research icon_state = "outpost_research" + outdoors = OUTDOORS_NO /area/surface/outpost/research/xenoresearch name = "\improper Xenoresearch" @@ -291,6 +295,7 @@ /area/surface/outpost/main name = "\improper Main Outpost" icon_state = "Sleep" + outdoors = OUTDOORS_NO /area/surface/outpost/main/gen_room name = "\improper Main Outpost SMES" @@ -371,6 +376,7 @@ /area/outpost/mining_station icon_state = "outpost_mine_main" name = "Mining Station" + outdoors = OUTDOORS_NO /area/outpost/mining_station/dorms name = "Mining Station Dormitory" diff --git a/maps/southern_cross/turfs/outdoors.dm b/maps/southern_cross/turfs/outdoors.dm index 167b1256f5..7f7b39fc4a 100644 --- a/maps/southern_cross/turfs/outdoors.dm +++ b/maps/southern_cross/turfs/outdoors.dm @@ -24,19 +24,19 @@ oxygen = MOLES_O2SIF nitrogen = MOLES_N2SIF temperature = TEMPERATURE_SIF - outdoors = TRUE + outdoors = OUTDOORS_YES /turf/simulated/floor/tiled/steel/sif/planetuse oxygen = MOLES_O2SIF nitrogen = MOLES_N2SIF temperature = TEMPERATURE_SIF - outdoors = TRUE + outdoors = OUTDOORS_YES /turf/simulated/floor/plating/sif/planetuse oxygen = MOLES_O2SIF nitrogen = MOLES_N2SIF temperature = TEMPERATURE_SIF - outdoors = TRUE + outdoors = OUTDOORS_YES /turf/simulated/floor/outdoors/snow/sif/planetuse oxygen = MOLES_O2SIF diff --git a/maps/submaps/admin_use_vr/guttersite.dm b/maps/submaps/admin_use_vr/guttersite.dm deleted file mode 100644 index e83532c429..0000000000 --- a/maps/submaps/admin_use_vr/guttersite.dm +++ /dev/null @@ -1,85 +0,0 @@ -// -- Datums -- // - -/obj/effect/overmap/visitable/sector/guttersite - name = "Gutter Site" - desc = "A shoddy asteroid installation." - scanner_desc = @{"[i]Transponder[/i]: Strong Comms Signal -[b]Notice[/b]: WARNING! KEEP OUT! MEMBERS ONLY!"} - icon_state = "os_fortress_r" - known = FALSE - initial_generic_waypoints = list("guttersite_lshuttle", "guttersite_sshuttle", "guttersite_mshuttle") - -// -- Objs -- // -/obj/effect/shuttle_landmark/premade/guttersite/sshuttle - name = "Gutter - Small Shuttle" - landmark_tag = "guttersite_sshuttle" - -/obj/effect/shuttle_landmark/premade/guttersite/lshuttle - name = "Gutter - Large Shuttle" - landmark_tag = "guttersite_lshuttle" - -/obj/effect/shuttle_landmark/premade/guttersite/mshuttle - name = "Gutter - Medi Shuttle" - landmark_tag = "guttersite_mshuttle" - -//This does nothing right now, but is framework if we do POIs for this place -/obj/away_mission_init/guttersite - name = "away mission initializer - guttersite" - -/obj/away_mission_init/guttersite/Initialize() - initialized = TRUE - return INITIALIZE_HINT_QDEL - -/area/tether_away/guttersite - name = "Away Mission - guttersite" - icon = 'icons/turf/areas_vr.dmi' - icon_state = "dark" - -/area/tether_away/guttersite/explored - icon_state = "debrisexplored" - -/area/tether_away/guttersite/unexplored - icon_state = "debrisunexplored" - -/area/tether_away/guttersite/derelict - icon_state = "debrisexplored" - forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg') - -/area/tether_away/guttersite/engines - name = "Gutter - Gutter Engineering" - -/area/tether_away/guttersite/security - name = "Gutter - Gutter Security and Holding" - -/area/tether_away/guttersite/docking - name = "Gutter - Gutter Docks" - -/area/tether_away/guttersite/office - name = "Gutter - Gutter Offices" - -/area/tether_away/guttersite/atmos - name = "Gutter - Gutter Atmospherics" - -/area/tether_away/guttersite/maint - name = "Gutter - Gutter Maintenance" - -/area/tether_away/guttersite/vault - name = "Gutter - Gutter Vault" - -/area/tether_away/guttersite/bridge - name = "Gutter - Gutter Bridge" - -/area/tether_away/guttersite/walkway - name = "Gutter - Gutter Walkway" - -/area/tether_away/guttersite/medbay - name = "Gutter - Gutter Medbay" - -/area/tether_away/guttersite/commons - name = "Gutter - Gutter Commons" - -/area/tether_away/guttersite/storage - name = "Gutter - Gutter Tool Storage" - -/area/tether_away/guttersite/teleporter - name = "Gutter - Gutter Teleporter" diff --git a/maps/submaps/admin_use_vr/guttersite.dmm b/maps/submaps/admin_use_vr/guttersite.dmm deleted file mode 100644 index 4e485330e9..0000000000 --- a/maps/submaps/admin_use_vr/guttersite.dmm +++ /dev/null @@ -1,25460 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aa" = ( -/turf/space, -/area/tether_away/guttersite/unexplored) -"ab" = ( -/turf/simulated/mineral/floor/vacuum, -/area/space) -"ac" = ( -/turf/simulated/mineral/cave, -/area/space) -"ad" = ( -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"ae" = ( -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/teleporter) -"af" = ( -/obj/structure/lattice, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"ag" = ( -/turf/simulated/mineral/cave, -/area/tether_away/guttersite/unexplored) -"ah" = ( -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/teleporter) -"ai" = ( -/obj/structure/lattice, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/teleporter) -"aj" = ( -/turf/simulated/mineral/cave, -/area/tether_away/guttersite/teleporter) -"ak" = ( -/obj/structure/lattice, -/turf/space, -/area/tether_away/guttersite/unexplored) -"al" = ( -/obj/structure/frame/computer{ - dir = 4 - }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"am" = ( -/obj/machinery/teleport/station, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"an" = ( -/obj/machinery/teleport/hub, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"ao" = ( -/obj/item/weapon/material/shard{ - icon_state = "medium" - }, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"ap" = ( -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"aq" = ( -/obj/structure/cable, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"ar" = ( -/obj/structure/table/rack, -/obj/item/clothing/gloves/yellow, -/obj/item/weapon/storage/toolbox/mechanical, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"as" = ( -/obj/structure/girder, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"at" = ( -/obj/item/weapon/cell, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"au" = ( -/obj/structure/grille/broken, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"av" = ( -/obj/structure/table, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"aw" = ( -/obj/structure/closet, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"ax" = ( -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/storage) -"ay" = ( -/obj/structure/boulder, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"az" = ( -/obj/structure/inflatable/door, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"aA" = ( -/obj/structure/bonfire/sifwood, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"aB" = ( -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/maint) -"aC" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"aD" = ( -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"aE" = ( -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/maint) -"aF" = ( -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/engines) -"aG" = ( -/turf/simulated/wall, -/area/tether_away/guttersite/engines) -"aH" = ( -/obj/machinery/door/airlock/multi_tile/glass, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/tether_away/guttersite/engines) -"aI" = ( -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/tether_away/guttersite/engines) -"aJ" = ( -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/engines) -"aK" = ( -/obj/machinery/light_switch{ - on = 0; - pixel_y = 26 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/engines) -"aL" = ( -/obj/structure/loot_pile/surface/bones, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"aM" = ( -/obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/electrical, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/engines) -"aN" = ( -/obj/structure/sign/poster{ - dir = 1; - icon_state = "" - }, -/turf/simulated/wall, -/area/tether_away/guttersite/maint) -"aO" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = 23 - }, -/obj/structure/table/steel, -/obj/fiftyspawner/glass, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/engines) -"aP" = ( -/turf/simulated/wall, -/area/tether_away/guttersite/maint) -"aQ" = ( -/turf/simulated/wall, -/area/tether_away/guttersite/atmos) -"aR" = ( -/obj/machinery/door/airlock/multi_tile/glass, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/tether_away/guttersite/atmos) -"aS" = ( -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/tether_away/guttersite/atmos) -"aT" = ( -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/atmos) -"aU" = ( -/obj/structure/table/steel, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/fiftyspawner/steel, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/engines) -"aV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/maint) -"aW" = ( -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/engines) -"aX" = ( -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/engines) -"aY" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/engines) -"aZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark, -/area/tether_away/guttersite/maint) -"ba" = ( -/obj/item/weapon/circuitboard/teleporter, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"bb" = ( -/obj/structure/barricade, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/unexplored) -"bc" = ( -/obj/structure/cable/cyan{ - icon_state = "0-4" - }, -/obj/machinery/power/rtg/fake_gen, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/engines) -"bd" = ( -/obj/machinery/power/terminal{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/cyan, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/engines) -"be" = ( -/obj/structure/table/steel, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/fiftyspawner/rods, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/atmos) -"bf" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = 23 - }, -/obj/structure/table/steel, -/obj/item/weapon/storage/toolbox/mechanical, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/atmos) -"bg" = ( -/obj/structure/table/steel, -/obj/fiftyspawner/wood, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/atmos) -"bh" = ( -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/atmos) -"bi" = ( -/obj/machinery/light_switch{ - on = 0; - pixel_y = 26 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/atmos) -"bj" = ( -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"bk" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/engines) -"bl" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 4; - dir = 4; - icon_state = "2-8" - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/engines) -"bm" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/engines) -"bn" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/tether_away/guttersite/engines) -"bo" = ( -/turf/simulated/floor/tiled/eris/dark, -/area/tether_away/guttersite/maint) -"bp" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/atmos) -"bq" = ( -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"br" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 4 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"bs" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 4 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"bt" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"bu" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/maint) -"bv" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark, -/area/tether_away/guttersite/maint) -"bw" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/cyan{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/eris/dark, -/area/tether_away/guttersite/maint) -"bx" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/tether_away/guttersite/maint) -"by" = ( -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/atmos) -"bz" = ( -/obj/machinery/power/terminal{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/cyan{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/engines) -"bA" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/table/darkglass, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"bB" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 4; - dir = 1; - icon_state = "1-2" - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 4; - dir = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/engines) -"bC" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/engines) -"bD" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2 - }, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/tether_away/guttersite/engines) -"bE" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark, -/area/tether_away/guttersite/maint) -"bF" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/atmos) -"bG" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/engines) -"bH" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/engines) -"bI" = ( -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"bJ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 8 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"bK" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 10 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"bL" = ( -/obj/machinery/atmospherics/binary/pump/on{ - dir = 8 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"bM" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"bN" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"bO" = ( -/obj/structure/table/steel, -/obj/structure/cable/cyan, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/engines) -"bP" = ( -/obj/structure/table/steel, -/obj/structure/cable/cyan, -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/atmos) -"bQ" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 4; - dir = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/engines) -"bR" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/eris/dark, -/area/tether_away/guttersite/maint) -"bS" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/maint) -"bT" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/engines) -"bU" = ( -/obj/machinery/alarm{ - alarm_id = null; - breach_detection = 0; - dir = 1; - pixel_y = -22 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/engines) -"bV" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/engines) -"bW" = ( -/obj/structure/table/steel, -/obj/fiftyspawner/plasteel, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/engines) -"bX" = ( -/obj/structure/table/steel, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/fiftyspawner/plasteel/hull, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/engines) -"bY" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable/cyan, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/maint) -"bZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/bed/chair/bay/comfy/black, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"ca" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2 - }, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/tether_away/guttersite/maint) -"cb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/bed/chair/bay/comfy/black{ - dir = 1 - }, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"cc" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"cd" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 10 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"ce" = ( -/obj/machinery/atmospherics/binary/pump/on{ - dir = 4 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"cf" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"cg" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"ch" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"ci" = ( -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"cj" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"ck" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/table/darkglass, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/white/monofloor, -/area/tether_away/guttersite/office) -"cl" = ( -/obj/item/weapon/hand_tele, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"cm" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 5 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"cn" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 4 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"co" = ( -/obj/structure/loot_pile/surface/bones, -/obj/random/gun/random, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"cp" = ( -/obj/structure/window/basic{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/white/monofloor, -/area/tether_away/guttersite/office) -"cr" = ( -/obj/structure/table/darkglass, -/obj/item/key, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"cs" = ( -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/unexplored) -"ct" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/maint) -"cu" = ( -/obj/structure/table/steel, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/atmos) -"cv" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/blue{ - dir = 1 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"cw" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 10 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"cx" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 5 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"cy" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 1 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"cz" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/maint) -"cA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/maint) -"cB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/maint) -"cC" = ( -/obj/machinery/door/airlock/multi_tile/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/maint) -"cD" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/maint) -"cE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/maint) -"cF" = ( -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/commons) -"cG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/maint) -"cH" = ( -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"cI" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"cJ" = ( -/obj/fiftyspawner/glass, -/obj/fiftyspawner/steel, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"cK" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"cL" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"cM" = ( -/obj/effect/landmark/corpse/clown, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"cN" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable/cyan{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"cO" = ( -/obj/structure/bed/chair/bay/comfy/black, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"cP" = ( -/obj/machinery/vending/loadout/uniform, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"cQ" = ( -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/smes/buildable/point_of_interest, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/engines) -"cR" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"cS" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"cT" = ( -/obj/structure/inflatable/door, -/turf/simulated/floor/plating/eris, -/area/tether_away/guttersite/unexplored) -"cU" = ( -/obj/machinery/vending/boozeomat, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"cV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/maint) -"cW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/maint) -"cX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_access = list(0); - req_one_access = list(10) - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"cY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"cZ" = ( -/turf/simulated/floor/tiled/eris/steel/bar_light, -/area/tether_away/guttersite/commons) -"da" = ( -/obj/structure/window/basic{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"db" = ( -/obj/machinery/vending/food, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"dc" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/table/darkglass, -/obj/machinery/chemical_dispenser/bar_alc/full, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"dd" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"de" = ( -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/medbay) -"df" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/commons) -"dg" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"dh" = ( -/obj/structure/table/darkglass, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"di" = ( -/obj/structure/table/darkglass, -/obj/item/weapon/storage/box/glasses/meta, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"dj" = ( -/obj/structure/table/darkglass, -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"dk" = ( -/turf/simulated/mineral/cave, -/area/tether_away/guttersite/commons) -"dl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/cyan{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"dm" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access = list() - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"dn" = ( -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/walkway) -"do" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"dp" = ( -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"dq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"dr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_access = list(0); - req_one_access = list(10) - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"ds" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_access = list(0); - req_one_access = list(10) - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"dt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"du" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"dv" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 448; - master_tag = "guttersite_northlock"; - name = "exterior access button"; - pixel_x = -5; - pixel_y = -26 - }, -/turf/simulated/mineral/floor/vacuum, -/area/space) -"dw" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"dx" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(15) - }, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"dy" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"dz" = ( -/obj/structure/closet/medical_wall, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"dA" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"dB" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"dC" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"dD" = ( -/obj/structure/medical_stand, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"dE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"dF" = ( -/obj/structure/dogbed, -/mob/living/simple_mob/vore/redpanda/fae{ - name = "Rhythm" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"dG" = ( -/obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"dH" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"dI" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 448; - id_tag = "guttersite_northlock"; - name = "Airlock controller"; - pixel_x = -25 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"dJ" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"dK" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"dL" = ( -/obj/structure/window/basic{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"dM" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"dN" = ( -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/office) -"dO" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/commons) -"dP" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 448; - id_tag = "guttersite_northlock_pump" - }, -/obj/machinery/airlock_sensor{ - frequency = 448; - id_tag = "guttersite_northlock_sensor"; - pixel_y = -25 - }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"dQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"dR" = ( -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"dS" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"dT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"dU" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"dV" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"dW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/bed/chair/bay/comfy/black{ - dir = 1 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"dX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"dY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/commons) -"dZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/closet/cabinet, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"ea" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"eb" = ( -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/bridge) -"ec" = ( -/obj/structure/window/basic, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"ed" = ( -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/vault) -"ee" = ( -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"ef" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"eg" = ( -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"eh" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"ei" = ( -/obj/machinery/door/window/southleft, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"ej" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/washing_machine, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"ek" = ( -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/filingcabinet/filingcabinet, -/turf/simulated/floor/tiled/eris/white/monofloor, -/area/tether_away/guttersite/office) -"el" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"em" = ( -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"en" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"eo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"ep" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"eq" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"er" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"es" = ( -/turf/simulated/floor/tiled/eris/white/monofloor, -/area/tether_away/guttersite/office) -"et" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/curtain/open/shower, -/obj/machinery/shower, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/tether_away/guttersite/commons) -"eu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/tether_away/guttersite/commons) -"ev" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/table/darkglass, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"ew" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/bed/chair/bay/comfy/black{ - dir = 8 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"ex" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/cable/cyan{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"ey" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"ez" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"eA" = ( -/obj/structure/bed/chair/bay/comfy/black{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"eB" = ( -/obj/structure/table/darkglass, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"eC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/bed/chair/bay/comfy/black{ - dir = 8 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/cyan{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"eD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access = list() - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"eE" = ( -/turf/space, -/area/space) -"eF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/bed/chair/bay/comfy/black{ - dir = 8 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"eG" = ( -/obj/structure/bedsheetbin, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"eH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"eI" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"eJ" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"eK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"eL" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"eM" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/white/monofloor, -/area/tether_away/guttersite/office) -"eN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"eO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"eP" = ( -/obj/item/device/radio/headset/heads/captain/alt{ - desc = "The headset of an Eltorro employee."; - name = "Rus's Headset" - }, -/turf/simulated/floor/carpet/gaycarpet, -/area/tether_away/guttersite/unexplored) -"eQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"eR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access = list() - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"eS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"eT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"eU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"eV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"eW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"eX" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"eY" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/bed/chair/bay/comfy/black{ - dir = 8 - }, -/obj/structure/cable/cyan{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"eZ" = ( -/obj/item/weapon/cell/super, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"fa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/filingcabinet/filingcabinet, -/turf/simulated/floor/tiled/eris/white/monofloor, -/area/tether_away/guttersite/office) -"fb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/white/monofloor, -/area/tether_away/guttersite/office) -"fc" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable/cyan{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"fd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access = list() - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"fe" = ( -/obj/item/trash/cheesie, -/obj/item/trash/liquidprotein, -/obj/item/trash/liquidprotein, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"ff" = ( -/turf/simulated/wall/lead, -/area/tether_away/guttersite/unexplored) -"fg" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"fh" = ( -/obj/structure/bed/chair/bay/comfy/black{ - dir = 8 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"fi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"fj" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"fk" = ( -/obj/random/humanoidremains, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"fl" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"fm" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"fn" = ( -/obj/structure/bed/chair/bay/comfy/black{ - dir = 4 - }, -/mob/living/simple_mob/vore/catgirl{ - name = "Lucy" - }, -/turf/simulated/floor/tiled/eris/white/techfloor_grid, -/area/tether_away/guttersite/office) -"fo" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access = list() - }, -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"fp" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"fq" = ( -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/docking) -"fr" = ( -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"fs" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/cyan{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"ft" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"fu" = ( -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/security) -"fv" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"fw" = ( -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"fx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"fy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"fz" = ( -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/security) -"fA" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 6 - }, -/obj/machinery/meter, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/security) -"fB" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/security) -"fC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"fD" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 8 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/security) -"fE" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/security) -"fF" = ( -/obj/machinery/atmospherics/binary/pump/on{ - dir = 8 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/security) -"fG" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/blue, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/security) -"fH" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/security) -"fI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"fJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access = list() - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"fK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"fL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access = list() - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"fM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"fN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"fO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"fP" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"fQ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable/cyan{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"fR" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"fS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"fT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock/hatch{ - frequency = 12341; - id_tag = "gutter vault"; - req_access = list(150) - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"fU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"fV" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"fW" = ( -/obj/item/weapon/storage/toolbox/lunchbox/heart/filled, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"fX" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/security) -"fY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/security) -"fZ" = ( -/obj/item/trash/cheesie, -/obj/item/trash/liquidprotein, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"ga" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gb" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gc" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gd" = ( -/obj/structure/table/steel, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"ge" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gf" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access = list(38) - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gg" = ( -/obj/structure/fence, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gh" = ( -/obj/machinery/door/airlock/glass_external, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1999; - master_tag = "westlock"; - name = "exterior access button"; - pixel_x = -5; - pixel_y = -26 - }, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gi" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1999; - id_tag = "westlock_pump" - }, -/obj/machinery/light/small, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1999; - id_tag = "westlock"; - pixel_y = 28 - }, -/obj/machinery/airlock_sensor{ - frequency = 1999; - id_tag = "westlock_sensor"; - pixel_y = -25 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gj" = ( -/obj/machinery/door/airlock/glass_external, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gk" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1999; - master_tag = "westlock"; - name = "interior access button"; - pixel_x = -28; - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gl" = ( -/obj/effect/floor_decal/sign/dock/two, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gm" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gn" = ( -/obj/structure/closet, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"go" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/commons) -"gp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/security) -"gq" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gr" = ( -/obj/structure/fence/door/locked{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gs" = ( -/obj/structure/bed, -/obj/item/weapon/bedsheet/pirate, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"gt" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/docking) -"gu" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/docking) -"gv" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"gw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"gx" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"gy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access = list(38) - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/security) -"gD" = ( -/obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"gE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gF" = ( -/obj/structure/table/rack, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"gG" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1380; - id_tag = "dock_d2a2_pump" - }, -/obj/machinery/light/small, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1380; - id_tag = "guttersite_sshuttle"; - pixel_y = 28 - }, -/obj/machinery/airlock_sensor{ - frequency = 1380; - id_tag = "dock_d2a2_sensor"; - pixel_y = -25 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"gH" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list() - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"gI" = ( -/obj/structure/closet{ - name = "mechanical equipment" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"gJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/vault/bolted, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"gK" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gL" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gO" = ( -/obj/structure/fence/end{ - dir = 4 - }, -/obj/structure/fence, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gP" = ( -/obj/structure/fence{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gQ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/docking) -"gR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/docking) -"gS" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"gT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"gU" = ( -/obj/structure/barricade, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gV" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"gW" = ( -/obj/structure/fence/door/opened{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gX" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gY" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"gZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"ha" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"hb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"hc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"hd" = ( -/obj/machinery/fitness/punching_bag/clown, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"he" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"hf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"hg" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"hh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"hj" = ( -/mob/living/simple_mob/mobs_monsters/clowns/big/cluwne, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"hk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access = list() - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"hl" = ( -/obj/structure/fence/door/locked, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"hm" = ( -/obj/structure/fence/end{ - dir = 8 - }, -/obj/structure/fence/end{ - dir = 4 - }, -/obj/structure/fence, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"hn" = ( -/obj/structure/fence/end{ - dir = 8 - }, -/obj/structure/fence, -/obj/structure/fence/end{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"ho" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/docking) -"hp" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hq" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hr" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/table/rack, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"hs" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"ht" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 6 - }, -/obj/machinery/meter, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hu" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hv" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(15) - }, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hw" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/table/rack, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"hx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hy" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hz" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hA" = ( -/obj/machinery/atmospherics/binary/pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hB" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/blue, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hC" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hD" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/mob/living/simple_mob/vore/wolfgirl, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"hF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hI" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hQ" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hR" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"hS" = ( -/obj/effect/shuttle_landmark/premade/guttersite/sshuttle, -/turf/space, -/area/space) -"hT" = ( -/obj/effect/shuttle_landmark/premade/guttersite/lshuttle, -/turf/space, -/area/space) -"hU" = ( -/obj/structure/table/rack/steel, -/obj/random/powercell, -/obj/random/multiple/voidsuit, -/obj/item/weapon/tank/oxygen, -/obj/random/tool, -/obj/random/drinkbottle, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/unexplored) -"hV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"hW" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"hX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/window/basic, -/obj/structure/table/darkglass, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/white/monofloor, -/area/tether_away/guttersite/office) -"hY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/table/darkglass, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/white/monofloor, -/area/tether_away/guttersite/office) -"hZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/commons) -"ia" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/medbay) -"ib" = ( -/obj/machinery/vending/cola/soft, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"ic" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/medbay) -"id" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "guttersite_sshuttle"; - name = "interior access button"; - pixel_x = -28; - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"ie" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/walkway) -"if" = ( -/obj/random/mob/mouse, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"ig" = ( -/mob/living/simple_mob/vore/aggressive/rat/phoron, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"ih" = ( -/obj/machinery/computer/arcade/battle, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"ii" = ( -/obj/effect/overmap/visitable/sector/guttersite, -/turf/space, -/area/tether_away/guttersite/unexplored) -"ij" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/table/darkglass, -/obj/item/weapon/pen/blue, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/white/monofloor, -/area/tether_away/guttersite/office) -"ik" = ( -/turf/simulated/floor/tiled/eris/white/techfloor_grid, -/area/tether_away/guttersite/office) -"il" = ( -/turf/simulated/floor/tiled/eris/white/panels, -/area/tether_away/guttersite/office) -"im" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/white/panels, -/area/tether_away/guttersite/office) -"in" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/table/darkglass, -/obj/item/weapon/paper_bin, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/white/monofloor, -/area/tether_away/guttersite/office) -"io" = ( -/obj/machinery/door/window/westleft, -/turf/simulated/floor/tiled/eris/white/monofloor, -/area/tether_away/guttersite/office) -"ip" = ( -/obj/machinery/vending/nifsoft_shop, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"iq" = ( -/obj/structure/bed/chair/bay/comfy/black, -/turf/simulated/floor/tiled/eris/white/panels, -/area/tether_away/guttersite/office) -"ir" = ( -/obj/item/weapon/card/id/assistant, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"is" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/cyan{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"it" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/cyan{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"iu" = ( -/obj/machinery/door/window/westright, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"iv" = ( -/obj/structure/window/basic{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"iw" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"ix" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"iy" = ( -/obj/structure/window/basic{ - dir = 8 - }, -/obj/machinery/papershredder, -/turf/simulated/floor/tiled/eris/white/monofloor, -/area/tether_away/guttersite/office) -"iz" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"iA" = ( -/obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"iB" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"iC" = ( -/obj/machinery/vending/sovietsoda, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"iD" = ( -/obj/machinery/vending/snack, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"iE" = ( -/obj/machinery/vending/cigarette, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"iF" = ( -/obj/structure/bed/chair/bay/comfy/black{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"iG" = ( -/obj/structure/table/darkglass, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"iH" = ( -/obj/structure/bed/chair/bay/comfy/black{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"iI" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"iJ" = ( -/mob/living/simple_mob/vore/aggressive/mimic, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"iK" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/implant/sizecontrol, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"iL" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"iM" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/random/cutout, -/obj/structure/cable/cyan{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"iO" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"iP" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"iQ" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1276; - id_tag = "guttersite_lshuttle"; - name = "Airlock controller"; - pixel_x = -25 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"iR" = ( -/mob/living/simple_mob/mechanical/hivebot/ranged_damage/basic, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"iS" = ( -/mob/living/simple_mob/mechanical/hivebot/tank/meatshield, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"iU" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"iV" = ( -/obj/item/clothing/under/assistantformal, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"iW" = ( -/obj/item/weapon/reagent_containers/food/snacks/clownburger, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"iX" = ( -/obj/machinery/computer/arcade/orion_trail, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"iY" = ( -/obj/machinery/vending/snack, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"iZ" = ( -/obj/machinery/light, -/obj/machinery/vending/fitness, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/walkway) -"ja" = ( -/obj/structure/bed/chair/bay/comfy/black{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"jb" = ( -/obj/structure/table/darkglass, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"jc" = ( -/obj/structure/bed/chair/bay/comfy/black{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"jd" = ( -/obj/structure/table/rack/steel, -/obj/random/tetheraid, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"jg" = ( -/obj/item/trash/liquidfood, -/obj/item/trash/liquidprotein, -/obj/item/trash/cheesie, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"jh" = ( -/mob/living/simple_mob/mobs_monsters/clowns/big/sentinel, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"ji" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 10 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"jj" = ( -/obj/random/curseditem, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"jk" = ( -/obj/item/weapon/reagent_containers/food/snacks/clownstears, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"jl" = ( -/obj/structure/loot_pile/surface/bones, -/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"jm" = ( -/obj/item/weapon/storage/backpack/clown, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"jn" = ( -/obj/item/weapon/stamp/clown, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"jo" = ( -/obj/structure/table/rack/shelf/steel, -bj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly, -/obj/item/weapon/reagent_containers/food/snacks/donut/jelly, -/obj/item/weapon/reagent_containers/food/snacks/donut/normal, -/obj/item/weapon/reagent_containers/food/snacks/donut/poisonberry, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"jp" = ( -/obj/structure/table/rack/shelf/steel, -bj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly, -/obj/item/weapon/reagent_containers/food/snacks/donut/jelly, -/obj/item/weapon/reagent_containers/food/snacks/donut/normal, -/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"jq" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/reagent_containers/food/snacks/donut/chaos, -bj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly, -bj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly, -/obj/item/weapon/reagent_containers/food/snacks/donut/jelly, -/obj/item/weapon/reagent_containers/food/snacks/donut/normal, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"jv" = ( -/obj/structure/table/darkglass, -/obj/machinery/chemical_dispenser/biochemistry/full, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"jw" = ( -/obj/item/weapon/reagent_containers/spray/waterflower, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"jx" = ( -/mob/living/simple_mob/vore/wolfgirl, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"jy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access = list(38) - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"jz" = ( -/mob/living/simple_mob/vore/wolfgirl{ - name = "Tricky Dixie" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/unexplored) -"jA" = ( -/obj/structure/closet/cabinet, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"jB" = ( -/obj/machinery/washing_machine, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"jC" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access = list() - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"jD" = ( -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"jE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access = list() - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"jF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"jG" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/visible/blue, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"jH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"jI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"jJ" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"jK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"jL" = ( -/obj/structure/bed/padded, -/obj/item/weapon/bedsheet/ian, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"jM" = ( -/obj/structure/bed/padded, -/obj/item/weapon/bedsheet/captain, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"jN" = ( -/obj/structure/bed/padded, -/obj/item/weapon/bedsheet/mime, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"jO" = ( -/obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hop, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"jP" = ( -/obj/structure/bed/padded, -/obj/item/weapon/bedsheet/cosmos, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"jQ" = ( -/obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hos, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"jR" = ( -/obj/structure/bed/padded, -/obj/item/weapon/bedsheet/pirate, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"jS" = ( -/obj/structure/bed/padded, -/obj/item/weapon/bedsheet/ce, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"jT" = ( -/obj/structure/window/basic, -/obj/structure/bed/padded, -/obj/item/weapon/bedsheet/clown, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"jU" = ( -/obj/structure/window/basic, -/obj/structure/bed/padded, -/obj/item/weapon/bedsheet/medical, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"jV" = ( -/obj/structure/window/basic, -/obj/structure/bed/padded, -/obj/item/weapon/bedsheet/rd, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"jW" = ( -/obj/structure/window/basic, -/obj/structure/bed/padded, -/obj/item/weapon/bedsheet/rainbow, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"jX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"jY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/security) -"jZ" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 6 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"ka" = ( -/obj/structure/bed/chair/bay/comfy/black{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"kb" = ( -/obj/structure/bed/chair/bay/comfy/black{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"kc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/table/steel, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"kd" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"ke" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"kf" = ( -/obj/item/device/flashlight/lamp/green, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"kg" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"kh" = ( -/obj/item/weapon/book{ - author = "Urist McHopefulsoul"; - desc = "It contains fourty blank pages followed by the entire screenplay of a movie called 'Requiem for a Dream'"; - name = "A Comprehensive Guide to Assisting" - }, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"ki" = ( -/obj/structure/reagent_dispensers/water_cooler/full{ - icon_state = "water_cooler-vend" - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"kj" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 - }, -/obj/structure/table/darkglass, -/obj/machinery/microwave, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"kk" = ( -/obj/structure/table/darkglass, -/obj/item/weapon/storage/box/cups, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"kl" = ( -/obj/machinery/light, -/obj/structure/table/darkglass, -/obj/item/weapon/storage/box/condimentbottles, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"km" = ( -/obj/structure/table/darkglass, -/obj/item/weapon/storage/box/donkpockets, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"kn" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/table/steel, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"ko" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/table/steel, -/obj/item/device/flashlight/lamp, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"kp" = ( -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/tether_away/guttersite/commons) -"kq" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 8 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/tether_away/guttersite/commons) -"kr" = ( -/obj/structure/toilet{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/tether_away/guttersite/commons) -"ks" = ( -/obj/machinery/holoplant, -/obj/machinery/holoplant{ - icon_state = "plant-09" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"kt" = ( -/obj/machinery/holoplant, -/obj/machinery/holoplant{ - icon_state = "plant-10" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"ku" = ( -/obj/machinery/holoplant, -/obj/machinery/holoplant{ - icon_state = "plant-15" - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"kv" = ( -/obj/structure/window/basic, -/obj/machinery/holoplant, -/obj/machinery/holoplant{ - icon_state = "plant-1" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"kw" = ( -/obj/machinery/holoplant, -/obj/machinery/holoplant{ - icon_state = "plant-13" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"kx" = ( -/obj/machinery/holoplant, -/obj/machinery/holoplant{ - icon_state = "plant-15" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"ky" = ( -/obj/machinery/vending/loadout/overwear, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"kz" = ( -/obj/machinery/vending/loadout/clothing, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"kA" = ( -/obj/structure/table/darkglass, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"kB" = ( -/obj/structure/bed/chair/bay/comfy/black{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"kC" = ( -/obj/structure/window/basic{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"kD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/table/steel, -/obj/item/weapon/pen/fountain, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"kE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/table/steel, -/obj/item/weapon/paper_bin, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"kF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/table/darkglass, -/obj/structure/window/basic{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"kG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/table/steel, -/obj/structure/cable/cyan{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"kH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"kI" = ( -/obj/machinery/vending/medical, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"kJ" = ( -/obj/effect/floor_decal/sign/dock/two, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"kK" = ( -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"kL" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/table/darkglass, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"kM" = ( -/obj/structure/table/darkglass, -/obj/structure/window/basic, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"kN" = ( -/obj/structure/table/darkglass, -/obj/structure/window/basic{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"kO" = ( -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"kP" = ( -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/medical_stand, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"kQ" = ( -/obj/structure/medical_stand, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"kR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"kS" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/closet/crate/medical/blood, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"kT" = ( -/obj/structure/window/basic{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"kU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"kV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"kW" = ( -/obj/machinery/light, -/obj/structure/window/basic{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"kX" = ( -/obj/structure/sign/nosmoking_1, -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/medbay) -"kY" = ( -/obj/structure/table/darkglass, -/obj/item/weapon/storage/box/masks, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"kZ" = ( -/obj/structure/table/darkglass, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/circular_saw, -/obj/item/weapon/surgical/cautery, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"la" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"lb" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/vending/engivend, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"lc" = ( -/obj/machinery/vending/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"ld" = ( -/obj/machinery/vending/tool, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"le" = ( -/obj/structure/closet/toolcloset, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"lf" = ( -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/closet/toolcloset, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"lg" = ( -/obj/structure/window/basic{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"lh" = ( -/obj/structure/window/basic{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"li" = ( -/obj/item/toy/figure/assistant, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"lj" = ( -/obj/structure/closet/walllocker/emerglocker/east, -/obj/structure/closet/firecloset/full, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"lk" = ( -/obj/structure/closet/crate/engineering/electrical, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"ll" = ( -/obj/structure/window/basic, -/obj/structure/closet/crate/engineering/electrical, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"lm" = ( -/obj/structure/window/basic, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"ln" = ( -/obj/structure/table/darkglass, -/obj/item/weapon/storage/toolbox/electrical, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"lo" = ( -/obj/machinery/light, -/obj/structure/window/basic{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"lp" = ( -/obj/structure/closet/crate/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"lq" = ( -/mob/living/bot/mulebot, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"lr" = ( -/obj/structure/closet/crate/solar, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"ls" = ( -/obj/structure/closet/crate/science, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"lt" = ( -/obj/structure/closet/crate/rcd, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"lu" = ( -/obj/structure/closet/firecloset/full, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"lv" = ( -/obj/structure/closet/firecloset/full, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"lw" = ( -/obj/structure/closet/firecloset/full, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"lx" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/closet/firecloset/full, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"ly" = ( -/obj/structure/closet/firecloset/full, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"lz" = ( -/obj/structure/closet/firecloset/full, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"lA" = ( -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/window/basic, -/obj/structure/bed/chair/bay/comfy/black{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"lB" = ( -/obj/structure/table/darkglass, -/obj/item/weapon/storage/toolbox/mechanical, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/storage) -"lD" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"lE" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 4 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"lF" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"lG" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/security) -"lH" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access = list() - }, -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"lI" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/blue{ - dir = 8 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"lJ" = ( -/obj/item/weapon/storage/toolbox/electrical{ - pixel_x = 1; - pixel_y = -1 - }, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"lK" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable/cyan{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"lL" = ( -/obj/structure/loot_pile/surface/bones, -/obj/random/weapon/guarenteed, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"lM" = ( -/obj/item/toy/plushie/carp, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"lN" = ( -/obj/structure/loot_pile/surface/bones, -/turf/simulated/mineral/floor/vacuum, -/area/space) -"lO" = ( -/obj/structure/bonfire, -/turf/simulated/mineral/floor/vacuum, -/area/space) -"lP" = ( -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"lQ" = ( -/obj/item/weapon/card/emag_broken, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"lR" = ( -/obj/item/toy/plushie/carp, -/turf/simulated/mineral/floor/vacuum, -/area/space) -"lS" = ( -/obj/structure/inflatable/door, -/turf/simulated/mineral/floor/vacuum, -/area/space) -"lT" = ( -/obj/item/pizzavoucher, -/turf/simulated/mineral/floor/vacuum, -/area/space) -"lU" = ( -/mob/living/simple_mob/animal/space/carp/large/huge, -/turf/simulated/mineral/floor/vacuum, -/area/space) -"lV" = ( -/obj/item/clothing/suit/storage/hooded/carp_costume, -/turf/simulated/mineral/floor/vacuum, -/area/space) -"lW" = ( -/obj/item/clothing/suit/storage/hooded/techpriest, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"lX" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 10 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"lY" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"lZ" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"ma" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"mb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"mc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"md" = ( -/obj/structure/outcrop/phoron, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/teleporter) -"me" = ( -/obj/structure/cable, -/obj/machinery/power/port_gen/pacman, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"mf" = ( -/obj/item/stack/material/phoron, -/obj/item/stack/material/phoron, -/turf/simulated/floor/airless, -/area/tether_away/guttersite/teleporter) -"mg" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(15) - }, -/obj/effect/map_helper/airlock/door/int_door, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"mh" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/walkway) -"mi" = ( -/obj/machinery/atmospherics/binary/pump/on, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"mj" = ( -/obj/machinery/atmospherics/binary/pump/on{ - dir = 1; - target_pressure = 200 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"mk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/office) -"ml" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/office) -"mm" = ( -/obj/structure/table/rack, -/obj/item/weapon/tank/oxygen, -/obj/random/multiple/voidsuit, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"mn" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 448; - master_tag = "guttersite_northlock"; - name = "interior access button"; - pixel_x = -28; - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"mo" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/portable_atmospherics/canister/empty, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"mp" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/portable_atmospherics/canister/empty, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"mq" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"mr" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"ms" = ( -/obj/structure/table/steel, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/atmos) -"mt" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor/plating/eris/under, -/area/tether_away/guttersite/atmos) -"mu" = ( -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/table/darkglass, -/turf/simulated/floor/tiled/eris/white/monofloor, -/area/tether_away/guttersite/office) -"mv" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/bridge) -"mw" = ( -/obj/structure/table/darkglass, -/obj/item/device/flashlight/lamp/green, -/turf/simulated/floor/tiled/eris/white/monofloor, -/area/tether_away/guttersite/office) -"mx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/bridge) -"my" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/docking) -"mz" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/docking) -"mA" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"mB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/docking) -"mC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/docking) -"mD" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/docking) -"mE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/docking) -"mF" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/wall/r_wall, -/area/tether_away/guttersite/docking) -"mG" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/docking) -"mH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether_away/guttersite/docking) -"mI" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1276; - id_tag = "guttersite_lshuttle_pump" - }, -/obj/machinery/airlock_sensor{ - frequency = 1276; - id_tag = "guttersite_lshuttle_sensor"; - pixel_y = -25 - }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"mJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"mK" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(15) - }, -/obj/effect/map_helper/airlock/door/int_door, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"mL" = ( -/obj/structure/table/rack, -/obj/item/weapon/tank/oxygen, -/obj/random/multiple/voidsuit, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"mM" = ( -/obj/structure/table/darkglass, -/obj/item/weapon/pen/blue, -/turf/simulated/floor/tiled/eris/white/monofloor, -/area/tether_away/guttersite/office) -"mN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/bridge) -"mO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/obj/structure/table/darkglass, -/obj/item/weapon/paper_bin, -/turf/simulated/floor/tiled/eris/white/monofloor, -/area/tether_away/guttersite/office) -"mP" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1276; - master_tag = "guttersite_lshuttle"; - name = "interior access button"; - pixel_x = -28; - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"mQ" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"mR" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list() - }, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"mS" = ( -/obj/structure/flora/pumpkin/carved/owo, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"mT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"mU" = ( -/turf/simulated/floor/carpet/gaycarpet, -/area/tether_away/guttersite/unexplored) -"mW" = ( -/obj/item/weapon/reagent_containers/food/drinks/cans/cola, -/turf/simulated/floor/carpet/gaycarpet, -/area/tether_away/guttersite/unexplored) -"mX" = ( -/obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn, -/turf/simulated/floor/carpet/gaycarpet, -/area/tether_away/guttersite/unexplored) -"mY" = ( -/obj/item/weapon/material/twohanded/baseballbat/metal, -/turf/simulated/floor/carpet/gaycarpet, -/area/tether_away/guttersite/unexplored) -"mZ" = ( -/obj/item/weapon/light/bulb, -/turf/simulated/floor/carpet/gaycarpet, -/area/tether_away/guttersite/unexplored) -"na" = ( -/obj/item/clothing/mask/gas/wwii, -/turf/simulated/floor/carpet/gaycarpet, -/area/tether_away/guttersite/unexplored) -"nb" = ( -/obj/machinery/floodlight, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"ne" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"nf" = ( -/obj/structure/table/rack, -/obj/random/janusmodule, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"nh" = ( -/obj/item/mecha_parts/mecha_equipment/tool/drill, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"ni" = ( -/obj/structure/loot_pile/mecha/ripley, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"nj" = ( -/obj/structure/closet/secure_closet/freezer/fridge, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"nk" = ( -/obj/item/clothing/head/helmet/space/syndicate/black, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"nm" = ( -/obj/item/clothing/suit/space/syndicate/black, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"nn" = ( -/obj/item/weapon/tank/air, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"np" = ( -/obj/structure/trash_pile, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"nq" = ( -/obj/item/trash/liquidprotein, -/obj/item/trash/cheesie, -/obj/item/trash/candy, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"nr" = ( -/obj/item/trash/liquidfood, -/obj/item/trash/liquidprotein, -/obj/item/trash/cheesie, -/obj/item/trash/candy, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"ns" = ( -/obj/item/trash/liquidprotein, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"nt" = ( -/obj/structure/signpost, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"nu" = ( -/obj/random/outcrop, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"nv" = ( -/mob/living/simple_mob/mechanical/hivebot/tank/armored, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"nw" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"nx" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/security) -"ny" = ( -/mob/living/simple_mob/vore/catgirl{ - name = "Blaire" - }, -/turf/simulated/floor/tiled/eris/steel/bar_light, -/area/tether_away/guttersite/commons) -"nz" = ( -/mob/living/simple_mob/mobs_monsters/clowns/big/tunnelclown, -/turf/simulated/mineral/floor/vacuum, -/area/tether_away/guttersite/unexplored) -"nA" = ( -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"nB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"nC" = ( -/obj/effect/map_helper/airlock/door/int_door, -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(15) - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"nD" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1990; - master_tag = "guttersite_mshuttle"; - name = "interior access button"; - pixel_x = -28; - pixel_y = -26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"nE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"nF" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1990; - id_tag = "guttersite_mshuttle"; - name = "Airlock controller"; - pixel_x = -25 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"nG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"nH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"nI" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1990; - id_tag = "guttersite_mshuttle_pump" - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"nJ" = ( -/obj/machinery/airlock_sensor{ - frequency = 1990; - id_tag = "guttersite_mshuttle_sensor"; - pixel_y = -25 - }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"nK" = ( -/obj/effect/map_helper/airlock/door/ext_door, -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(15) - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"nL" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"nM" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1990; - master_tag = "guttersite_mshuttle"; - name = "exterior access button"; - pixel_x = 26; - pixel_y = 26 - }, -/turf/simulated/floor/plating/eris/under/airless, -/area/tether_away/guttersite/docking) -"nN" = ( -/obj/effect/shuttle_landmark/premade/guttersite/mshuttle, -/turf/space, -/area/space) -"oY" = ( -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether_away/guttersite/commons) -"pl" = ( -/obj/item/stack/material/steel, -/obj/item/stack/material/steel, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"uO" = ( -/obj/structure/medical_stand, -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"ve" = ( -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"vK" = ( -/obj/item/stack/material/wood, -/obj/item/stack/material/wood, -/obj/item/stack/material/wood, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"wl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/commons) -"Ax" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"Cn" = ( -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/vault) -"EB" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"EO" = ( -/obj/item/stack/material/steel, -/obj/item/stack/material/steel, -/obj/item/stack/material/steel, -/obj/item/stack/material/steel, -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"FA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access = list() - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/item/tape/medical, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"GP" = ( -/obj/item/tape/engineering, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/office) -"La" = ( -/obj/structure/barricade, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"Ob" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/maint) -"OO" = ( -/obj/item/stack/material/steel, -/obj/item/stack/material/steel, -/obj/item/stack/material/steel, -/obj/item/stack/material/steel, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"PF" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"Qq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"QN" = ( -/turf/simulated/floor/plating/eris/under/airless, -/area/tether_away/guttersite/docking) -"SX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/docking) -"TZ" = ( -/obj/item/stack/material/steel, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"Uv" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1276; - master_tag = "guttersite_lshuttle"; - name = "exterior access button"; - pixel_x = 26; - pixel_y = -26 - }, -/turf/simulated/floor/plating/eris/under/airless, -/area/tether_away/guttersite/docking) -"UU" = ( -/obj/item/stack/material/wood, -/turf/simulated/floor/tiled/eris/dark/gray_perforated, -/area/tether_away/guttersite/medbay) -"Yg" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1380; - master_tag = "guttersite_sshuttle"; - name = "exterior access button"; - pixel_x = -5; - pixel_y = -26 - }, -/turf/simulated/floor/plating/eris/under/airless, -/area/tether_away/guttersite/docking) - -(1,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ii -"} -(2,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(3,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(4,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(5,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -aa -aa -aa -aa -aa -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(6,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -aa -aa -aa -aa -aa -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -nu -nu -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(7,1,1) = {" -aa -aa -aa -aa -aa -aa -ag -ag -cl -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -nu -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(8,1,1) = {" -aa -aa -aa -aa -aa -aa -ag -ad -ad -aL -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -aa -aa -aa -aa -ad -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(9,1,1) = {" -aa -aa -aa -aa -aa -aa -ag -ag -ad -ad -ad -ad -aa -aa -aa -aa -aa -ag -ag -ag -ag -aa -aa -aa -aa -aa -ad -ad -ag -ad -ad -aa -aa -aa -aa -aa -ad -ad -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -nu -ag -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(10,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ad -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -aa -aa -aa -ad -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -ag -ag -nu -ad -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -nu -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(11,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -aa -aa -aa -aa -aa -aa -ag -ag -ag -ad -nu -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -ag -nu -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(12,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -aa -aa -aa -aa -aa -aa -ad -ad -aa -aa -aa -ad -ad -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(13,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -aa -aa -aa -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -aa -aa -aa -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(14,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -lM -ag -aa -aa -aa -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -nu -ad -ag -aa -aa -aa -aa -aa -aa -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(15,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -aa -aa -aa -aa -aa -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -aa -aa -aa -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -aa -aa -aa -aa -ad -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(16,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(17,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ad -ad -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -nu -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(18,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ad -aa -aa -aa -aa -aa -ad -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(19,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ag -aa -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ir -kf -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -aa -aa -aa -aa -aa -aa -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(20,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -iV -kh -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -ad -ad -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(21,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -li -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(22,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -lM -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -nu -ad -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(23,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(24,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -aa -aa -aa -ag -ag -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(25,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -nu -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(26,1,1) = {" -aa -aa -aa -aa -aa -aa -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(27,1,1) = {" -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aJ -aJ -aJ -aJ -aJ -aJ -aJ -aJ -aF -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -nu -ad -ad -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(28,1,1) = {" -aa -aa -aa -aa -aa -aa -ad -ad -lM -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aJ -bc -bc -bc -bc -bc -bc -aJ -aF -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -nu -ad -ad -ad -ad -aL -ad -ad -ad -aa -aa -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(29,1,1) = {" -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -lM -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aB -aB -aG -aK -aW -bd -bz -bG -bz -bG -bT -aF -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -jl -ad -nu -ag -ag -ag -ag -ag -ag -ag -ad -ad -aL -ad -ad -ad -ad -ad -ad -ad -ag -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(30,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aB -aE -aH -aJ -aX -cQ -cQ -aX -cQ -aX -bU -aF -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -iJ -ad -ad -ag -ag -ag -ag -ag -ag -ag -ad -ad -ad -ad -ad -ad -ad -ad -ad -aL -nu -ag -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(31,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aB -aE -aI -aJ -aX -bk -bk -aX -bk -aX -aJ -aF -ag -ag -ag -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ad -ad -ad -ag -ag -ag -ag -ag -ag -ag -aL -ad -ad -ad -ad -ad -ag -ag -ad -ad -ad -ag -ag -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(32,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aB -aE -aG -aM -aX -bl -bB -bH -bQ -aX -bV -aF -ag -ag -ay -jw -jw -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ad -ad -ag -ag -ag -ag -ag -ag -ad -fX -gh -gp -aL -ag -ag -ag -ag -ad -ad -ad -ag -ag -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(33,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -aB -aE -aG -aO -aX -bk -aX -aX -aX -aX -bW -aF -ag -ay -ad -jj -ad -ad -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ag -ag -ad -ad -ag -ag -ad -ad -ad -ad -fY -gi -gp -ag -ag -ag -ag -ag -ad -ad -ad -ad -ag -ag -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(34,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -aB -aE -aG -aU -aY -bm -bC -bO -aJ -aJ -bX -aF -ag -ay -ad -ad -cM -ad -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -nu -ag -ag -ad -az -ad -ad -fu -fu -fu -fu -gj -fu -fu -fu -fu -ag -ag -ag -ad -ad -ad -ad -ad -ad -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(35,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -ac -aB -aE -aG -aG -aG -bn -bD -aF -aF -aF -aB -aB -ag -hd -iW -ad -jh -ad -ad -aL -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -nu -nu -ag -ag -ag -ag -fu -fu -jJ -gY -ga -gk -gq -fw -gK -fu -ag -ag -ag -ag -ad -ad -aL -ad -ad -ad -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(36,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -ac -ac -aB -aE -aN -aE -aE -bu -aE -aE -aE -cz -cD -aB -ag -hd -ad -ad -jm -ad -iW -aL -ag -ag -ag -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -nu -nu -ag -ag -fu -fu -fC -jK -fU -gb -gl -fU -gy -gL -fu -ag -ag -ag -ag -ag -ag -ag -ag -ad -ad -ad -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(37,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -ac -ac -aB -ct -cC -cG -aZ -bv -bo -bo -bo -bo -aE -aB -ag -hd -jk -hj -aA -ad -ad -ad -ad -ag -ag -ag -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -nu -ag -ag -fu -fz -fD -jX -fw -gc -gm -fw -gz -jx -fu -fu -fu -ag -ag -ag -ag -ag -ag -ag -ad -ad -ad -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(38,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -ac -ac -aB -aV -Ob -Ob -bE -bw -bE -bE -bE -bR -aE -aB -ag -ad -ad -ad -aL -ad -jn -ad -ad -ag -ag -ag -ag -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -nu -nu -ag -fu -fz -fE -jX -fw -gd -gd -gd -gz -fw -fu -fw -fu -fu -ag -ag -ag -ag -ag -ag -ag -ad -ad -ad -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(39,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ac -ac -ac -aB -cA -aP -aE -aE -bu -aE -aE -aE -bS -bY -aB -ag -ad -ad -ad -nz -ad -ad -ad -ay -ag -ag -ag -ag -az -ag -ag -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -nu -ag -fu -lG -fF -jX -fw -gd -gd -gd -gz -gX -fu -fw -gX -fu -fu -fu -ag -ag -ag -ag -ag -ad -ad -ad -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(40,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -aa -aa -aa -aa -ad -ac -ac -ac -ac -aB -cA -aP -aP -aP -bx -ca -aB -aB -aB -aB -aB -ag -ad -cM -ad -jk -ad -cM -ay -ag -ag -ag -ag -ag -ad -ag -ag -ag -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -nu -ag -fu -fA -fG -jX -jx -ge -ge -ge -gz -fw -fu -fw -fw -fw -jo -fu -fu -ag -ag -ag -ag -ag -ad -ad -ad -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(41,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ad -ad -aa -aa -aa -ad -ab -ab -ab -ac -ac -aB -cA -aQ -be -bp -by -bF -bP -cu -ms -ms -aT -ag -ad -ad -ad -ad -ad -ad -ay -ag -ag -ag -ag -ad -ad -ag -ag -ag -ag -ag -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -nu -ag -fu -fB -fH -jX -fw -fw -fw -fw -gz -jx -fu -nw -if -fw -jp -gY -fu -fu -ag -ag -ag -ag -ag -ad -ad -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(42,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ad -aa -aa -aa -ad -ac -ac -lS -ac -ac -aB -cA -aQ -bf -bq -bI -cc -bq -bq -bq -bq -aT -ag -ad -ad -ad -ad -ad -ag -ag -ag -ag -ag -ad -ad -ag -ag -ag -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -fu -fu -fu -fu -jY -fu -gf -fu -fu -gA -fu -fu -fw -fw -fw -jq -fw -iA -fu -fu -ag -ag -ag -ag -ad -ad -ad -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(43,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -aa -aa -aa -ad -ac -ac -lS -ac -ac -aB -cA -aQ -bg -bq -bJ -bJ -bq -bq -bq -mt -aT -ag -ag -az -ag -ag -ag -ag -ag -ag -ag -ad -ad -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -fu -ly -fw -gY -jX -fw -fw -fw -fu -gz -fw -fw -fw -fw -fw -he -fw -iA -fw -fu -fu -ag -ag -ag -ag -ad -ad -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(44,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -aa -aa -aa -ab -ac -ac -ab -ac -ac -aB -cA -aR -bh -bq -br -bM -bq -bq -bq -bq -aT -ag -ag -ad -ag -ag -ag -ad -ad -ad -az -ad -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -fu -nw -fw -fw -kc -fw -jx -fw -fu -gB -gM -gM -gM -gM -gM -hf -fw -iA -fw -iK -fu -ag -ag -ag -ag -ad -ad -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(45,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ac -ac -ab -ac -ac -aB -cA -aS -bh -bq -bL -ce -bq -bq -bq -bq -aT -ag -ag -ad -ad -ad -ad -ad -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -fu -fw -fw -fI -kn -fV -fw -fw -fu -gz -fw -fw -fw -fw -fw -gc -fw -fw -fw -jd -fu -ag -ag -ag -ag -ad -ad -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(46,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ac -ac -ab -ac -ac -aB -cA -aQ -bi -bq -bs -bN -bq -bq -bq -bq -aT -ag -ag -ag -ag -ag -ag -ag -cF -cF -cF -cF -cF -cF -cF -cF -ag -ag -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -fu -fw -fw -fw -ko -fw -fw -fw -fu -gz -fw -fw -fw -fw -fw -fw -fw -fw -fw -jd -fu -ag -ag -ag -ag -ad -ad -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(47,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ac -ac -ab -ac -ac -aB -cA -aQ -bh -bq -br -cd -cg -cx -bq -bq -aT -ag -ag -ag -ag -ag -ag -cF -cF -dh -jD -ez -jD -jD -kd -cF -ag -ag -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -dn -dn -dn -dn -dn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -fu -fw -fw -fw -kD -hD -fw -fw -fu -gz -hg -fw -fw -fw -fw -fw -fw -hg -fw -jd -fu -ag -ag -ag -ag -ad -ad -ad -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(48,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -ac -ac -ab -ac -ac -aB -cA -aQ -bh -bq -bK -cf -cm -bM -bq -bq -aT -ag -ag -ag -ag -ag -cF -cF -dh -dh -jD -eA -jD -ka -jD -cF -cF -cF -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -dn -dn -en -fj -iZ -dn -dn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -fu -fw -fw -fw -kE -hD -fw -gX -fu -gC -fu -fu -fu -fu -fu -gf -fu -fu -fu -fu -fu -ag -ag -ag -ad -ad -aL -ad -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(49,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -ac -ac -ac -ab -ac -ac -aB -cA -aT -aT -aT -aT -aT -br -bM -bq -bq -aT -aT -ag -ag -ag -ag -cF -cZ -cZ -jD -jD -eB -jD -dh -ke -jD -jD -cF -dn -dn -dn -dn -dn -mh -mh -mh -mh -mh -mh -mh -mh -dn -ib -ee -fp -ee -ee -dn -mh -mh -mh -mh -mh -mh -mh -dn -dn -dn -dn -dn -fu -fw -fw -fw -kc -fw -fw -gn -fu -hi -fw -gm -fw -nx -fw -fw -gP -fw -fw -fw -fu -ag -ag -ad -ad -ad -ad -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(50,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -ac -ac -ac -ab -ac -ac -aB -cB -cE -cE -cE -cV -aQ -cn -bM -bq -jZ -mo -aT -ag -ag -ag -cF -cF -cZ -di -cb -ey -eC -ey -eF -eK -ey -eO -eR -eS -eS -eS -eS -eS -eS -eT -eS -eS -eS -eS -eS -eS -fd -eS -fi -fs -fi -eS -fd -eS -eS -eS -eS -eS -eS -eS -eT -eS -eS -eS -eS -jy -jH -jH -jI -kG -fw -fw -gn -fu -gE -gN -gN -gN -gZ -fw -fw -hl -fw -fw -gX -fu -ag -ad -ad -ad -ag -ag -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(51,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -ac -ac -ac -ab -ac -ac -aB -aE -aE -aE -aE -cA -aQ -br -cy -mi -lE -mp -aT -ag -ag -cF -cF -dc -cZ -dh -dW -jD -jD -jD -jD -kg -jD -jD -cF -dn -dn -ie -ie -ie -ie -dn -ie -ie -ie -ie -ie -ie -dn -ef -ep -fv -eI -ee -dn -ie -ie -ie -ie -ie -ie -ie -dn -dn -dn -dn -dn -fu -fu -fw -fw -fu -fu -gf -fu -fu -fw -fw -fw -fw -ha -fw -fw -hm -gg -gg -gg -fu -ag -ad -ad -ad -ag -ag -ag -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(52,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -ac -ac -ac -lS -ac -ac -aB -aB -aB -aB -aB -cA -aT -br -bM -bq -jZ -mo -aT -ag -cF -cF -cZ -jv -ny -dh -dW -jD -ka -jD -ka -jD -jD -jD -cF -ac -ac -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -dn -dn -ee -fy -eJ -dn -dn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -fu -fu -fw -fu -fw -fw -gY -fw -jx -fw -jx -fw -fw -fw -fw -hl -fw -fw -fu -fu -ag -ad -ad -ag -ag -ad -ag -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(53,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -ac -ac -ac -lS -ac -ac -ac -ac -ac -ac -aB -cW -aT -br -cy -mi -lE -mp -aT -ag -cF -cU -cZ -cZ -cZ -dh -dW -jD -dh -jD -dh -jD -jD -ki -cF -ac -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -dn -dn -fJ -dn -dn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -fu -fu -fu -nw -fw -fw -fw -fw -fw -jx -fw -fw -fw -fw -gP -fw -fw -fu -ag -ag -ad -ad -ag -ag -ad -ag -ag -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(54,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -ac -ac -ab -ab -ab -ab -ab -ab -ac -ac -aB -cA -aT -br -bM -bq -jZ -mo -aT -cF -cF -db -cZ -cZ -cZ -dj -dW -jD -kb -jD -kb -jD -jD -kj -cF -ac -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mv -fK -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -fu -fu -gg -gg -gr -gg -gO -gg -gW -gg -gO -gr -hn -gg -fu -fu -ag -ag -ad -ad -ag -ad -ad -ag -ag -ag -ad -ad -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(55,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -ac -ab -lR -ab -lT -ab -ab -lR -ab -ac -aB -cA -aT -br -ji -mi -lE -mp -aT -cF -cF -cF -cF -dm -cF -cF -dX -jD -jD -jD -jD -jD -jD -kk -cF -ac -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mv -fK -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -fu -fw -fw -fw -fw -gP -fw -fw -fw -gP -fw -fw -gX -fu -ag -ag -ad -ad -ad -ag -ad -ag -ag -ad -ag -ad -ad -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(56,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -ac -ab -ab -ab -ab -ab -ab -ab -ab -ac -aB -cA -aT -cv -jG -mj -lI -mq -aT -cF -jL -jP -jT -da -kt -cF -dY -cF -cF -jD -jD -jD -jD -kl -cF -ac -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mv -fK -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -fu -fu -fw -fw -fw -gP -fw -fw -if -gP -fw -fw -fu -fu -ag -ag -ad -ad -ad -ag -ad -ag -ag -ad -ag -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(57,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -ac -ab -ab -ab -lU -ab -ab -ab -ab -ac -aB -cA -aT -br -bq -bq -lX -mr -aT -cF -cI -cH -cH -cH -cH -jA -dZ -eG -cF -cF -jD -jD -jD -km -cF -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -eb -eb -fL -eb -eb -eb -eb -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -fu -nw -fw -fw -gP -fw -fw -fw -gP -fw -fw -fu -ag -ag -ad -ad -ad -ag -ag -ad -ad -ad -ad -ag -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(58,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -ac -ab -ab -lR -ab -ab -ab -ab -ab -ac -aB -cA -aT -cv -jG -mj -lI -mq -aT -cF -jM -jQ -jU -da -cH -cL -ea -cS -cH -cF -jD -jD -jD -cF -cF -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -eb -eb -eh -fM -fR -gV -ja -eb -eb -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -fu -fu -fu -fw -gP -gU -gU -gU -gP -hg -fu -fu -ag -ad -ad -ad -ag -ag -ad -ad -ag -ad -ag -ag -ad -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(59,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ac -ac -ac -ab -ab -lV -ab -lR -ab -ab -ac -aB -cA -aT -br -bq -bq -lX -mr -aT -cF -cF -cF -cF -cH -cH -jB -ej -jB -cH -cF -oY -jD -kd -cF -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mv -ih -eg -fK -eg -fP -jb -fl -eb -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -fu -fu -fu -fu -gU -fu -fu -fu -fu -ag -ag -ad -ad -ag -ag -ag -ad -ag -ag -ad -ag -ag -ad -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(60,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ab -ac -ac -ac -ab -ab -ab -ab -ab -ac -ac -aB -cA -aT -cw -jG -mj -lI -mq -aT -dk -dk -dk -cF -cH -cH -cH -eo -cH -cH -lH -oY -jD -ku -cF -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mv -iX -eg -fN -mN -hb -jc -fm -eb -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -bb -cs -cs -cs -ag -ag -ag -ad -ag -ag -ag -ag -ad -ad -ag -ad -ag -ag -ad -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(61,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ac -ac -ac -ab -lN -ac -ac -ac -ac -ac -aB -cW -aT -bq -bq -bq -lX -mr -aT -cF -cF -cF -cF -cH -cH -cF -dY -cF -cF -cF -oY -jD -cF -cF -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mv -lw -eg -fK -eg -fK -eg -kw -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -cs -ag -ag -ag -ad -ag -ag -co -ag -ag -ad -ag -ad -ag -ag -ad -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(62,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ab -ac -ac -ab -lO -ac -ac -ac -ax -ax -ax -cX -ax -ax -ax -aT -aT -aT -aT -cF -jN -jR -jV -da -cH -cF -et -kp -kq -cF -jD -cF -cF -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -eb -eh -eq -fO -eL -fK -ja -eg -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -cs -ag -ag -ag -ad -ag -ag -iR -ag -ag -ad -ag -ad -ag -ag -ad -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(63,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ab -ac -ac -ab -ab -ac -ac -ax -ax -lk -ll -cY -aD -aD -ax -ag -ag -ag -ag -cF -cI -cH -cH -cH -cH -cF -eu -kp -kp -cF -lv -cF -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mv -iY -eg -fP -eg -fK -jb -eg -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -cs -ag -ag -ag -ad -ag -ag -ad -ad -ag -ad -ag -iS -ag -ag -ad -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(64,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ac -ac -lS -ac -ac -ax -ax -aC -aD -lm -cY -aD -aD -ax -ax -ag -ag -ag -cF -jO -jS -jW -da -cH -jC -eu -kp -kr -cF -cF -cF -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -eb -eb -eg -fQ -eg -fK -jc -eb -eb -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -cs -cs -ag -ag -ig -ag -ag -ag -ad -ad -ad -ag -lL -ag -ag -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(65,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ac -ac -lS -ac -ac -ax -le -aD -aD -aD -cY -aD -aD -lq -ax -ag -ag -ag -cF -cF -cF -cF -lH -cF -cF -dY -cF -cF -cF -cF -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -eb -eb -eb -eb -fL -eb -eb -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -cs -ag -ag -ag -ag -ag -ag -ag -ad -ag -ag -ag -ag -ad -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(66,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ac -ac -ab -ac -ac -ax -le -aD -aD -bt -dg -ch -aD -lq -ax -ag -ag -ag -cF -ks -kB -kB -lP -cH -kN -ev -kA -lu -hZ -aa -aa -aa -aa -aa -aa -aa -aa -aa -de -de -de -de -de -de -aa -aa -aa -aa -aa -aa -aa -mv -fK -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -jz -ag -ag -ag -ag -ag -ag -ag -ad -ag -ag -ag -ag -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(67,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ac -ac -ab -ac -ax -ax -lf -lh -lh -lA -cY -aD -aD -cj -ax -ag -ag -ag -cF -cO -cH -cH -cH -cH -kO -ew -cH -cH -hZ -aa -aa -aa -aa -aa -aa -aa -aa -aa -de -la -dp -UU -dJ -de -de -aa -aa -aa -aa -aa -aa -mv -fK -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -cs -cs -hU -ag -ad -ad -ad -ad -ad -ad -ad -ag -ag -ag -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(68,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ac -ab -ac -ax -lb -aD -cr -ln -lB -cY -aD -aD -aD -ax -ax -ax -ax -cF -cO -cH -cH -cH -cH -cH -eo -cH -cH -hZ -aa -aa -aa -aa -aa -aa -aa -aa -de -de -dp -uO -dp -dD -dp -de -aa -aa -aa -aa -aa -aa -mv -fK -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -cT -ag -ag -ag -ag -ag -ag -ad -ag -ag -ag -ag -ag -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(69,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ac -ab -ac -ax -lc -aD -aD -aD -bj -dl -do -dq -dq -dr -dq -dq -dq -ds -fx -dt -du -dy -du -du -ex -cH -dd -cF -aa -aa -aa -aa -aa -aa -aa -aa -de -kY -dp -dG -kT -dG -kW -de -aa -aa -aa -aa -aa -aa -mv -fK -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -cT -ag -ag -ag -ad -aL -ag -ad -ag -ag -ag -ag -ag -ad -ad -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(70,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ac -ab -ac -ax -ld -aD -aD -aD -cK -aD -aD -aD -aD -ax -ax -ax -ax -cF -kC -kC -kF -bA -kL -cH -cH -cH -cH -hZ -aa -aa -aa -aa -aa -aa -aa -aa -kX -kZ -vK -dL -TZ -dL -OO -de -aa -aa -aa -aa -aa -aa -mv -fK -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -cT -ag -ag -ag -ad -ad -ag -ad -ag -ag -ag -ad -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(71,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ac -ab -ac -ax -lc -aD -aD -aD -cK -aD -aD -lp -lp -ax -ac -ac -ac -cF -cP -cH -cH -bZ -kM -cH -cH -cH -lP -de -ia -ia -ia -ia -ia -ia -ia -ia -de -ve -dp -dD -dC -dD -pl -de -aa -aa -aa -aa -aa -aa -mv -fK -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(72,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ag -ab -ac -ax -ax -lg -lg -lg -cK -lg -lo -ax -ax -ax -ac -ac -ac -cF -ky -cH -cH -dE -du -du -du -du -wl -eD -eH -eH -eH -eQ -eH -eH -eH -eH -FA -Qq -eH -eU -eV -dG -kT -de -aa -aa -aa -aa -aa -aa -mv -fK -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ad -ad -ad -ad -ad -ad -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(73,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ag -ad -ac -ac -ax -ax -lj -lr -cN -ls -lt -ax -ac -ac -ac -ac -ac -cF -kz -cH -cH -cH -cH -cH -kP -kQ -df -de -ic -ic -ic -ic -ic -ic -ic -ic -de -EO -EB -dL -eW -dL -dM -de -aa -aa -aa -aa -aa -aa -mv -fK -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ad -ad -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(74,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ad -ac -ac -ac -ax -ax -ax -ax -ax -ax -ax -ac -ac -ac -ac -ac -cF -cI -kB -cH -cH -cH -cH -df -dO -go -aa -aa -aa -aa -aa -aa -aa -aa -aa -de -La -OO -dp -eX -dp -gI -de -aa -aa -aa -aa -aa -aa -mv -fK -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(75,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ad -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -cF -kA -kA -kA -cR -cH -df -go -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -de -de -dz -kS -eY -kI -de -de -aa -aa -aa -aa -aa -aa -mv -fK -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(76,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -cF -cF -cF -cF -cF -dO -go -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -de -de -de -de -de -de -aa -aa -aa -aa -aa -aa -aa -eb -hc -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(77,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ac -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mv -fK -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(78,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ag -ac -ac -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mv -fK -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(79,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ag -ac -ac -ac -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -mv -fK -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(80,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ac -ac -ab -ab -ab -lS -lS -ab -ac -ac -ac -ac -ac -ac -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -mv -fK -mx -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(81,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ag -ag -ac -ac -ac -ac -ac -ac -ac -ab -ab -ac -ac -ac -ac -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -mv -fK -eb -ac -ac -aa -aa -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(82,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ac -ac -ac -ac -ac -ac -ac -ac -ab -ac -ac -ac -aa -aa -aa -aa -aa -aa -aa -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ac -eb -fK -eb -ac -ac -aa -aa -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(83,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ac -ac -ac -ac -ac -ac -ac -ad -ac -ac -aa -aa -aa -aa -aa -aa -ag -ag -ad -ad -aa -aa -aa -aa -ad -ag -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ac -eb -fK -eb -ac -ac -ac -aa -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(84,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -aa -aa -aa -aa -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -eb -fK -eb -ac -ac -ac -ac -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(85,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -aa -aa -aa -aa -aa -aa -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -eb -hc -eb -ac -ac -ac -ac -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(86,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -mv -fK -eb -ac -ac -ac -ac -ac -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(87,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -mv -fK -eb -ac -ac -ac -ac -ac -ac -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(88,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -mv -fK -eb -ac -ac -ac -ac -ac -ac -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(89,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -aa -aa -aa -aa -aa -aa -aa -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -dN -ml -ml -dN -ml -dN -hk -dN -ac -ac -ac -ac -ac -ac -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(90,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -ad -ad -lQ -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -dN -ml -ml -dN -kv -dR -er -dR -dR -hV -dN -ac -ac -ac -ac -ac -ac -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(91,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ad -aa -aa -aa -aa -aa -aa -aa -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -mk -dR -iF -dV -ec -dR -dR -dR -dR -hW -dN -dN -dN -ac -ac -ac -ac -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -hS -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(92,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -mk -dR -iG -dR -ei -dR -dR -dR -dR -hV -dR -kx -dN -ac -ac -ac -ac -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(93,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -mk -dR -iH -dR -ec -ek -cp -io -iy -hX -iu -iv -dN -ac -ac -ac -ac -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -gQ -Yg -ho -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(94,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -aa -aa -aa -ad -aa -ad -lW -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -mk -dR -dR -dR -ei -es -ik -ik -ik -hY -dR -dR -dN -ac -ac -ac -ac -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -gt -mR -gR -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(95,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -mk -dR -iF -dR -ec -eM -il -il -iq -ij -dR -lF -dN -ac -ac -ac -ac -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -gt -gG -gR -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(96,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -mk -dR -iG -dR -ec -fa -im -im -im -in -dR -dR -dN -fq -fq -fq -fq -my -my -my -my -my -my -my -my -my -my -my -my -my -my -gu -gH -gu -my -my -my -my -my -my -fq -my -my -my -my -my -fq -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(97,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -aa -aa -aa -aa -aa -ab -ab -ab -dw -dH -dH -dH -dA -dS -iH -dR -ec -fb -ik -fn -ik -hY -dR -dR -fo -PF -lY -fr -fr -fr -ma -fr -fr -fr -fr -fr -fr -fr -fr -fr -fr -fr -fr -gv -id -gS -fr -fr -fr -fr -fr -fr -hq -fr -fr -lY -fr -hQ -fq -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(98,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -dx -dI -dP -dA -mm -dR -dR -dR -ec -mu -mw -mM -mO -ck -ix -ix -jE -SX -jF -jF -jF -jF -kH -jF -jF -jF -jF -jF -jF -jF -jF -jF -jF -jF -jF -kH -kJ -kR -kU -kU -kU -kV -hh -hh -hh -hh -hh -hF -hN -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(99,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -dv -dA -dR -dQ -mg -mn -dT -dT -dT -dT -dT -dT -dT -eN -hV -dR -dR -fo -PF -fr -ft -fr -fr -Ax -fr -fr -fr -fr -ft -fr -fr -fr -fr -fr -fr -fr -gx -fr -fr -ft -fr -fr -lK -fr -fr -fr -fr -fr -hG -hO -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(100,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ak -aa -aa -aa -ak -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -fW -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -dB -dK -dK -dK -dA -dR -dR -dR -dR -dR -dR -dR -dR -hV -dR -dR -dN -fq -fq -fq -fq -fq -mz -mz -mz -mz -mz -fq -mz -mz -mz -mz -mz -mz -mz -mz -mz -mz -mz -mz -mz -fq -mz -mz -mz -mz -gu -hG -hO -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(101,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -af -ae -aa -md -ai -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -mk -ip -dR -dR -dR -iF -dR -iF -dR -hV -dR -dR -dN -ag -ag -ag -ag -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mC -hG -hO -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(102,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ai -ai -md -ae -md -ai -ai -ae -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -mk -iC -dR -dR -dR -iG -dR -iG -dR -hV -dR -dF -dN -ag -ag -ag -ag -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mC -hG -hO -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(103,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ae -ai -ah -as -au -ah -ah -ai -ae -ae -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -mk -iD -dR -ci -fg -fh -fg -fh -fg -is -dR -dN -dN -ag -ag -ag -ag -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mC -mb -mc -hR -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(104,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ah -ah -ah -ah -at -ap -ar -ah -ah -ae -ae -ae -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -ad -ab -ab -ab -ag -ag -ag -ag -ag -ag -dN -iE -dU -fc -dR -dR -dR -dR -ci -it -dR -dN -ag -ag -ag -ag -ag -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mC -hG -hO -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(105,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ah -ap -ap -ao -ba -ap -ai -kK -ah -ah -ai -ae -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -ad -ab -ag -ag -ag -ag -ag -ag -ag -ag -dN -dN -dN -dN -dR -dR -dU -GP -fS -ne -lx -dN -ag -ag -ag -ag -ag -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mF -hH -hO -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(106,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ah -ap -al -ap -ap -ap -ap -ap -me -ah -ae -ai -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -dN -dN -dN -dN -dN -fT -dN -dN -dN -ag -ag -ag -ag -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mC -hG -hO -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(107,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ah -ap -am -aq -ap -ap -ap -ap -ai -au -ai -ai -ak -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ed -gw -ed -ag -ag -ag -ag -ag -ag -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mC -hG -hO -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(108,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ah -ap -an -ap -eZ -ai -ai -ai -mf -ah -ae -ai -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ag -nb -ad -nt -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ed -gw -ed -ag -ag -ag -ag -ag -ag -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mC -hG -hO -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(109,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ah -ap -ap -ap -ap -ap -ap -lJ -ah -ah -ai -ae -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ag -ag -ad -ad -ad -ad -ag -ag -ag -ag -ag -ag -ag -ed -ed -ed -ed -gJ -ed -ed -ed -ed -ag -ag -ag -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mB -mE -gu -hG -hO -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(110,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ah -ah -ah -ah -av -cJ -aw -ah -ah -ai -ae -ae -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ag -ad -ad -ad -ad -ag -ag -ag -ag -ag -ag -ff -ed -el -iU -Cn -gT -iw -iz -iI -ed -ag -ag -ag -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mC -lz -hx -hI -nB -fr -gu -iP -iP -iP -iP -nL -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(111,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aj -aj -ah -ah -ah -ah -ah -aj -aj -ae -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ag -ad -ad -ag -ag -az -ag -ag -ag -ag -ag -ff -ff -ed -gD -em -lD -mT -hr -iB -gD -ed -ag -ag -ag -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mC -fr -hy -hJ -nE -fr -mL -gu -nI -nF -nK -nM -eE -nN -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(112,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ad -ad -ad -ag -ag -ad -ag -ag -ag -ag -ag -ff -ff -ed -gD -em -em -em -nf -iB -gD -ed -ag -ag -ag -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mC -nA -hz -hJ -nG -nH -nD -nC -hM -nJ -gu -QN -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(113,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aj -aj -aj -aj -aj -aj -aj -aj -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ag -ad -ag -ag -ag -ag -ad -ag -ag -ag -ag -ag -ff -ff -ed -gD -em -gF -fk -hw -iM -gD -ed -ag -ag -ag -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mC -nA -hA -hJ -hO -fr -gu -iO -iO -iO -iO -nL -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(114,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ag -ag -ag -ag -ad -ag -ag -ag -ag -ag -ff -ff -ed -ed -ed -ed -ed -ed -ed -ed -ed -ag -ag -ag -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mC -ht -hB -hJ -hO -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(115,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ag -az -ag -ag -ag -ag -ag -ff -ff -ff -ff -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mC -hu -hC -hJ -hO -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(116,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ag -ad -ad -ad -ad -ag -ag -ff -ff -ff -ff -ag -ag -ag -ag -ag -ag -ff -ff -ff -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mD -mz -gu -hJ -hO -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(117,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ad -np -ag -ag -ad -ag -ag -ad -ag -ag -ag -ff -ff -ff -ff -ff -ag -ag -ff -ff -ff -ff -ff -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mC -hJ -hO -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(118,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -nb -nq -ad -ad -ad -ag -ag -ad -ad -ag -ag -ff -ff -ff -ff -ff -ag -ag -ff -ff -ff -ff -ff -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -fq -hK -hO -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(119,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -jg -nr -ns -ag -ad -ag -ag -ag -ad -ag -ag -ag -ag -ag -ff -ff -ag -ag -ff -ff -ff -ff -ff -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mC -hJ -hO -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(120,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -np -np -np -ag -ad -ag -ag -ag -ad -ag -ag -ag -ag -ag -ff -ff -ag -ag -ff -ff -ff -ad -ad -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mC -hL -hP -hR -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(121,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ad -ag -ag -ag -ad -az -ad -ad -ad -ag -ad -ag -ag -ag -ag -ag -ag -az -ag -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mC -hJ -fr -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(122,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ad -ad -ag -ag -ag -ag -ag -ag -ad -az -ad -ag -ag -ag -ag -ag -ad -ad -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -hp -hs -iP -iP -iP -iL -hJ -fr -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(123,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ad -ad -ag -ag -ag -ag -ag -ag -ag -ad -ag -ag -ag -ag -ag -nv -ag -ag -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -Uv -hv -iQ -mI -iL -mL -hJ -fr -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(124,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ag -ad -ag -nm -nb -ni -ag -ag -ag -ad -ag -ag -ag -ag -ag -ad -ag -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -QN -iL -fr -mJ -mK -mP -hM -fr -fr -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(125,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ag -ad -ad -ad -fe -np -nj -ag -ag -ad -az -iR -ad -ad -az -ad -ag -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mA -iO -iO -iO -iO -iL -fr -fr -lZ -mG -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(126,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ag -ad -ns -nb -nh -fZ -ag -ag -ff -ag -ag -ag -ag -ag -ag -ag -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -mQ -mz -mz -mz -mH -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(127,1,1) = {" -aa -aa -aa -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ag -ag -nk -np -nn -gs -ag -ag -ff -ag -ag -ag -ag -ag -aa -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(128,1,1) = {" -aa -aa -ag -ag -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ff -ag -ag -ag -aa -aa -aa -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -hT -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(129,1,1) = {" -aa -ag -ag -mS -ad -ad -ad -mS -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ag -ag -ag -az -ag -aa -aa -aa -aa -aa -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(130,1,1) = {" -aa -ag -ad -ad -mU -mU -mU -ad -ad -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ag -ag -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(131,1,1) = {" -aa -ag -ad -mU -mU -mW -mU -mU -ad -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(132,1,1) = {" -aa -ag -ad -mU -mZ -mX -mU -mU -ad -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(133,1,1) = {" -aa -ag -ad -mU -na -mU -mU -mU -ad -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(134,1,1) = {" -aa -ag -ad -mU -eP -mY -mU -mU -ad -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(135,1,1) = {" -aa -ag -ad -mU -mU -mU -mU -mU -ad -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(136,1,1) = {" -aa -ag -ad -ad -mU -mU -mU -ad -ad -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(137,1,1) = {" -aa -ag -ag -mS -ad -ad -ad -mS -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(138,1,1) = {" -aa -aa -ag -ag -ad -ad -ad -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(139,1,1) = {" -aa -aa -aa -ag -ag -ag -ag -ag -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} -(140,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -"} diff --git a/maps/submaps/surface_submaps/plains/priderock.dmm b/maps/submaps/surface_submaps/plains/priderock.dmm index 1b2246d2af..5f8f432b60 100644 --- a/maps/submaps/surface_submaps/plains/priderock.dmm +++ b/maps/submaps/surface_submaps/plains/priderock.dmm @@ -50,7 +50,7 @@ "Tb" = (/obj/structure/railing,/turf/simulated/floor/outdoors/dirt,/area/submap/priderock) "Td" = (/obj/structure/cliff/automatic{dir = 10},/obj/structure/railing,/obj/structure/railing{dir = 8},/turf/simulated/floor/outdoors/dirt,/area/submap/priderock) "Ud" = (/obj/effect/decal/cleanable/dirt,/obj/random/junk,/turf/simulated/floor/outdoors/dirt,/area/submap/priderock) -"UG" = (/obj/vehicle/train/engine/quadbike/random{desc = "A rideable electric ATV designed for all terrain. Looks very worn down."; locked = 1; name = "Old looking ATV"},/turf/simulated/floor/outdoors/dirt,/area/submap/priderock) +"UG" = (/obj/vehicle/train/engine/quadbike/random{desc = "A rideable electric ATV designed for all terrain. Looks very worn down."; locked = 0; name = "Old looking ATV"},/turf/simulated/floor/outdoors/dirt,/area/submap/priderock) "VF" = (/obj/structure/cliff/automatic{dir = 5},/obj/structure/railing{dir = 1},/obj/structure/railing{dir = 4},/turf/simulated/floor/outdoors/dirt,/area/submap/priderock) "VM" = (/obj/structure/loot_pile/maint/trash,/turf/template_noop,/area/submap/priderock) "Wk" = (/turf/simulated/floor/outdoors/dirt,/area/submap/priderock) diff --git a/maps/tether/submaps/_tether_submaps.dm b/maps/tether/submaps/_tether_submaps.dm index 45f844115f..9c804b2390 100644 --- a/maps/tether/submaps/_tether_submaps.dm +++ b/maps/tether/submaps/_tether_submaps.dm @@ -58,7 +58,6 @@ #include "../../submaps/admin_use_vr/ert.dm" #include "../../submaps/admin_use_vr/mercship.dm" -#include "../../submaps/admin_use_vr/guttersite.dm" /datum/map_template/admin_use/ert name = "Special Area - ERT" @@ -100,11 +99,6 @@ desc = "Sneaky" mappath = 'maps/submaps/admin_use_vr/dojo.dmm' -/datum/map_template/admin_use/guttersite - name = "Special Area - Guttersite" - desc = "A space for bad guys to hang out" - mappath = 'maps/submaps/admin_use_vr/guttersite.dmm' - ////////////////////////////////////////////////////////////////////////////// //Rogue Mines Stuff diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm index c5a31f2f13..8697685e25 100644 --- a/maps/tether/submaps/tether_misc.dmm +++ b/maps/tether/submaps/tether_misc.dmm @@ -1222,6 +1222,20 @@ /obj/structure/closet/alien, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm6) +"dD" = ( +/obj/effect/step_trigger/teleporter/random{ + affect_ghosts = 1; + name = "escapeshuttle_leave"; + teleport_x = 25; + teleport_x_offset = 245; + teleport_y = 25; + teleport_y_offset = 245; + teleport_z = 4; + teleport_z_offset = 4 + }, +/turf/space, +/turf/space/transit/north, +/area/space) "dE" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -1661,20 +1675,17 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) -"fg" = ( -/obj/effect/step_trigger/teleporter/random{ - affect_ghosts = 1; - name = "escapeshuttle_leave"; - teleport_x = 25; - teleport_x_offset = 245; - teleport_y = 25; - teleport_y_offset = 245; - teleport_z = 4; - teleport_z_offset = 4 +"fi" = ( +/obj/structure/bed/chair/sofa/bench/right{ + padding_color = "#99AAFF" }, -/turf/space, -/turf/space/transit/north, -/area/space) +/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,31 @@ }, /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/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/obj/structure/table/standard, +/obj/random/forgotten_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 +2254,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 +2264,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 +2339,31 @@ }, /turf/unsimulated/floor/steel, /area/centcom/control) +"nz" = ( +/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/shuttle_padded{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "nB" = ( -/obj/structure/bed/chair/shuttle{ - dir = 8 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) -"nC" = ( -/obj/structure/bed/chair/shuttle{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) +/obj/machinery/vending/snack, +/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 +2371,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/shuttle_padded{ + dir = 4 + }, +/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 +2419,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 +2445,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 +2473,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 +2512,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/shuttle_padded{ + dir = 8 + }, +/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 +2544,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 +2579,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 +2638,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/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/obj/structure/table/standard, +/obj/item/weapon/storage/firstaid/toxin, +/obj/item/weapon/storage/firstaid/o2, +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) +"tL" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/obj/structure/bed/chair/shuttle_padded{ + dir = 4 + }, +/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 +2709,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 +2750,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 +2815,18 @@ }, /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/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" }, -/obj/structure/grille, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/escape) +/obj/random/forgotten_tram, +/obj/structure/table/standard, +/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 +2897,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 +2936,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 +2944,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 +2999,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 +3017,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 +3032,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 +3055,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 +3072,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 +3081,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 +3096,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 +3111,33 @@ }, /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/shuttle_padded{ + dir = 4 + }, +/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 +3149,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 +3158,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 +3184,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 +3201,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 +3254,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 +3278,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 +3303,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 +3388,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 +3433,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 +3451,17 @@ /obj/item/toy/chess/bishop_white, /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) -"Mq" = ( -/obj/machinery/light{ +"Mm" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/obj/structure/bed/chair/shuttle_padded{ dir = 8 }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel, -/area/shuttle/escape) +/turf/simulated/floor/tiled, +/area/shuttle/escape{ + base_turf = /turf/simulated/floor/tiled/techfloor/grid + }) "MB" = ( /obj/machinery/sleeper{ dir = 4 @@ -3458,6 +3489,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 +3536,29 @@ }, /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 + }) +"ND" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" + }, +/obj/machinery/vending/cola/soft{ + dir = 1 + }, +/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 +3567,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 +3603,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 +3612,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 +3622,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 +3717,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 +3739,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 +3765,25 @@ }, /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/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tram" }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/escape) -"RE" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/structure/table/standard, +/obj/item/weapon/storage/firstaid/toxin, +/obj/item/weapon/storage/firstaid/o2, +/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/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/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 +3797,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 +3810,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 +3854,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 +3906,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 +4075,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 +4145,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 +4319,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 +4485,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 +4629,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 +4657,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 +4759,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 +4806,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 +4858,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 +4938,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 +4947,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 +4968,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 +5017,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 +5096,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 +5385,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 +5515,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 +5533,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 +9961,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 +10103,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 +10245,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 +10396,11 @@ FT Sh Sh Sh +Sh +Sh +FT +FT +gv FT FT FT @@ -10531,12 +10414,7 @@ FT FT FT FT -FT -FT -FT -FT -FT -FT +Sh Sh Sh Sh @@ -10659,6 +10537,9 @@ cq cq vu vu +vu +vu +vu cq cq cq @@ -10675,11 +10556,8 @@ cq cq cq cq -cq -cq -cq -cq -cq +vu +vu vu vu cq @@ -10800,6 +10678,10 @@ FT FT FT Sh +Sh +Sh +Sh +Sh FT FT FT @@ -10816,13 +10698,9 @@ FT FT FT FT -FT -FT -FT -FT -FT -FT -FT +Sh +Sh +Sh Sh FT FT @@ -10942,6 +10820,10 @@ FT FT FT Sh +Sh +Sh +Sh +Sh FT FT FT @@ -10958,13 +10840,9 @@ FT FT FT FT -FT -FT -FT -FT -FT -FT -FT +Sh +Sh +Sh Sh FT FT @@ -11084,6 +10962,10 @@ FT FT FT Sh +Sh +Sh +Sh +Sh FT FT FT @@ -11100,13 +10982,9 @@ FT FT FT FT -FT -FT -FT -FT -FT -FT -FT +Sh +Sh +Sh Sh FT FT @@ -11226,6 +11104,10 @@ FT FT FT Sh +Sh +Sh +Sh +Sh FT FT FT @@ -11242,13 +11124,9 @@ FT FT FT FT -FT -FT -FT -FT -FT -FT -FT +Sh +Sh +Sh Sh FT FT @@ -11368,6 +11246,10 @@ FT FT FT Sh +Sh +Sh +Sh +Sh FT FT FT @@ -11384,13 +11266,9 @@ FT FT FT FT -FT -FT -FT -FT -FT -FT -FT +Sh +Sh +Sh Sh FT FT @@ -11511,6 +11389,9 @@ cq cq vu vu +vu +vu +vu cq cq cq @@ -11527,11 +11408,8 @@ cq cq cq cq -cq -cq -cq -cq -cq +vu +vu vu vu cq @@ -11654,6 +11532,8 @@ FT Sh Sh Sh +Sh +Sh FT FT FT @@ -11670,9 +11550,7 @@ FT FT FT FT -FT -FT -FT +Sh Sh Sh Sh @@ -11787,47 +11665,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 +11807,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 +11949,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 @@ -15293,10 +15171,10 @@ Jz Jz Jz Jz -fg -fg -fg -fg +dD +dD +dD +dD iO El El @@ -15438,7 +15316,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -15580,7 +15458,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -15722,7 +15600,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -15864,7 +15742,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -16006,7 +15884,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -16148,7 +16026,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -16290,7 +16168,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -16432,7 +16310,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -16574,7 +16452,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -16716,7 +16594,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -16795,35 +16673,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 @@ -16858,7 +16736,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -16937,35 +16815,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 @@ -17000,7 +16878,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -17079,35 +16957,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 @@ -17142,7 +17020,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -17222,33 +17100,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 @@ -17284,7 +17162,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -17364,33 +17242,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 @@ -17426,7 +17304,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -17506,33 +17384,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 @@ -17568,7 +17446,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -17650,29 +17528,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 @@ -17710,7 +17588,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -17792,29 +17670,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 @@ -17852,7 +17730,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -17934,29 +17812,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 +nB +IN +IN +IN +Lm +tV +Pn +Lm +tV +Pn +IN +IN +IN +ND +ZE +ET +ET +ET ET ET sT @@ -17994,7 +17872,7 @@ jf Gs Gs Gs -fg +dD iO El El @@ -18076,29 +17954,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 @@ -18113,30 +17991,30 @@ ae ap ap ap -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg -fg +dD +dD +dD +dD +dD +dD +dD +dD +dD +dD +dD +dD +dD +dD +dD +dD +dD +dD +dD +dD +dD +dD +dD +dD iO El El @@ -18216,33 +18094,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 +18236,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 +Mm +IN +ZE +Lu +NC +Pr +Fz +NC +Pr +Fz +TO +ZE +IN +Mm +ZE +sN +sN +sN +sN +sN sT ae ae @@ -18506,22 +18384,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 +18526,7 @@ Rc zv pX pX +pX LD NA NA @@ -18661,7 +18540,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..76a66b19ab 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{ @@ -33125,6 +33125,13 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) +"gQH" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/crew_quarters/visitor_laundry) "gVe" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -39200,11 +39207,11 @@ aah aah yiS aHo +aHL +aHL aad -aad -aad -aad -aad +aHL +aHL aad aad aad @@ -39342,13 +39349,13 @@ aah aah yiS aah +aHL aad aad +aHL aad aad -aad -aad -aad +aHL aad aad aad @@ -39484,7 +39491,7 @@ aah aah yiS aah -aad +aHL aad aad aad @@ -39628,10 +39635,10 @@ yiS aah aah aad +aHL aad aad -aad -aad +aHL aad aad aad @@ -39772,8 +39779,8 @@ aah aad aad aad -aad -aad +aHL +aHL aad aad aad @@ -39917,7 +39924,7 @@ aad aad aad aad -aad +aHL aad aad aad @@ -40055,11 +40062,11 @@ aah baU baU aad +aHL aad aad aad -aad -aad +aHL aad aHL aad @@ -40199,7 +40206,7 @@ baU aad aad aad -aad +aHL aad aad aad @@ -40486,7 +40493,7 @@ aad aad aad aad -aad +aHL aad aad aad @@ -40625,7 +40632,7 @@ baU aad aad aad -aad +aHL aad aad aad @@ -54990,7 +54997,7 @@ rnt aUP aUP sch -aWn +gQH baU baU baU @@ -55657,16 +55664,15 @@ aFU atA atA atA -atA aJp aub aub aub +aub wXW atA atA atA -atA mtl auc auc @@ -55674,6 +55680,7 @@ auc auc auc auc +auc auD aad aad @@ -55796,13 +55803,13 @@ aud aud aud aud +aua aud aud aud aud aud aud -aJq aud aud aud @@ -55930,34 +55937,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 +56079,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 +56789,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 +56931,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 +57073,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 +57214,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 +57356,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 +57498,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-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index c9d89ca3bb..b439b014b2 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -26085,100 +26085,71 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) "aUL" = ( -/obj/effect/floor_decal/corner/purple{ - dir = 5 +/obj/effect/floor_decal/borderfloor{ + dir = 9 }, -/obj/effect/floor_decal/borderfloor/shifted{ - dir = 1 +/obj/effect/floor_decal/corner/purple/border{ + dir = 9 }, -/obj/effect/floor_decal/corner/purple/border/shifted{ - dir = 1 - }, -/obj/machinery/camera/network/civilian, -/obj/structure/closet/jcloset, +/obj/machinery/vending/wardrobe/janidrobe, /turf/simulated/floor/tiled, /area/janitor) "aUM" = ( /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/effect/floor_decal/borderfloor/shifted{ +/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/effect/floor_decal/corner/purple/border/shifted{ +/obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/effect/floor_decal/corner/purple{ - dir = 5 - }, -/obj/machinery/vending/wardrobe/janidrobe, /turf/simulated/floor/tiled, /area/janitor) "aUN" = ( -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/effect/floor_decal/borderfloor/shifted{ +/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/effect/floor_decal/corner/purple/border/shifted{ +/obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/effect/floor_decal/corner/purple{ - dir = 5 +/obj/structure/sink/kitchen{ + pixel_y = 22 }, /turf/simulated/floor/tiled, /area/janitor) "aUO" = ( -/obj/effect/floor_decal/borderfloor/shifted{ - dir = 1 - }, -/obj/effect/floor_decal/corner/purple/border/shifted{ - dir = 1 - }, -/obj/effect/floor_decal/corner/purple{ - dir = 5 - }, /obj/structure/janitorialcart, -/obj/structure/sink/kitchen{ - pixel_y = 28 +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/janitor) "aUP" = ( /obj/structure/janitorialcart, -/obj/effect/floor_decal/borderfloor/shifted{ - dir = 1 - }, -/obj/effect/floor_decal/corner/purple/border/shifted{ - dir = 1 - }, -/obj/effect/floor_decal/corner/purple{ - dir = 5 - }, /obj/machinery/alarm{ pixel_y = 22 }, /obj/machinery/light{ dir = 1 }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/janitor) "aUQ" = ( /obj/structure/janitorialcart, -/obj/effect/floor_decal/borderfloor/shifted{ - dir = 1 +/obj/effect/floor_decal/borderfloor{ + dir = 5 }, -/obj/effect/floor_decal/corner/purple/border/shifted{ - dir = 1 - }, -/obj/effect/floor_decal/corner/purple{ +/obj/effect/floor_decal/corner/purple/border{ dir = 5 }, /turf/simulated/floor/tiled, @@ -26359,36 +26330,28 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) "aVu" = ( -/obj/machinery/button/remote/blast_door{ - id = "janitor_blast"; - name = "Desk Shutters"; - pixel_x = -22 - }, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/purple/border{ dir = 8 }, +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/super; + dir = 8; + name = "west bump"; + nightshift_setting = 2; + pixel_x = -30 + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/tiled, /area/janitor) "aVv" = ( /turf/simulated/floor/tiled, /area/janitor) -"aVw" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled, -/area/janitor) -"aVx" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/janitor) "aVy" = ( /obj/structure/cable{ d1 = 4; @@ -27078,6 +27041,7 @@ "aWr" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/purple/bordercorner, +/obj/structure/closet/jequipcloset, /turf/simulated/floor/tiled, /area/janitor) "aWs" = ( @@ -27510,7 +27474,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/light_switch{ dir = 4; - pixel_x = -28 + pixel_x = -31 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -27524,6 +27488,11 @@ /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 10 }, +/obj/machinery/button/remote/blast_door{ + id = "janitor_blast"; + name = "Desk Shutters"; + pixel_x = -22 + }, /turf/simulated/floor/tiled, /area/janitor) "aXj" = ( @@ -27784,9 +27753,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 25 - }, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -27798,15 +27764,16 @@ /obj/item/weapon/grenade/chem_grenade/cleaner, /obj/item/weapon/grenade/chem_grenade/cleaner, /obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, /obj/item/weapon/reagent_containers/spray/cleaner, /obj/item/weapon/reagent_containers/spray/cleaner, /obj/item/weapon/reagent_containers/spray/cleaner, /obj/item/weapon/soap/nanotrasen, /obj/item/weapon/soap/nanotrasen, /obj/item/weapon/soap/nanotrasen, +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, /turf/simulated/floor/tiled, /area/janitor) "aXT" = ( @@ -48962,7 +48929,7 @@ aLY aTe aUc aUM -aVv +aVy aWq aVv aXQ @@ -49104,7 +49071,7 @@ aLY aTf aUc aUN -aVw +aVy aVv aXj aXR @@ -49246,7 +49213,7 @@ aLY aTg aUc aUO -aVx +aVy aWr aXk aXS @@ -49388,7 +49355,7 @@ aLY aTh aUc aUP -aVx +aVy aWs aUc aUc diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index b5b680db24..5b92fba54d 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -18345,7 +18345,9 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 1 }, -/obj/machinery/smartfridge/produce/persistent_lossy, +/obj/structure/table/standard{ + name = "plastic table frame" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aDY" = ( @@ -21015,6 +21017,9 @@ /area/crew_quarters/kitchen) "aIl" = ( /obj/item/weapon/stool/padded, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aIm" = ( @@ -21028,7 +21033,7 @@ /area/crew_quarters/bar) "aIn" = ( /obj/effect/floor_decal/spline/plain{ - dir = 4 + dir = 5 }, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) @@ -23292,17 +23297,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom2) -"aMA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/shuttle_pad) "aMB" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/orange{ @@ -23744,19 +23738,11 @@ /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) "aNx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/camera/network/civilian{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) @@ -24060,6 +24046,9 @@ pixel_x = 30 }, /obj/structure/disposalpipe/segment, +/obj/machinery/camera/network/civilian{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "aOe" = ( @@ -24530,6 +24519,9 @@ dir = 10 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "aPd" = ( @@ -24702,14 +24694,16 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/shuttle_pad) "aPu" = ( -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/super; + dir = 8; + name = "west bump"; + pixel_x = -30 }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "aPv" = ( @@ -24854,20 +24848,36 @@ /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_breakroom) "aPL" = ( -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "aPM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, +/obj/structure/disposalpipe/segment, /obj/structure/cable/orange{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) @@ -24936,30 +24946,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) -"aPZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/southhall) -"aQa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/southhall) "aQb" = ( /obj/machinery/papershredder, /turf/simulated/floor/wood, @@ -27204,9 +27190,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 +27252,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 +27343,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 +27410,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 +27447,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 +27721,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 +27947,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 +27985,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 +28014,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 +28133,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 +28507,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 +28538,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 +28611,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 +28631,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{ @@ -29985,7 +29840,7 @@ "aZg" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/door/firedoor/glass, -/obj/machinery/smartfridge/produce, +/obj/machinery/smartfridge/produce/persistent_lossy, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aZh" = ( @@ -31662,11 +31517,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{ @@ -33551,16 +33414,8 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/shuttle_pad) "bfj" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/obj/structure/cable/orange{ - d2 = 4; - icon_state = "0-4" - }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass_external/public, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "bfk" = ( @@ -33813,19 +33668,10 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "bfJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, /area/tether/surfacebase/southhall) "bfK" = ( /obj/structure/table/gamblingtable, @@ -34096,10 +33942,15 @@ /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "bgm" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 28 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/machinery/door/airlock/glass_external/public, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) @@ -34500,9 +34351,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) -"bgZ" = ( -/turf/simulated/wall/r_wall, -/area/tether/surfacebase/southhall) "bha" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -36233,22 +36081,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 +37780,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 +37806,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 +37889,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 +37903,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 @@ -38153,6 +37990,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "cGs" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "cGt" = ( @@ -38210,6 +38050,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 +38126,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 +38182,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 +38412,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 +38495,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 +38502,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 +38545,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 +38575,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 +38678,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 +38714,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 +38834,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 +38861,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 +38900,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 +38944,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 +38990,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 +39078,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 +39167,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 +39193,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 +39294,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 +39311,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 +39415,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 +39594,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 +39759,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 +39789,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 +39866,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 +39920,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 +39968,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 +40039,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 +40056,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 +40122,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 +40137,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 +40178,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 +40620,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 +40743,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 +40793,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 +40905,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 +40934,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 +40966,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 +41216,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 +41413,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 +41439,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 +41642,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 +41717,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{ @@ -41867,6 +41932,19 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"qvs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/shuttle_pad) "qze" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -42050,14 +42128,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 +42208,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 @@ -42299,6 +42368,23 @@ /obj/machinery/vending/cigarette, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) +"shl" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/shuttle_pad) "shx" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -42579,25 +42665,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 +42806,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 +42938,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 +43072,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 +43121,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 +43198,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 +43214,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 +43591,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 +43666,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 +43866,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 +44045,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 +55180,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 +55322,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 +55464,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 +55606,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 +55748,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 +55890,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 +56032,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 +56181,8 @@ aKU aKU aKU aKU +daD aKU -jYd aKU aKU aKU @@ -56267,8 +56323,8 @@ aKU aKU aKU aKU +daD aKU -jYd aKU aKU aKU @@ -56409,8 +56465,8 @@ aKV aKV aKV aKV +ddb aKV -voF aKV aKV aKV @@ -56694,14 +56750,14 @@ aKj aKj aKf gCV -hHL +dAe aKf aNX aKj aKj aKf aKf -bgZ +bgW bdz bdz bdz @@ -56835,19 +56891,19 @@ gfg aMV aKe aKg +diF aKg -cdv aKg aKe aOc aKe aKg -aMA -aPu -aPM -beU +aKg +aLA +aKg +aKg bfj -beU +aPu qbo bhi bhm @@ -56977,19 +57033,19 @@ sFW aMW sFW ghf +eqZ ghf -gLd ghf sFW aMW sFW aOu aNx -aPs -aPZ -beV +aKf +aKh +aKW bfJ -beV +aPL bhj cYm oWt @@ -57127,11 +57183,11 @@ aOd hth aOv aPc -aPL -aQa -hId +aLB +shl +qvs bgm -hId +aPM ely hId jCE @@ -57269,9 +57325,9 @@ aKj aKj eHY aKf -aPs -aPs -aPs +aKj +aKj +aKj aPs bhl bhl diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 59416f592b..a3fc4c924c 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -64,46 +64,15 @@ /obj/item/clothing/head/pizzaguy, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) -"aai" = ( -/obj/structure/plasticflaps, -/obj/machinery/conveyor{ - dir = 8; - id = "shuttle_inbound" - }, -/turf/simulated/floor/plating, -/area/shuttle/excursion/cargo) -"aaj" = ( -/obj/structure/plasticflaps, -/obj/machinery/conveyor{ - dir = 4; - id = "shuttle_outbound" - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/cargo) "aak" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/machinery/light{ + dir = 8 }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - name = "south bump"; - pixel_y = -28; - req_access = list(); - req_one_access = list(11,67) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/structure/cable/cyan, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "shuttle blast"; - name = "Shuttle Blast Doors"; - pixel_x = -25; - pixel_y = -25; - req_access = list(67) - }, -/obj/machinery/light, -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/cockpit) +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "aal" = ( /obj/structure/cable{ d1 = 1; @@ -901,15 +870,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) -"abJ" = ( -/obj/machinery/computer/shuttle_control/explore/excursion{ - dir = 1 - }, -/obj/item/device/radio/intercom{ - pixel_y = -24 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/cockpit) "abK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3048,11 +3008,6 @@ "afD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/light{ dir = 4 }, @@ -3350,12 +3305,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"agf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/cargo) "agg" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -3406,13 +3355,19 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "agi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/light{ dir = 4 }, -/obj/machinery/alarm{ - pixel_y = 22 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "agj" = ( /obj/structure/disposalpipe/segment{ @@ -3599,42 +3554,17 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) -"agQ" = ( -/obj/machinery/disposal/deliveryChute{ - dir = 8 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/cargo) "agR" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/handrail{ dir = 4 }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/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/techmaint, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "agS" = ( /obj/structure/filingcabinet, @@ -3684,18 +3614,16 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "agV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/structure/bed/chair/shuttle{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "agW" = ( /obj/effect/floor_decal/borderfloor{ @@ -3719,10 +3647,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"agX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) "agY" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -3884,11 +3808,16 @@ /turf/simulated/floor/tiled, /area/quartermaster/qm) "ahk" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/machinery/power/smes/buildable/point_of_interest, +/obj/structure/cable/cyan{ + d2 = 2; + icon_state = "0-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/power) "ahn" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -4068,10 +3997,14 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "ahO" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, /area/shuttle/excursion/general) "ahP" = ( /obj/effect/floor_decal/industrial/warning, @@ -5401,20 +5334,6 @@ "alF" = ( /turf/simulated/wall/r_wall, /area/engineering/engine_monitoring) -"alG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/panic_button{ - pixel_x = -32; - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/cockpit) "alH" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -6527,14 +6446,11 @@ /turf/simulated/floor, /area/storage/tech) "aos" = ( -/obj/structure/disposaloutlet{ - dir = 8 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/cargo) +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/general) "aot" = ( /obj/structure/sign/nosmoking_2{ pixel_x = 32 @@ -6791,9 +6707,8 @@ /turf/simulated/floor, /area/engineering/break_room) "aph" = ( -/obj/machinery/door/blast/regular{ - dir = 8 - }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/industrial/danger/corner, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "api" = ( @@ -10537,15 +10452,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"aBd" = ( -/obj/structure/disposaloutlet{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/shuttle/excursion/cargo) "aBe" = ( /turf/simulated/wall, /area/quartermaster/warehouse) @@ -10994,23 +10900,9 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "aCt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/monotile, -/area/tether/exploration) -"aCx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -11805,15 +11697,6 @@ /obj/random/tool, /turf/simulated/floor, /area/maintenance/cargo) -"aHN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled/monotile, -/area/tether/exploration) "aHQ" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1379; @@ -11885,15 +11768,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"aIk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/monotile, -/area/tether/exploration) "aIl" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -11975,14 +11849,8 @@ /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) "aJa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/light{ - dir = 1 +/obj/machinery/door/blast/regular{ + dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -12808,8 +12676,15 @@ /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/storage) "aOH" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/industrial/danger/corner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "aOL" = ( @@ -13183,11 +13058,6 @@ }, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) -"aSo" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/monotile, -/area/tether/exploration) "aSu" = ( /obj/structure/table/reinforced, /obj/machinery/light{ @@ -13272,22 +13142,11 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) -"aTs" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/monotile, -/area/tether/exploration) "aTA" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/turf/simulated/wall/fancy_shuttle/window{ + fancy_shuttle_tag = "explo" }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/monotile, -/area/tether/exploration) +/area/shuttle/excursion/cockpit) "aTE" = ( /obj/structure/table/reinforced, /obj/item/weapon/packageWrap, @@ -13331,11 +13190,11 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "aTO" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/industrial/danger/corner{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -13591,9 +13450,8 @@ /area/engineering/gravity_gen) "aWH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/camera/network/exploration{ - dir = 9 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -14483,32 +14341,23 @@ /turf/simulated/floor/tiled, /area/tether/exploration/crew) "bmA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "bmW" = ( /turf/simulated/wall, /area/quartermaster/belterdock) "bnf" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 +/obj/machinery/computer/ship/engines/adv, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "shuttle blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/shuttle/excursion/cargo) +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) "bnl" = ( /obj/structure/catwalk, /turf/simulated/floor, @@ -14772,6 +14621,15 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor, /area/storage/emergency_storage/emergency4) +"bvH" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "bwb" = ( /obj/machinery/door/airlock/maintenance_hatch{ frequency = 1379; @@ -14846,6 +14704,14 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/tether/station/dock_one) +"byv" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/power) "byy" = ( /turf/simulated/wall/r_wall, /area/engineering/gravity_lobby) @@ -15193,9 +15059,11 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "bLO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) @@ -15213,12 +15081,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled, /area/tcommsat/computer) -"bMv" = ( -/obj/machinery/light/spot{ - pixel_y = 32 - }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/cargo) "bMD" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -15229,40 +15091,35 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/station/dock_one) -"bNZ" = ( -/obj/structure/grille, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "shuttle blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "pilot_room" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/shuttle/excursion/cargo) "bOf" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/handrail{ +/obj/structure/table/steel_reinforced, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/cargo) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) "bOm" = ( /obj/structure/disposalpipe/segment, /turf/simulated/wall, /area/quartermaster/storage) "bOx" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/cargo) +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) "bOA" = ( /obj/structure/cable/green{ d1 = 2; @@ -15308,17 +15165,15 @@ /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) "bPq" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = 24 - }, -/obj/structure/handrail{ +/obj/structure/table/steel_reinforced, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/cargo) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) "bPx" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 @@ -15345,10 +15200,12 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "bPE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "bPX" = ( @@ -15631,27 +15488,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"bYJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "shuttle blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/shuttle/excursion/general) "bYK" = ( /obj/structure/cable/green{ dir = 1; @@ -15661,11 +15497,15 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "bYN" = ( -/obj/machinery/light{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/light{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "bZd" = ( @@ -15680,20 +15520,6 @@ /obj/item/clothing/gloves/yellow, /turf/simulated/floor/tiled, /area/engineering/workshop) -"bZr" = ( -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 1 - }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "shuttle blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/excursion/cargo) "bZt" = ( /obj/structure/dispenser{ phorontanks = 0 @@ -15707,61 +15533,44 @@ /obj/structure/bed/padded, /obj/item/weapon/bedsheet/brown, /obj/structure/curtain/open/bed, -/obj/machinery/button/windowtint{ - id = "pilot_room"; - pixel_x = 26; - pixel_y = 6; - req_access = list() - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/cargo) -"bZF" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/handrail{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/cargo) -"bZH" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/cargo) +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) +"bZF" = ( +/obj/machinery/computer/shuttle_control/explore/excursion{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) +"bZH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) "bZJ" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/structure/panic_button{ + pixel_x = 32; + pixel_y = -6 + }, +/obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/cargo) -"bZR" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/cargo) -"bZS" = ( -/obj/machinery/disposal/deliveryChute{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/shuttle/excursion/cargo) +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) "cah" = ( /obj/machinery/computer/telecomms/server{ dir = 8; @@ -16189,49 +15998,28 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/storage/tech) -"cvx" = ( -/obj/machinery/shipsensors{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/shuttle/excursion/cargo) "cwo" = ( -/obj/structure/handrail, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 - }, -/obj/item/device/radio/intercom{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/cargo) -"cwR" = ( -/obj/structure/handrail{ - dir = 1 - }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -22 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/cargo) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) +"cwR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/light/small, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) "cxj" = ( /obj/structure/catwalk, /obj/random/junk, @@ -16249,23 +16037,17 @@ /turf/simulated/floor/tiled/techfloor, /area/tcommsat/chamber) "cys" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28; - req_access = list(); - req_one_access = list(11,67) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/light{ - dir = 8 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/cargo) +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) "cyB" = ( /obj/machinery/door/airlock/glass_external, /obj/effect/map_helper/airlock/door/ext_door, @@ -16344,22 +16126,41 @@ "cCr" = ( /obj/structure/cable/cyan{ d1 = 2; - d2 = 8; - icon_state = "2-8" + d2 = 4; + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/cargo) -"cCJ" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "shuttle_outbound" - }, -/obj/effect/floor_decal/industrial/warning{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/cargo) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) +"cCJ" = ( +/obj/structure/cable/cyan{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/apc/angled{ + dir = 4; + req_access = null; + req_one_access = list(11,67) + }, +/obj/machinery/alarm/angled{ + dir = 1 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) "cCL" = ( /obj/structure/grille, /obj/machinery/door/firedoor/glass, @@ -16368,6 +16169,16 @@ }, /turf/simulated/floor/plating, /area/quartermaster/delivery) +"cDf" = ( +/obj/machinery/atmospherics/portables_connector/aux{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/power) "cDk" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -16402,13 +16213,6 @@ }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) -"cEi" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "shuttle_inbound" - }, -/obj/effect/floor_decal/industrial/warning/full, -/turf/simulated/floor/plating, -/area/shuttle/excursion/cargo) "cEE" = ( /turf/simulated/wall/r_wall, /area/bridge/secondary/teleporter) @@ -16486,6 +16290,22 @@ }, /turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) +"cHP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/angled_tgmc{ + dir = 4; + req_one_access = list(67) + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) "cHV" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, @@ -16498,20 +16318,14 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "cIa" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/hatch{ +/obj/machinery/door/airlock/angled_tgmc/dropship2_pilot{ req_one_access = list(67) }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/cargo) -"cII" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/shuttle/excursion/cargo) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) "cKd" = ( /obj/machinery/power/apc{ name = "south bump"; @@ -16557,13 +16371,27 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/hatch{ - req_one_access = list() +/obj/machinery/door/airlock/angled_tgmc/dropship2_pilot{ + req_one_access = list(67) }, -/turf/simulated/floor/tiled/techfloor, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) +"cND" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cargo) "cNJ" = ( /obj/effect/floor_decal/borderfloor{ @@ -16580,24 +16408,17 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) -"cNM" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/atmospherics/portables_connector/fuel{ +"cOc" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) -"cOc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 1 +/obj/machinery/light{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "cOq" = ( /obj/effect/floor_decal/rust, @@ -16636,17 +16457,29 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "cQu" = ( -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/atmospherics/portables_connector/fuel{ - dir = 8 +/obj/structure/cable/cyan{ + d2 = 2; + icon_state = "0-2" }, -/turf/simulated/floor/tiled/techfloor, +/obj/machinery/power/apc/angled{ + dir = 1; + req_access = null; + req_one_access = list(11,67) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "cRa" = ( -/obj/machinery/recharge_station, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techfloor, +/obj/machinery/sleep_console, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "cTd" = ( /obj/effect/floor_decal/industrial/warning, @@ -16668,24 +16501,15 @@ "cTQ" = ( /obj/structure/cable/cyan{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 2; + icon_state = "1-2" }, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "cUb" = ( /obj/machinery/light/small{ @@ -16742,21 +16566,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "cUQ" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/bed/chair/shuttle, +/obj/machinery/alarm/angled, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "cVW" = ( /obj/structure/cable/green{ @@ -16823,6 +16638,13 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) +"cZA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration) "cZP" = ( /obj/machinery/camera/network/telecom, /turf/simulated/floor/bluegrid{ @@ -16839,45 +16661,20 @@ /turf/simulated/floor, /area/maintenance/cargo) "cZZ" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/bed/chair/shuttle, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 - }, -/obj/machinery/door/airlock/hatch{ - req_one_access = list(67) - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "dbF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 - }, -/obj/machinery/atmospherics/binary/pump/aux{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "dbZ" = ( /obj/structure/cable/green{ @@ -16947,18 +16744,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/pilot_office) -"dgu" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/air, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = 24 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) "dgF" = ( /obj/machinery/mineral/input, /obj/machinery/conveyor{ @@ -17011,22 +16796,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) -"dhQ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "shuttle blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/shuttle/excursion/general) "dhS" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -17049,12 +16818,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) -"dih" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) "diF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 @@ -17062,15 +16825,13 @@ /turf/simulated/floor/plating, /area/maintenance/station/cargo) "diP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 8 - }, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "diW" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -17096,12 +16857,21 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "dju" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/atmospherics/portables_connector/fuel{ +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "djU" = ( /turf/simulated/wall/r_wall, @@ -17126,14 +16896,21 @@ /turf/simulated/floor/tiled/dark, /area/bridge/secondary/teleporter) "dkV" = ( -/obj/structure/bed/chair/shuttle{ +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "dls" = ( /obj/machinery/door/airlock/highsecurity{ @@ -17271,15 +17048,22 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "dsD" = ( +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /obj/structure/cable/cyan{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "dsX" = ( /obj/machinery/alarm{ @@ -17291,35 +17075,19 @@ /turf/simulated/floor/plating, /area/maintenance/station/cargo) "dsY" = ( -/obj/structure/bed/chair/shuttle{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/closet/emergsuit_wall{ - dir = 4; - pixel_x = 32 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) -"dtd" = ( -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/handrail{ + dir = 1 }, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/table/steel, -/obj/machinery/cell_charger, -/obj/random/powercell, -/obj/item/stack/material/tritium{ - amount = 15 - }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "dua" = ( /obj/structure/shuttle/engine/propulsion{ @@ -17481,29 +17249,20 @@ }, /turf/simulated/floor, /area/tether/exploration) -"dBX" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) -"dCJ" = ( -/obj/machinery/atmospherics/binary/pump/fuel, -/obj/structure/fuel_port{ - dir = 4; - pixel_x = 29 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) "dDo" = ( /obj/structure/bed/chair/comfy/beige{ dir = 4 }, /turf/simulated/floor/wood, /area/maintenance/station/cargo) +"dDu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/area/shuttle/excursion/cargo) "dDx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -17522,11 +17281,12 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/station/dock_one) -"dEc" = ( -/obj/structure/bed/chair/bay/shuttle{ - dir = 1 +"dGv" = ( +/obj/machinery/computer/ship/sensors/adv, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cockpit) "dHm" = ( /obj/effect/floor_decal/borderfloor{ @@ -17547,52 +17307,19 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) -"dIv" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/closet/emergsuit_wall{ - dir = 8; - pixel_x = -32 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) "dJj" = ( /obj/structure/cable/cyan{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/door/airlock/angled_tgmc{ + req_one_access = list(67) }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) -"dJG" = ( -/obj/structure/bed/chair/shuttle{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "dJJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -17601,12 +17328,9 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "dJL" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/monotile, /area/tether/exploration) "dJN" = ( /obj/structure/disposalpipe/segment, @@ -17691,17 +17415,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) -"dOQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) "dPx" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -17746,11 +17459,6 @@ }, /turf/simulated/floor, /area/quartermaster/storage) -"dQG" = ( -/obj/structure/cable/cyan, -/obj/machinery/power/smes/buildable/point_of_interest, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) "dQR" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -17826,31 +17534,15 @@ /obj/random/junk, /turf/simulated/floor, /area/maintenance/station/exploration) -"dWc" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +"dWh" = ( +/obj/machinery/atmospherics/portables_connector/fuel{ dir = 4 }, -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) -"dWh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "dWO" = ( /obj/effect/floor_decal/borderfloor{ @@ -17879,43 +17571,31 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "dXD" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock/hatch{ - req_one_access = list(67) - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) -"dYO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/handrail, -/obj/structure/cable/cyan{ +"dYI" = ( +/obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/reinforced, +/area/tether/exploration) +"dYO" = ( +/obj/machinery/portable_atmospherics/canister/empty, +/obj/machinery/atmospherics/portables_connector, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "dYV" = ( /obj/machinery/gateway{ @@ -17967,45 +17647,24 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"egt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) "egy" = ( /obj/machinery/gateway, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, /area/gateway) "egC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/structure/cable/cyan{ d1 = 1; - d2 = 8; - icon_state = "1-8" + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "ehb" = ( /obj/machinery/door/firedoor/glass, @@ -18014,13 +17673,23 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "ehh" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 +/obj/machinery/power/terminal{ + dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/portable_atmospherics/canister/empty, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/alarm/angled, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/power) "ejF" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -18065,41 +17734,20 @@ /obj/fiftyspawner/rods, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) -"ekv" = ( -/obj/machinery/power/terminal{ +"emi" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) -"emi" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "emN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "eoh" = ( @@ -18139,24 +17787,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/quartermaster/foyer) -"epw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/closet/emergsuit_wall{ - dir = 8; - pixel_x = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) "eqw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18171,35 +17801,17 @@ /turf/simulated/floor, /area/maintenance/cargo) "erb" = ( -/obj/machinery/light/small, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -22 +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/crate/secure/phoron{ - name = "fuel crate"; - req_one_access = list(67) +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/machinery/light{ + dir = 8 }, -/obj/item/weapon/tank/phoron{ - pixel_x = 6; - pixel_y = -6 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/item/weapon/tank/phoron{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = 24 - }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "erc" = ( /obj/structure/disposalpipe/segment{ @@ -18253,6 +17865,19 @@ "etY" = ( /turf/simulated/wall, /area/maintenance/station/exploration) +"euo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/general) "exi" = ( /obj/item/device/radio/intercom{ dir = 8; @@ -18294,21 +17919,21 @@ /turf/simulated/floor/plating, /area/tether/station/dock_two) "ezh" = ( -/obj/machinery/sleeper{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/machinery/shuttle_sensor{ - id_tag = "shuttlesens_exp_psg"; - pixel_x = -25 - }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "eBg" = ( -/obj/machinery/sleep_console, -/obj/item/device/radio/intercom{ - pixel_y = -24 +/obj/machinery/door/airlock/angled_tgmc{ + dir = 4; + req_one_access = list(67) }, -/turf/simulated/floor/tiled/techfloor, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "eBv" = ( /obj/machinery/atmospherics/binary/passive_gate/on{ @@ -18320,17 +17945,41 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "eBI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "eCo" = ( -/obj/structure/bed/chair/shuttle{ +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/angled_tgmc{ + dir = 4; + req_one_access = list(67) + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "eCW" = ( /obj/machinery/door/firedoor/glass, @@ -18360,11 +18009,19 @@ /turf/simulated/floor/wood, /area/maintenance/station/cargo) "eEO" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/shuttle/excursion/general) +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/power) "eFl" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -18380,13 +18037,21 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "eGK" = ( -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/atmospherics/portables_connector{ - dir = 4 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/power) "eGR" = ( /obj/machinery/door/airlock/glass_external, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -18424,34 +18089,17 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/belterdock) -"eIG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/obj/structure/cable/yellow, -/obj/machinery/power/port_gen/pacman/mrs{ - anchored = 1 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) "eIJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "shuttle_hatch"; - name = "Shuttle Rear Hatch"; - pixel_x = -25 +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/machinery/door/airlock/hatch{ - req_one_access = list() +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "eJv" = ( /obj/structure/grille, @@ -18463,10 +18111,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/station/dock_one) -"eJU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) "eJV" = ( /obj/structure/closet/crate, /obj/machinery/light{ @@ -18513,18 +18157,6 @@ /obj/structure/window/reinforced, /turf/simulated/shuttle/floor/yellow/airless, /area/shuttle/belter) -"eMe" = ( -/obj/machinery/computer/ship/helm, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/cockpit) -"eMl" = ( -/obj/machinery/computer/ship/sensors, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/cockpit) -"eMo" = ( -/obj/machinery/mineral/equipment_vendor/survey, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) "eMv" = ( /obj/structure/table/rack{ dir = 8; @@ -18539,34 +18171,6 @@ }, /turf/simulated/floor, /area/maintenance/station/exploration) -"eMS" = ( -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/structure/closet/emcloset/legacy, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/item/weapon/storage/backpack/parachute, -/obj/item/weapon/storage/backpack/parachute, -/obj/item/weapon/storage/backpack/parachute, -/obj/item/weapon/storage/backpack/parachute, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) "eNQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -18578,6 +18182,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"ePh" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/general) "ePp" = ( /obj/structure/cable/green{ d1 = 1; @@ -18623,15 +18238,6 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) -"eSD" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/handrail, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) "eTo" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 @@ -18639,25 +18245,11 @@ /obj/machinery/meter, /turf/simulated/floor, /area/maintenance/cargo) -"eTw" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom{ - dir = 1; - pixel_y = 24 - }, -/obj/structure/handrail, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) "eTD" = ( -/obj/structure/handrail, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "eTQ" = ( /obj/structure/grille, @@ -18681,17 +18273,6 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/airless, /area/shuttle/medivac/cockpit) -"eVN" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - cycle_to_external_air = 1; - frequency = 1380; - id_tag = "expshuttle_docker"; - pixel_y = 28 - }, -/obj/structure/handrail, -/obj/machinery/atmospherics/pipe/manifold4w/hidden, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) "eVP" = ( /obj/structure/closet/secure_closet/pilot, /obj/effect/floor_decal/borderfloor{ @@ -18727,21 +18308,6 @@ /obj/random/maintenance/cargo, /turf/simulated/floor, /area/maintenance/cargo) -"eYw" = ( -/obj/machinery/airlock_sensor{ - pixel_y = 28 - }, -/obj/structure/handrail, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) "eZg" = ( /obj/structure/table/rack{ dir = 8; @@ -18775,6 +18341,19 @@ /obj/effect/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) +"faK" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "expshuttle_docker_pump_out_external"; + pixel_x = -10; + pixel_y = 6 + }, +/obj/effect/map_helper/airlock/atmos/pump_out_external, +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "explo" + }, +/area/shuttle/excursion/cargo) "fca" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Exploration"; @@ -18814,11 +18393,6 @@ /area/tether/exploration) "fez" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -18841,14 +18415,12 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "fiK" = ( -/obj/structure/bed/chair/bay/shuttle{ - dir = 1 +/obj/machinery/alarm/angled, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/cockpit) +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "fiT" = ( /obj/machinery/holoposter{ dir = 4; @@ -18928,15 +18500,41 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_two) "fkj" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/hatch{ - req_one_access = list(67) +/obj/machinery/atmospherics/binary/pump/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "fkL" = ( -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/structure/closet/emcloset/legacy, +/obj/item/weapon/storage/backpack/parachute, +/obj/item/weapon/storage/backpack/parachute, +/obj/item/weapon/storage/backpack/parachute, +/obj/item/weapon/storage/backpack/parachute, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "fkV" = ( /obj/machinery/power/terminal{ dir = 8 @@ -18987,17 +18585,18 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "flS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 8 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 5 - }, -/obj/effect/floor_decal/emblem/nt2, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "fmg" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -19057,15 +18656,16 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "frS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 +/obj/structure/closet/secure_closet/guncabinet/excursion, +/obj/item/weapon/pickaxe, +/obj/machinery/light{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/effect/floor_decal/emblem/nt3, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "fsA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -19080,21 +18680,6 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) -"ftz" = ( -/obj/machinery/airlock_sensor{ - dir = 8; - pixel_x = 26; - pixel_y = -27 - }, -/obj/effect/map_helper/airlock/sensor/int_sensor, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 - }, -/obj/machinery/atmospherics/binary/pump/fuel{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) "fva" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -19168,22 +18753,24 @@ /turf/simulated/floor/airless, /area/space) "fxa" = ( -/obj/machinery/door/airlock/glass_external, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/structure/handrail, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/map_helper/airlock/door/int_door, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "fxO" = ( /obj/structure/cable/green{ d1 = 1; @@ -19246,59 +18833,37 @@ /turf/space, /area/space) "fAr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) -"fCg" = ( -/obj/effect/shuttle_landmark{ - base_area = /area/tether/exploration; - base_turf = /turf/simulated/floor/reinforced; - docking_controller = "expshuttle_dock"; - landmark_tag = "tether_excursion_hangar"; - name = "Excursion Shuttle Dock" - }, -/obj/effect/overmap/visitable/ship/landable/excursion, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) -"fCh" = ( -/obj/machinery/door/airlock/glass_external, -/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ - dir = 6; - frequency = 1380; - id_tag = "expshuttle_exterior_sensor"; - master_tag = "expshuttle_docker"; - pixel_x = 4; +/obj/structure/handrail, +/obj/machinery/airlock_sensor{ pixel_y = 28 }, -/obj/effect/floor_decal/industrial/warning{ +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) +"fAB" = ( +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "explo" + }, +/area/shuttle/excursion/cargo) +"fCh" = ( +/obj/effect/floor_decal/borderfloor/corner{ dir = 8 }, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration) "fDN" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -19370,21 +18935,11 @@ /turf/simulated/floor, /area/maintenance/cargo) "fGW" = ( -/obj/machinery/computer/ship/engines{ - dir = 1 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -22 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/cockpit) -"fIb" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/structure/closet/secure_closet/guncabinet/excursion, -/obj/item/weapon/pickaxe, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "fIw" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 6 @@ -19412,11 +18967,20 @@ /turf/simulated/wall, /area/tether/station/dock_two) "fMh" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "fMr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19424,37 +18988,78 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "fMv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 5 }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "fNB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) -"fNO" = ( -/obj/structure/handrail{ +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) -"fOn" = ( /obj/machinery/airlock_sensor{ dir = 8; pixel_x = 26; pixel_y = -27 }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) +"fNO" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/machinery/door/airlock/angled_tgmc/security_glass{ + dir = 4 + }, +/obj/effect/map_helper/airlock/door/int_door, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) +"fOn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "fPT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -19467,15 +19072,32 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "fPW" = ( -/obj/structure/handrail{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 }, -/obj/structure/closet/emergsuit_wall{ - dir = 1; - pixel_y = -32 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) +/obj/effect/shuttle_landmark{ + base_area = /area/tether/exploration; + base_turf = /turf/simulated/floor/reinforced; + docking_controller = "expshuttle_dock"; + landmark_tag = "tether_excursion_hangar"; + name = "Excursion Shuttle Dock" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/obj/effect/overmap/visitable/ship/landable/excursion, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "fQr" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -19509,24 +19131,33 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/dock_two) "fRX" = ( -/obj/structure/handrail{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 }, -/obj/machinery/light/small{ +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 6; + frequency = 1380; + id_tag = "expshuttle_exterior_sensor"; + master_tag = "expshuttle_docker"; + pixel_x = 4; + pixel_y = 28 + }, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/door/airlock/angled_tgmc/security_glass{ dir = 4 }, -/obj/effect/map_helper/airlock/atmos/pump_out_internal, -/obj/machinery/oxygen_pump{ - dir = 1; - pixel_y = -32 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume, -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = 24 - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "fTF" = ( /obj/structure/cable/green{ d1 = 1; @@ -19743,11 +19374,18 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "ghQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/structure/fuel_port{ + dir = 1; + pixel_y = -34 }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) +/obj/machinery/recharger, +/obj/structure/table/steel_reinforced, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "gif" = ( /obj/structure/cable{ d1 = 1; @@ -19819,22 +19457,12 @@ /turf/simulated/floor, /area/maintenance/station/exploration) "gjS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 +/obj/machinery/suit_cycler/pilot, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/machinery/shuttle_sensor{ - dir = 5; - id_tag = "shuttlesens_exp_int"; - pixel_y = -24 - }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/table/steel, -/obj/machinery/recharger, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "gjW" = ( /obj/structure/cable/green{ d1 = 1; @@ -19850,10 +19478,26 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "gjZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) +"gkB" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "gkN" = ( /obj/structure/cable/green{ @@ -19909,9 +19553,17 @@ /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) "gnc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "gnq" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 @@ -19930,13 +19582,11 @@ /turf/simulated/floor/tiled, /area/engineering/foyer) "gnS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/machinery/light, -/obj/machinery/suit_cycler/pilot, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) +/area/shuttle/excursion/cargo) "gnV" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -19978,25 +19628,47 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "gsz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 +/obj/structure/handrail{ + dir = 1 }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) +/obj/machinery/oxygen_pump{ + dir = 1; + pixel_y = -32 + }, +/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "gtU" = ( /obj/random/junk, /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/maintenance/cargo) "gtX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 24 + }, +/obj/machinery/light/small{ dir = 4 }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) +/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "gtY" = ( /obj/machinery/atmospherics/unary/freezer{ dir = 1; @@ -20029,6 +19701,17 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engineering_airlock) +"gyH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/area/shuttle/excursion/cargo) "gzg" = ( /obj/machinery/camera/network/tether{ dir = 1 @@ -20117,14 +19800,28 @@ }, /area/tcommsat/chamber) "gFT" = ( -/obj/structure/handrail{ - dir = 1 +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/structure/cable/cyan, +/obj/machinery/power/apc/angled{ + dir = 4; + req_access = null; + req_one_access = list(11,67) }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) +/obj/structure/table/steel, +/obj/machinery/cell_charger, +/obj/random/powercell, +/obj/item/stack/material/tritium{ + amount = 15 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/power) "gFV" = ( /obj/structure/cable/green{ d1 = 4; @@ -20135,31 +19832,19 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel_grid, /area/tether/station/dock_one) -"gGk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6 - }, -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/shuttle/excursion/general) "gGC" = ( /obj/structure/catwalk, /obj/machinery/light/small, /turf/simulated/floor, /area/maintenance/station/exploration) "gHF" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 }, -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 1 +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/turf/simulated/floor/plating, -/area/shuttle/excursion/general) +/area/shuttle/excursion/cargo) "gIp" = ( /obj/structure/cable/green{ d1 = 1; @@ -20169,32 +19854,13 @@ /turf/simulated/floor/tiled, /area/tether/exploration/crew) "gIs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) -"gJW" = ( -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "shuttle_hatch"; - name = "Shuttle Rear Hatch"; - pixel_x = -25 - }, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "shuttle_hatch"; - name = "Shuttle Rear Hatch" - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/area/shuttle/excursion/cargo) "gKa" = ( /obj/machinery/lapvend, /turf/simulated/floor/tiled, @@ -20209,9 +19875,21 @@ /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "gLG" = ( -/obj/effect/floor_decal/emblem/nt1, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/cable/cyan{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc/angled{ + dir = 1; + req_access = null; + req_one_access = list(11,67) + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "gLJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -20247,17 +19925,14 @@ /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "gMr" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "shuttle_hatch"; - name = "Shuttle Rear Hatch" - }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/excursion/general) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "gMR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20271,14 +19946,16 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_two) "gOT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ +/obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/area/shuttle/excursion/cargo) "gPx" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -20302,16 +19979,6 @@ }, /turf/simulated/floor/tiled, /area/tcommsat/computer) -"gQc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10 - }, -/obj/structure/shuttle/engine/heater, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/shuttle/excursion/general) "gTz" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20508,16 +20175,13 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "haB" = ( -/obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1380; - id_tag = "expshuttle_docker_pump_out_external" +/obj/machinery/atmospherics/unary/engine/fancy_shuttle{ + dir = 1 }, -/obj/effect/map_helper/airlock/atmos/pump_out_external, -/obj/structure/handrail, -/turf/simulated/floor/plating, -/area/shuttle/excursion/general) +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "explo" + }, +/area/shuttle/excursion/cargo) "hbc" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -20693,6 +20357,19 @@ }, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) +"hjF" = ( +/obj/machinery/power/port_gen/pacman/mrs{ + anchored = 1 + }, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/power) "hjG" = ( /obj/structure/cable/green{ d1 = 1; @@ -21313,6 +20990,15 @@ /area/tether/outpost/solars_outside{ name = "\improper Telecomms Solar Field" }) +"hFK" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/general) "hFV" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 @@ -21338,17 +21024,21 @@ /turf/simulated/floor/airless, /area/shuttle/large_escape_pod1) "hGI" = ( -/obj/structure/handrail{ - dir = 1 +/obj/machinery/atmospherics/binary/pump/fuel{ + dir = 8 }, -/obj/machinery/oxygen_pump{ - dir = 1; - pixel_y = -32 +/obj/machinery/atmospherics/binary/pump/aux{ + dir = 8 }, -/obj/effect/map_helper/airlock/atmos/pump_out_internal, -/obj/machinery/atmospherics/unary/vent_pump/high_volume, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "hHc" = ( /obj/structure/window/reinforced{ dir = 8 @@ -21760,6 +21450,20 @@ /obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled, /area/engineering/hallway) +"hYI" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration) "hYK" = ( /obj/structure/bed/chair, /turf/simulated/floor/carpet, @@ -21840,13 +21544,13 @@ /turf/simulated/floor/plating/eris/under, /area/shuttle/large_escape_pod1) "iaf" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "iaj" = ( @@ -21952,6 +21656,21 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) +"igN" = ( +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "shuttle_hatch"; + name = "Shuttle Rear Hatch"; + pixel_x = -24 + }, +/obj/machinery/door/blast/angled{ + id = "shuttle_hatch" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "iie" = ( /obj/structure/table/rack/shelf, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -22142,8 +21861,10 @@ /turf/simulated/floor/plating, /area/maintenance/station/cargo) "isS" = ( -/turf/simulated/wall/rshull, -/area/shuttle/excursion/cargo) +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/area/shuttle/excursion/cockpit) "iuB" = ( /obj/structure/cable/green{ d1 = 4; @@ -23073,6 +22794,17 @@ /obj/machinery/camera/network/mining, /turf/simulated/floor/airless, /area/quartermaster/belterdock) +"jBW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/area/shuttle/excursion/cargo) "jBX" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 @@ -23204,18 +22936,19 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/dock_two) "jJo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 +/obj/structure/handrail, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + cycle_to_external_air = 1; + frequency = 1380; + id_tag = "expshuttle_docker"; + pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "jJU" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -23250,12 +22983,6 @@ /area/tether/outpost/solars_outside{ name = "\improper Telecomms Solar Field" }) -"jOe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) "jOH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23708,6 +23435,13 @@ /area/tcommsat/entrance{ name = "\improper Telecomms Entrance" }) +"kft" = ( +/obj/machinery/computer/ship/helm/adv, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) "khk" = ( /obj/machinery/access_button{ command = "cycle_exterior"; @@ -23756,6 +23490,19 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"kiG" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "expshuttle_docker_pump_out_external"; + pixel_x = 10; + pixel_y = 6 + }, +/obj/effect/map_helper/airlock/atmos/pump_out_external, +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "explo" + }, +/area/shuttle/excursion/cargo) "kjA" = ( /obj/structure/cable{ d1 = 4; @@ -23982,12 +23729,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) -"kqX" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 - }, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/excursion/general) "kts" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -24582,21 +24323,13 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "kRk" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/camera/network/exploration{ + dir = 9 }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "shuttle blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/excursion/cockpit) +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration) "kRF" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Telecomms"; @@ -25234,6 +24967,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) +"lwa" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "lwh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25655,10 +25403,42 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) -"lKl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/wall/rshull, +"lJZ" = ( +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) +"lKl" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "lLp" = ( /obj/machinery/door/airlock/glass_external, /obj/effect/map_helper/airlock/door/int_door, @@ -25864,6 +25644,21 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"lSw" = ( +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 + }, +/obj/machinery/alarm/angled{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cockpit) "lSR" = ( /obj/effect/landmark/start{ name = "Pilot" @@ -26145,6 +25940,12 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"mmj" = ( +/obj/machinery/shipsensors/fancy_shuttle, +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "explo" + }, +/area/shuttle/excursion/cockpit) "mmJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -26236,6 +26037,18 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"mos" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "mou" = ( /obj/machinery/door/airlock/glass_external, /obj/structure/cable/green{ @@ -27091,6 +26904,18 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/cargo) +"mZB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/obj/machinery/door/airlock/angled_tgmc{ + req_one_access = list(67) + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/general) "nac" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -27260,6 +27085,15 @@ /obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_two) +"nhL" = ( +/obj/machinery/sleeper{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/general) "nio" = ( /obj/machinery/light{ dir = 8 @@ -28020,17 +27854,12 @@ /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/securiship/general) "nYi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/mineral/equipment_vendor/survey, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/cockpit) +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "nYA" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -29396,6 +29225,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/plating, /area/maintenance/station/cargo) +"pPa" = ( +/obj/machinery/door/blast/angled{ + id = "shuttle_hatch" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "pPm" = ( /obj/structure/closet/secure_closet/miner, /obj/effect/floor_decal/borderfloor{ @@ -29519,20 +29357,6 @@ }, /turf/simulated/floor/tiled, /area/tcommsat/computer) -"qaf" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/airlock/hatch{ - req_one_access = list(67) - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/excursion/general) "qai" = ( /obj/structure/closet/crate/internals, /obj/random/maintenance/medical, @@ -30889,8 +30713,10 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/dock_two) "ruq" = ( -/turf/simulated/wall/rshull, -/area/shuttle/excursion/cockpit) +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/area/shuttle/excursion/cargo) "rus" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -31271,6 +31097,17 @@ }, /turf/simulated/floor/tiled/white, /area/tether/station/dock_two) +"rWj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/angled_tgmc{ + req_one_access = list(67) + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/general) "rWm" = ( /obj/machinery/computer/supplycomp/control, /turf/simulated/floor/wood, @@ -32346,6 +32183,19 @@ temperature = 80 }, /area/tcommsat/chamber) +"tiw" = ( +/obj/effect/fancy_shuttle/exploration{ + dir = 1; + fancy_shuttle_tag = "explo" + }, +/obj/effect/fancy_shuttle_floor_preview/exploration{ + dir = 1; + plane = -45 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/area/shuttle/excursion/cargo) "tiN" = ( /obj/machinery/computer/ship/engines, /turf/simulated/floor/tiled/eris/steel/cyancorner, @@ -34447,6 +34297,22 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"vFn" = ( +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -30 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/general) "vHM" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -34471,6 +34337,19 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) +"vJC" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/power) "vKb" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -35361,7 +35240,9 @@ /turf/simulated/shuttle/floor/yellow/airless, /area/shuttle/belter) "wZB" = ( -/turf/simulated/wall/rshull, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, /area/shuttle/excursion/general) "xat" = ( /obj/effect/landmark/start{ @@ -35438,6 +35319,15 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) +"xcE" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/general) "xdE" = ( /turf/simulated/wall/r_wall, /area/gateway) @@ -35731,6 +35621,16 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/gateway/prep_room) +"xwI" = ( +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -30 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/cargo) "xwY" = ( /obj/structure/closet/emcloset, /turf/simulated/floor, @@ -36133,6 +36033,30 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/delivery) +"xXm" = ( +/obj/structure/closet/crate/secure/phoron{ + name = "fuel crate"; + req_one_access = list(67) + }, +/obj/item/weapon/tank/phoron{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/weapon/tank/phoron{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/machinery/alarm/angled{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "explo" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/excursion/general) "xXR" = ( /obj/structure/bed/chair/shuttle{ dir = 4 @@ -45541,8 +45465,8 @@ aaa aaa aac aac -aac -aac +pny +pny pny pny pny @@ -45682,15 +45606,15 @@ aaa aaa aaa aaa -aam -aam aac pny -aCt +aOH aML +aCt +cZA bmA -bLO -bYN +cto +cto cto cto cto @@ -45825,11 +45749,9 @@ aaa aaa aaa aam -aam -aam +aJa +aTO aph -aCx -aOH bfo oge kAp @@ -45837,6 +45759,8 @@ kAp kAp kAp kAp +kAp +kAp oge kAp bfo @@ -45966,12 +45890,17 @@ aaa aaa aaa aab -aaa aam -aam -aph -aCx -aSo +aJa +aTO +dJL +sUY +sUY +sUY +sUY +sUY +sUY +sUY sUY sUY sUY @@ -45982,11 +45911,6 @@ sUY sUY sUY sUY -wZB -kRk -kRk -kRk -ruq sUY sUY eWv @@ -46108,29 +46032,29 @@ aaa aaa aaa aaa -aaa aam -aam -aph -aCx -aSo +aJa +aTO +dJL sUY sUY -bZr -cvx +sUY +isS +isS +isS isS wZB -dhQ -wZB -dhQ wZB wZB -eMe -dEc -abJ +wZB +wZB +wZB +wZB ruq -wZB -sUY +ruq +ruq +ruq +tiw eWv bYt pny @@ -46250,29 +46174,29 @@ aaa aaa aaa aaa -aaa aam -aam -aph -aCx -aSo +aJa +aTO +dJL sUY sUY isS isS isS -cNM -dih -dBX -dWc -epw -qaf -alG +isS +isS +wZB +wZB +wZB +wZB +wZB +wZB +wZB nYi aak +fGW +ruq ruq -gGk -kqX eWv bYt pny @@ -46392,29 +46316,29 @@ aaa aaa aaa aaa -aaa aam -aam -aph -aCx -aSo +aJa +aTO +dJL sUY -bMv +aTA isS +isS +lSw cwo cIa cOc diP -dCJ +wZB dWh erb +dWh wZB -eMl fiK fGW -ruq +xwI gHF -kqX +haB eWv bYt pny @@ -46534,26 +46458,26 @@ aaa aaa aaa aaa -aaa aam -aam -aph -aCx -aSo -sUY -bNZ +aJa +aTO +dJL +aTA +aTA +isS +isS bZD cwR isS cQu dju -wZB +rWj dXD -wZB -wZB -eEO +ePh +gkB +mZB fkj -eEO +lwa ghQ gIs haB @@ -46676,29 +46600,29 @@ aaa aaa aaa aaa -aaa aam -aam -aph -aCx -aSo +aJa +aTO +dJL +aTA +aTA isS isS isS +cHP isS -isS -wZB -wZB +nhL +dkV wZB dYO ezh +xXm wZB -eMo fkL -fIb +fMh gjS -gtX -sUY +dDu +faK eWv imG hLI @@ -46818,29 +46742,29 @@ aaa aaa aaa aaa -aaa aam -aam -aph -aHN -aTs +aJa +bLO +emi +aTA +aTA bnf bOf bZF cys -cII +isS cRa -dkV -dIv -egt +lJZ +wZB +wZB eBg wZB -eMS +wZB gLG fMh gjZ -gJW -sUY +mos +igN eWv aeL hNs @@ -46960,13 +46884,13 @@ aaa aaa aaa aaa -aaa aam -aam -aph -aCx -aSo -bnf +aJa +aTO +dJL +aTA +aTA +kft bOx bZH cCr @@ -46977,12 +46901,12 @@ dJj egC eBI eIJ -eBI +euo flS fMv gnc gMr -sUY +pPa eWv ops pny @@ -47102,29 +47026,29 @@ aaa aaa aaa aaa -aaa aam -aam -aph -aIk +aJa +bPE +emN aTA -bnf +aTA +dGv bPq bZJ cCJ -cII +isS cUQ dsY -dJG -dsY +wZB +wZB eCo wZB -eSD +wZB frS fNB -gjZ -gMr -sUY +bvH +cND +pPa eWv nDX scu @@ -47244,29 +47168,29 @@ aaa aaa aaa aaa -aaa aam -aam -aph -aCx -aSo +aJa +aTO +dJL +aTA +aTA +isS +isS isS isS -bZR -aaj isS cZZ +vFn wZB -wZB -wZB +hjF eEO +cDf wZB -eTw -ftz +ruq fNO gnS -gtX -sUY +jBW +kiG eWv hxD scu @@ -47386,23 +47310,23 @@ aaa aaa aaa aaa -aaa aam -aam -aph -aCx -aSo -sUY +aJa +aTO +dJL +aTA +aTA isS +wZB aos -agQ -isS +hFK +hFK dbF agR -dOQ +wZB ehh eGK -wZB +vJC ahO fxa fOn @@ -47528,29 +47452,29 @@ aaa aaa aaa aaa -aaa aam -aam -aph -aCx -aSo +aJa +aTO +dJL sUY -bMv -agf -agf +aTA isS +wZB +aos +xcE +xcE agi agV -agX +wZB ahk gFT -wZB +byv eTD jJo hGI lKl -gHF -kqX +gyH +haB eWv ops scu @@ -47670,29 +47594,29 @@ aaa aaa aaa aaa -aaa aam -aam -aph -aCx -aSo +aJa +aTO +dJL sUY sUY -bZS -aBd -isS -dgu -dtd -dQG -ekv -eIG -eJU -eVN +mmj +wZB +wZB +wZB +wZB +wZB +wZB +wZB +wZB +wZB +wZB +wZB fAr fPW gtX -gQc -kqX +ruq +fAB eWv hBS scu @@ -47812,29 +47736,29 @@ aaa aaa aaa aaa -aaa aam -aam -aph -aCx -aSo +aJa +aTO +dJL +sUY sUY sUY -aai -cEi -isS wZB wZB wZB -bYJ wZB wZB -eYw -fCg +wZB +wZB +wZB +wZB +wZB +wZB +ruq fRX -jOe -wZB -sUY +ruq +ruq +ruq eWv hBS scu @@ -47954,27 +47878,27 @@ aaa aaa aaa aaa -aaa aam -aam -aph -aCx -aSo -sUY -sUY -sUY -sUY -sUY -sUY -sUY -sUY +aJa +aTO dJL sUY -wZB -wZB -fCh -wZB -wZB +sUY +sUY +sUY +sUY +sUY +sUY +sUY +sUY +sUY +sUY +sUY +sUY +sUY +sUY +dYI +sUY sUY sUY eWv @@ -48097,11 +48021,9 @@ aaa aaa aaa aam -aam -aam -aph -aCx +aJa aTO +fCh ali bPD bQx @@ -48109,13 +48031,15 @@ bQx bQx bQx bQx +bQx +bQx ali -emi +bQx bQx bQx fdw bQx -bQx +hYI bQx bPD ali @@ -48238,23 +48162,23 @@ aaa aaa aaa aaa -aam -aam aac pny -aJa +bYN +kRk +bpT aWH -bpT -bPE +cto +cto cto cto cto cto cto bpT -emN -iaf -vLG +cto +cto +cto fez afD iaf @@ -48381,8 +48305,8 @@ aaa aaa aaa aac -aac -aac +pny +pny pny pny pny diff --git a/maps/tether/tether-07-solars.dmm b/maps/tether/tether-07-solars.dmm index 3a7361dc8f..1addcdd726 100644 --- a/maps/tether/tether-07-solars.dmm +++ b/maps/tether/tether-07-solars.dmm @@ -1745,8 +1745,7 @@ /area/rnd/outpost/testing) "dV" = ( /obj/machinery/vending/cola{ - dir = 8; - icon_state = "Soda_Machine" + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost/breakroom) diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index ce4bd5c55a..b8c3538c57 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -215,6 +215,9 @@ /area/tether/surfacebase/barbackmaintenance name = "\improper Bar Back Maintenance" icon_state = "red" +/area/tether/surfacebase/arcade + name = "\improper Arcade" + icon_state = "green" /area/tether/surfacebase/public_garden_lg name = "\improper Public Garden Looking Glass" @@ -1436,6 +1439,7 @@ /area/shuttle/excursion requires_power = 1 icon_state = "shuttle2" + base_turf = /turf/simulated/floor/reinforced /area/shuttle/excursion/general name = "\improper Excursion Shuttle" @@ -1446,9 +1450,13 @@ /area/shuttle/excursion/cargo name = "\improper Excursion Shuttle Cargo" +/area/shuttle/excursion/power + name = "\improper Excursion Shuttle Power" + /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_shuttles.dm b/maps/tether/tether_shuttles.dm index f8e126d024..42f9723477 100644 --- a/maps/tether/tether_shuttles.dm +++ b/maps/tether/tether_shuttles.dm @@ -191,7 +191,7 @@ warmup_time = 0 current_location = "tether_excursion_hangar" docking_controller_tag = "expshuttle_docker" - shuttle_area = list(/area/shuttle/excursion/cockpit, /area/shuttle/excursion/general, /area/shuttle/excursion/cargo) + shuttle_area = list(/area/shuttle/excursion/cockpit, /area/shuttle/excursion/general, /area/shuttle/excursion/cargo, /area/shuttle/excursion/power) fuel_consumption = 3 move_direction = NORTH diff --git a/maps/tether/tether_turfs.dm b/maps/tether/tether_turfs.dm index 0bf0ef290f..6bdd1f42fe 100644 --- a/maps/tether/tether_turfs.dm +++ b/maps/tether/tether_turfs.dm @@ -4,7 +4,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/open) edge_blending_priority = 0.5 //Turfs which also have e_b_p and higher than this will plop decorative edges onto this turf /turf/simulated/open/virgo3b/Initialize(mapload) . = ..() - if(outdoors) + if(is_outdoors()) SSplanets.addTurf(src) VIRGO3B_TURF_CREATE(/turf/simulated/floor) @@ -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/sound/effects/alert_levels/deltaklaxon.ogg b/sound/effects/alert_levels/deltaklaxon.ogg index 7a9522c1ff..aedc0c65d3 100644 Binary files a/sound/effects/alert_levels/deltaklaxon.ogg and b/sound/effects/alert_levels/deltaklaxon.ogg differ diff --git a/sound/effects/alert_levels/red_alert.ogg b/sound/effects/alert_levels/red_alert.ogg index 6eed302098..3318ee6a1e 100644 Binary files a/sound/effects/alert_levels/red_alert.ogg and b/sound/effects/alert_levels/red_alert.ogg differ diff --git a/sound/h_sounds/headcrab.ogg b/sound/h_sounds/headcrab.ogg deleted file mode 100644 index 2d5d9ddbfd..0000000000 Binary files a/sound/h_sounds/headcrab.ogg and /dev/null differ diff --git a/sound/h_sounds/holla.ogg b/sound/h_sounds/holla.ogg deleted file mode 100644 index f4e4783b36..0000000000 Binary files a/sound/h_sounds/holla.ogg and /dev/null differ diff --git a/sound/h_sounds/imbeciles.ogg b/sound/h_sounds/imbeciles.ogg deleted file mode 100644 index ce715d2045..0000000000 Binary files a/sound/h_sounds/imbeciles.ogg and /dev/null differ diff --git a/sound/h_sounds/lynx.ogg b/sound/h_sounds/lynx.ogg deleted file mode 100644 index d9d5de704e..0000000000 Binary files a/sound/h_sounds/lynx.ogg and /dev/null differ diff --git a/sound/h_sounds/mumble.ogg b/sound/h_sounds/mumble.ogg deleted file mode 100644 index a18c5ed01d..0000000000 Binary files a/sound/h_sounds/mumble.ogg and /dev/null differ diff --git a/sound/h_sounds/negative.ogg b/sound/h_sounds/negative.ogg deleted file mode 100644 index fc37b5f510..0000000000 Binary files a/sound/h_sounds/negative.ogg and /dev/null differ diff --git a/sound/h_sounds/sampler.ogg b/sound/h_sounds/sampler.ogg deleted file mode 100644 index 0ec6ddd16a..0000000000 Binary files a/sound/h_sounds/sampler.ogg and /dev/null differ diff --git a/sound/h_sounds/shitty_tim.ogg b/sound/h_sounds/shitty_tim.ogg deleted file mode 100644 index 81266c2667..0000000000 Binary files a/sound/h_sounds/shitty_tim.ogg and /dev/null differ diff --git a/sound/h_sounds/src/sampler1.ogg b/sound/h_sounds/src/sampler1.ogg deleted file mode 100644 index b5e10c969f..0000000000 Binary files a/sound/h_sounds/src/sampler1.ogg and /dev/null differ diff --git a/sound/h_sounds/src/sampler2.ogg b/sound/h_sounds/src/sampler2.ogg deleted file mode 100644 index e058d442a8..0000000000 Binary files a/sound/h_sounds/src/sampler2.ogg and /dev/null differ diff --git a/sound/h_sounds/src/sampler3.ogg b/sound/h_sounds/src/sampler3.ogg deleted file mode 100644 index 23e695739b..0000000000 Binary files a/sound/h_sounds/src/sampler3.ogg and /dev/null differ diff --git a/sound/h_sounds/src/sampler3speed.ogg b/sound/h_sounds/src/sampler3speed.ogg deleted file mode 100644 index 2ba846199f..0000000000 Binary files a/sound/h_sounds/src/sampler3speed.ogg and /dev/null differ diff --git a/sound/h_sounds/src/sampler4.3.ogg b/sound/h_sounds/src/sampler4.3.ogg deleted file mode 100644 index 46932b7502..0000000000 Binary files a/sound/h_sounds/src/sampler4.3.ogg and /dev/null differ diff --git a/sound/h_sounds/src/shitty tim 2.ogg b/sound/h_sounds/src/shitty tim 2.ogg deleted file mode 100644 index bf355f7a13..0000000000 Binary files a/sound/h_sounds/src/shitty tim 2.ogg and /dev/null differ diff --git a/sound/h_sounds/src/shitty tim.ogg b/sound/h_sounds/src/shitty tim.ogg deleted file mode 100644 index b21f209525..0000000000 Binary files a/sound/h_sounds/src/shitty tim.ogg and /dev/null differ diff --git a/sound/h_sounds/src/shitty tim1.ogg b/sound/h_sounds/src/shitty tim1.ogg deleted file mode 100644 index ab0eaa22a9..0000000000 Binary files a/sound/h_sounds/src/shitty tim1.ogg and /dev/null differ diff --git a/sound/h_sounds/src/shitty tim3.ogg b/sound/h_sounds/src/shitty tim3.ogg deleted file mode 100644 index 770624a22c..0000000000 Binary files a/sound/h_sounds/src/shitty tim3.ogg and /dev/null differ diff --git a/sound/h_sounds/src/shitty tim4.ogg b/sound/h_sounds/src/shitty tim4.ogg deleted file mode 100644 index 81266c2667..0000000000 Binary files a/sound/h_sounds/src/shitty tim4.ogg and /dev/null differ diff --git a/sound/h_sounds/wor.ogg b/sound/h_sounds/wor.ogg deleted file mode 100644 index ad2076cfaa..0000000000 Binary files a/sound/h_sounds/wor.ogg and /dev/null differ diff --git a/sound/h_sounds/yell.ogg b/sound/h_sounds/yell.ogg deleted file mode 100644 index 163395cd94..0000000000 Binary files a/sound/h_sounds/yell.ogg and /dev/null differ diff --git a/sound/h_sounds/youknowwhoitis.ogg b/sound/h_sounds/youknowwhoitis.ogg deleted file mode 100644 index 7ef0d449b0..0000000000 Binary files a/sound/h_sounds/youknowwhoitis.ogg and /dev/null differ diff --git a/sound/machines/clawmachine_play.ogg b/sound/machines/clawmachine_play.ogg new file mode 100644 index 0000000000..2f72abfbe0 Binary files /dev/null and b/sound/machines/clawmachine_play.ogg differ diff --git a/sound/machines/clawmachine_win.ogg b/sound/machines/clawmachine_win.ogg new file mode 100644 index 0000000000..3a2269e03c Binary files /dev/null and b/sound/machines/clawmachine_win.ogg differ diff --git a/sound/machines/roulette.ogg b/sound/machines/roulette.ogg new file mode 100644 index 0000000000..2a80d80299 Binary files /dev/null and b/sound/machines/roulette.ogg differ diff --git a/sound/machines/slotmachine.ogg b/sound/machines/slotmachine.ogg new file mode 100644 index 0000000000..366d985721 Binary files /dev/null and b/sound/machines/slotmachine.ogg differ diff --git a/sound/machines/slotmachine_pull.ogg b/sound/machines/slotmachine_pull.ogg new file mode 100644 index 0000000000..d97a815bf8 Binary files /dev/null and b/sound/machines/slotmachine_pull.ogg differ diff --git a/sound/voice/EDPlaceholder.ogg b/sound/voice/EDPlaceholder.ogg index 501f8f33c3..c6ae2f473f 100644 Binary files a/sound/voice/EDPlaceholder.ogg and b/sound/voice/EDPlaceholder.ogg differ diff --git a/sound/voice/ed209_20sec.ogg b/sound/voice/ed209_20sec.ogg index d1ab901084..3983d9e7ba 100644 Binary files a/sound/voice/ed209_20sec.ogg and b/sound/voice/ed209_20sec.ogg differ diff --git a/sound/voice/syndicate intro.ogg b/sound/voice/syndicate intro.ogg index c99549d962..ca0efa0ea0 100644 Binary files a/sound/voice/syndicate intro.ogg and b/sound/voice/syndicate intro.ogg differ diff --git a/sound/weapons/Gunshot1.ogg b/sound/weapons/Gunshot1.ogg index 4fd082ce7f..26b356a80a 100644 Binary files a/sound/weapons/Gunshot1.ogg and b/sound/weapons/Gunshot1.ogg differ diff --git a/sound/weapons/Gunshot_light.ogg b/sound/weapons/Gunshot_light.ogg index 5c0000bb32..c2f2c07d96 100644 Binary files a/sound/weapons/Gunshot_light.ogg and b/sound/weapons/Gunshot_light.ogg differ diff --git a/sound/weapons/Gunshot_shotgun.ogg b/sound/weapons/Gunshot_shotgun.ogg index f10004d1ee..7fc62cc768 100644 Binary files a/sound/weapons/Gunshot_shotgun.ogg and b/sound/weapons/Gunshot_shotgun.ogg differ diff --git a/sound/weapons/Laser.ogg b/sound/weapons/Laser.ogg index 0fbb611f9c..4ff9e82ff9 100644 Binary files a/sound/weapons/Laser.ogg and b/sound/weapons/Laser.ogg differ diff --git a/sound/weapons/Taser.ogg b/sound/weapons/Taser.ogg index f6bcb64821..0201d3516d 100644 Binary files a/sound/weapons/Taser.ogg and b/sound/weapons/Taser.ogg differ diff --git a/sound/weapons/armbomb.ogg b/sound/weapons/armbomb.ogg index fccf4f668d..0dee693eb4 100644 Binary files a/sound/weapons/armbomb.ogg and b/sound/weapons/armbomb.ogg differ diff --git a/sound/weapons/blaster_pistol.ogg b/sound/weapons/blaster_pistol.ogg index f1fa7dabeb..d85411efe2 100644 Binary files a/sound/weapons/blaster_pistol.ogg and b/sound/weapons/blaster_pistol.ogg differ diff --git a/sound/weapons/gunshot2.ogg b/sound/weapons/gunshot2.ogg index 2dfc6fc1e9..e18fd4c7d1 100644 Binary files a/sound/weapons/gunshot2.ogg and b/sound/weapons/gunshot2.ogg differ diff --git a/sound/weapons/gunshot3.ogg b/sound/weapons/gunshot3.ogg index 97799dff10..26b356a80a 100644 Binary files a/sound/weapons/gunshot3.ogg and b/sound/weapons/gunshot3.ogg differ diff --git a/sound/weapons/gunshot4.ogg b/sound/weapons/gunshot4.ogg index 2d971f7b1a..e18fd4c7d1 100644 Binary files a/sound/weapons/gunshot4.ogg and b/sound/weapons/gunshot4.ogg differ diff --git a/sound/weapons/smartgunclose.ogg b/sound/weapons/smartgunclose.ogg new file mode 100644 index 0000000000..9914e9e5dc Binary files /dev/null and b/sound/weapons/smartgunclose.ogg differ diff --git a/sound/weapons/smartgunopen.ogg b/sound/weapons/smartgunopen.ogg new file mode 100644 index 0000000000..02586d6e67 Binary files /dev/null and b/sound/weapons/smartgunopen.ogg differ diff --git a/sound/weapons/taser2.ogg b/sound/weapons/taser2.ogg index 2cdab84378..b4ac1c2ca2 100644 Binary files a/sound/weapons/taser2.ogg and b/sound/weapons/taser2.ogg differ diff --git a/tgui/packages/tgui/interfaces/CasinoPrizeDispenser.js b/tgui/packages/tgui/interfaces/CasinoPrizeDispenser.js new file mode 100644 index 0000000000..12f2838faf --- /dev/null +++ b/tgui/packages/tgui/interfaces/CasinoPrizeDispenser.js @@ -0,0 +1,180 @@ +import { createSearch } from 'common/string'; +import { Fragment } from 'inferno'; +import { useBackend, useLocalState } from "../backend"; +import { Box, Button, Collapsible, Dropdown, Flex, Input, NoticeBox, Section } from '../components'; +import { Window } from "../layouts"; +import { refocusLayout } from '../layouts'; +import { logger } from '../logging'; + +const sortTypes = { + 'Alphabetical': (a, b) => a - b, + 'By availability': (a, b) => -(a.affordable - b.affordable), + 'By price': (a, b) => a.price - b.price, +}; + +export const CasinoPrizeDispenser = (props, context) => { + const { act, data } = useBackend(context); + return ( + + + + + + + + + ); +}; + +const CasinoPrizeDispenserSearch = (props, context) => { + const [ + _searchText, + setSearchText, + ] = useLocalState(context, 'search', ''); + const [ + _sortOrder, + setSortOrder, + ] = useLocalState(context, 'sort', ''); + const [ + descending, + setDescending, + ] = useLocalState(context, 'descending', false); + return ( + + + + setSearchText(value)} + /> + + + setSortOrder(v)} /> + + +