diff --git a/code/__defines/species_languages_vr.dm b/code/__defines/species_languages_vr.dm index 78054e6ba8..32457d9567 100644 --- a/code/__defines/species_languages_vr.dm +++ b/code/__defines/species_languages_vr.dm @@ -11,6 +11,7 @@ #define LANGUAGE_VESPINAE "Vespinae" #define LANGUAGE_SPACER "Spacer" #define LANGUAGE_CLOWNISH "Coulrian" +#define LANGUAGE_TAVAN "Tavan" #define LANGUAGE_CHIMPANZEE "Chimpanzee" #define LANGUAGE_NEAERA "Neaera" diff --git a/code/_helpers/time.dm b/code/_helpers/time.dm index 8271f14ac1..71ef606a85 100644 --- a/code/_helpers/time.dm +++ b/code/_helpers/time.dm @@ -50,13 +50,17 @@ var/station_date = "" var/next_station_date_change = 1 DAY #define duration2stationtime(time) time2text(station_time_in_ds + time, "hh:mm") -#define worldtime2stationtime(time) time2text(GLOB.roundstart_hour HOURS + time, "hh:mm") +#define roundstart_delay_time (world.time - round_duration_in_ds) +#define world_time_in_ds(time) (GLOB.roundstart_hour HOURS + time - roundstart_delay_time) #define round_duration_in_ds (GLOB.round_start_time ? REALTIMEOFDAY - GLOB.round_start_time : 0) #define station_time_in_ds (GLOB.roundstart_hour HOURS + round_duration_in_ds) /proc/stationtime2text() return time2text(station_time_in_ds + GLOB.timezoneOffset, "hh:mm") +/proc/worldtime2stationtime(time) + return time2text(world_time_in_ds(time) + GLOB.timezoneOffset, "hh:mm") + /proc/stationdate2text() var/update_time = FALSE if(station_time_in_ds > next_station_date_change) diff --git a/code/controllers/subsystems/throwing.dm b/code/controllers/subsystems/throwing.dm index 3b908ac393..6c3a799b28 100644 --- a/code/controllers/subsystems/throwing.dm +++ b/code/controllers/subsystems/throwing.dm @@ -67,7 +67,7 @@ SUBSYSTEM_DEF(throwing) src.speed = speed src.thrower = thrower src.callback = callback - if(!QDELETED(thrower)) + if(!QDELETED(thrower) && ismob(thrower)) src.target_zone = thrower.zone_sel ? thrower.zone_sel.selecting : null dist_x = abs(target.x - thrownthing.x) @@ -204,4 +204,4 @@ SUBSYSTEM_DEF(throwing) if(hit_thing) finalize(hit=TRUE, t_target=hit_thing) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 9261da0dd7..96c5a3ad0f 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -376,7 +376,7 @@ icon_state = unique_reskin[pick] item_state = unique_reskin[pick] reskin_ran = TRUE - to_chat(M, "[src] is now '[pick].'") + to_chat(M, "[src] is now '[pick]'.") /obj/item/weapon/storage/part_replacer/drop_contents() // hacky-feeling tier-based drop system hide_from(usr) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index c2170d5b7b..f33549fc23 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -219,7 +219,7 @@ if(H.reagents.reagent_list.len >= 1) for(var/datum/reagent/R in H.reagents.reagent_list) reagentData[++reagentData.len] = list( - "name" = R.name, + "name" = R.name, "amount" = R.volume, "overdose" = (R.overdose && R.volume > R.overdose) ? TRUE : FALSE, ) @@ -291,7 +291,7 @@ if(istype(E, /obj/item/organ/external/chest) && H.is_lung_ruptured()) organData["lungRuptured"] = 1 - + for(var/datum/wound/W in E.wounds) if(W.internal) organData["internalBleeding"] = 1 @@ -349,10 +349,10 @@ var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(target)) var/name = occupant ? occupant.name : "Unknown" P.info = "
Body Scan - [name]

" - P.info += "Time of scan: [worldtime2stationtime(world.time)]

" + P.info += "Time of scan: [stationtime2text()]

" P.info += "[generate_printing_text()]" P.info += "

Notes:
" - P.name = "Body Scan - [name] ([worldtime2stationtime(world.time)]" + P.name = "Body Scan - [name] ([stationtime2text()]" else return FALSE @@ -479,7 +479,7 @@ var/obj/item/device/nif/N = I //VOREStation Add: NIFs if(istype(I) && I.known_implant) imp += "[I] implanted:" - if(istype(N) && N.known_implant) //VOREStation Add: NIFs + else if(istype(N) && N.known_implant) //VOREStation Add: NIFs imp += "[N] implanted:" else unknown_body++ diff --git a/code/game/machinery/atm_ret_field.dm b/code/game/machinery/atm_ret_field.dm index 9e9a2af168..bcf78539a7 100644 --- a/code/game/machinery/atm_ret_field.dm +++ b/code/game/machinery/atm_ret_field.dm @@ -230,4 +230,11 @@ desc = "A shimmering forcefield that keeps the good air inside and the bad air outside. It seems fairly solid, almost like it's made out of some kind of hardened light.

Note: prolonged immersion in active atmospheric retention fields may have negative long-term health consequences." icon = 'icons/obj/atm_fieldgen.dmi' icon_state = "arfg_field" - density = TRUE \ No newline at end of file + density = TRUE + +/obj/machinery/atmospheric_field_generator/perma/underdoors + field_type = /obj/structure/atmospheric_retention_field/underdoors + +/obj/structure/atmospheric_retention_field/underdoors + plane = OBJ_PLANE + layer = UNDER_JUNK_LAYER diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index cc8227147c..75ef8e3763 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -319,6 +319,23 @@ density = FALSE opacity = 0 + +// SUBTYPE: Shuttle +// Slightly weaker, intergrated shutters - open state is hidden from view. Found on fancy_shuttles +/obj/machinery/door/blast/shuttle + name = "shuttle blast doors" + icon_state_open = "spdoor0" + icon_state_opening = "spdoorc0" + icon_state_closed = "spdoor1" + icon_state_closing = "spdoorc1" + icon_state = "spdoor1" + maxhealth = 400 + +/obj/machinery/door/blast/shuttle/open + icon_state = "spdoor0" + density = FALSE + opacity = 0 + // SUBTYPE: Shutters // Nicer looking, and also weaker, shutters. Found in kitchen and similar areas. /obj/machinery/door/blast/shutters diff --git a/code/game/machinery/doors/firedoor_vr.dm b/code/game/machinery/doors/firedoor_vr.dm index 2bc297a041..2466cabe87 100644 --- a/code/game/machinery/doors/firedoor_vr.dm +++ b/code/game/machinery/doors/firedoor_vr.dm @@ -16,3 +16,8 @@ name = "\improper Emergency Shutter System" desc = "Emergency air-tight shutter, capable of sealing off breached areas. This model fits flush with the walls, and has a panel in the floor for maintenance." icon = 'icons/obj/doors/DoorHazardHidden_steel.dmi' + +/obj/machinery/door/firedoor/glass/hidden/shuttle + name = "\improper Emergency Shuttle Shutters" + desc = "Emergency air-tight shutter, capable of sealing off breached areas. This model fits flush with shuttle walls." + icon = 'icons/obj/doors/DoorHazardHidden_shuttle.dmi' \ No newline at end of file diff --git a/code/game/machinery/pipe/pipe_recipes.dm b/code/game/machinery/pipe/pipe_recipes.dm index 4175efc3ff..ad70f938a0 100644 --- a/code/game/machinery/pipe/pipe_recipes.dm +++ b/code/game/machinery/pipe/pipe_recipes.dm @@ -134,9 +134,7 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list( dirtype = initial(construction_type.dispenser_class) if (dirtype == PIPE_TRIN_M) icon_state_m = "[icon_state]m" - - // YW Edit: Add HE pipes to non-paintable objects list. - paintable = ispath(path, /obj/machinery/atmospherics/pipe) && !(ispath(path, /obj/machinery/atmospherics/pipe/vent)) && !(ispath(path, /obj/machinery/atmospherics/pipe/simple/heat_exchanging)) // VOREStation Add + paintable = !ispath(path, /obj/machinery/atmospherics/pipe/simple/heat_exchanging) && ispath(path, /obj/machinery/atmospherics/pipe) && !(ispath(path, /obj/machinery/atmospherics/pipe/vent)) // VOREStation Add // diff --git a/code/game/objects/items/robot/robot_upgrades_vr.dm b/code/game/objects/items/robot/robot_upgrades_vr.dm index b31f737e78..215a936bda 100644 --- a/code/game/objects/items/robot/robot_upgrades_vr.dm +++ b/code/game/objects/items/robot/robot_upgrades_vr.dm @@ -8,6 +8,7 @@ R.add_language(LANGUAGE_ENOCHIAN, 1) R.add_language(LANGUAGE_SLAVIC, 1) R.add_language(LANGUAGE_DRUDAKAR, 1) + R.add_language(LANGUAGE_TAVAN, 1) return 1 else return 0 diff --git a/code/game/objects/items/weapons/RPD_vr.dm b/code/game/objects/items/weapons/RPD_vr.dm index e5ed4e79f5..0b6f15258c 100644 --- a/code/game/objects/items/weapons/RPD_vr.dm +++ b/code/game/objects/items/weapons/RPD_vr.dm @@ -16,7 +16,7 @@ item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_vr.dmi', - ) + ) flags = NOBLUDGEON force = 10 throwforce = 10 @@ -184,9 +184,9 @@ activate() animate_deletion(A) return - + if((mode & PAINT_MODE)) //Paint pipes - if(istype(A, /obj/machinery/atmospherics/pipe)) + if(!istype(A, /obj/machinery/atmospherics/pipe/simple/heat_exchanging) && istype(A, /obj/machinery/atmospherics/pipe)) var/obj/machinery/atmospherics/pipe/P = A playsound(src, 'sound/machines/click.ogg', 50, 1) P.change_color(pipe_colors[paint_color]) diff --git a/code/game/objects/items/weapons/implants/implant_vr.dm b/code/game/objects/items/weapons/implants/implant_vr.dm index 133bcb48f4..0702ac6697 100644 --- a/code/game/objects/items/weapons/implants/implant_vr.dm +++ b/code/game/objects/items/weapons/implants/implant_vr.dm @@ -35,6 +35,7 @@ source.add_language(LANGUAGE_CANILUNZT) source.add_language(LANGUAGE_SLAVIC) source.add_language(LANGUAGE_SOL_COMMON) //In case they're giving a xenomorph an implant or something. + source.add_language(LANGUAGE_TAVAN) /obj/item/weapon/implant/vrlanguage/post_implant(mob/source) source.mind.store_memory("A implant can be activated by using the smile emote, say *smile to attempt to activate.", 0, 0) diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm index a98edbf598..c67b06d840 100644 --- a/code/game/objects/random/mapping.dm +++ b/code/game/objects/random/mapping.dm @@ -1456,3 +1456,193 @@ return pick(prob(5);/turf/simulated/floor/lava, prob(3);/turf/simulated/floor/outdoors/rocks/caves, prob(1);/turf/simulated/mineral) + +//VOREStation Add Start - Underdark stuff that would be cool if existed if the underdark doesn't. + +/obj/random/underdark + name = "random underdark loot" + desc = "Random loot for Underdark." + icon = 'icons/obj/items.dmi' + icon_state = "spickaxe" + +/obj/random/underdark/item_to_spawn() + return pick(prob(3);/obj/random/multiple/underdark/miningdrills, + prob(3);/obj/random/multiple/underdark/ores, + prob(2);/obj/random/multiple/underdark/treasure, + prob(1);/obj/random/multiple/underdark/mechtool) + +/obj/random/underdark/uncertain + icon_state = "upickaxe" + spawn_nothing_percentage = 65 //only 33% to spawn loot + +/obj/random/multiple/underdark/miningdrills + name = "random underdark mining tool loot" + desc = "Random mining tool loot for Underdark." + icon = 'icons/obj/items.dmi' + icon_state = "spickaxe" + +/obj/random/multiple/underdark/miningdrills/item_to_spawn() + return pick( + prob(10);list(/obj/item/weapon/pickaxe/silver), + prob(8);list(/obj/item/weapon/pickaxe/drill), + prob(6);list(/obj/item/weapon/pickaxe/jackhammer), + prob(5);list(/obj/item/weapon/pickaxe/gold), + prob(4);list(/obj/item/weapon/pickaxe/plasmacutter), + prob(2);list(/obj/item/weapon/pickaxe/diamond), + prob(1);list(/obj/item/weapon/pickaxe/diamonddrill) + ) + +/obj/random/multiple/underdark/ores + name = "random underdark mining ore loot" + desc = "Random mining utility loot for Underdark." + icon = 'icons/obj/mining.dmi' + icon_state = "satchel" + +/obj/random/multiple/underdark/ores/item_to_spawn() + return pick( + prob(9);list( + /obj/item/weapon/storage/bag/ore, + /obj/item/weapon/shovel, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/hydrogen, + /obj/item/weapon/ore/hydrogen, + /obj/item/weapon/ore/hydrogen, + /obj/item/weapon/ore/hydrogen, + /obj/item/weapon/ore/hydrogen, + /obj/item/weapon/ore/hydrogen + ), + prob(7);list( + /obj/item/weapon/storage/bag/ore, + /obj/item/weapon/pickaxe, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium + ), + prob(4);list( + /obj/item/clothing/suit/radiation, + /obj/item/clothing/head/radiation, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium), + prob(2);list( + /obj/item/device/flashlight/lantern, + /obj/item/clothing/glasses/material, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond + ), + prob(1);list( + /obj/item/weapon/mining_scanner, + /obj/item/weapon/shovel/spade, + /obj/item/weapon/ore/verdantium, + /obj/item/weapon/ore/verdantium, + /obj/item/weapon/ore/verdantium, + /obj/item/weapon/ore/verdantium, + /obj/item/weapon/ore/verdantium + ) + ) + +/obj/random/multiple/underdark/treasure + name = "random underdark treasure" + desc = "Random treasure loot for Underdark." + icon = 'icons/obj/storage.dmi' + icon_state = "cashbag" + +/obj/random/multiple/underdark/treasure/item_to_spawn() + return pick( + prob(5);list( + /obj/random/coin, + /obj/random/coin, + /obj/random/coin, + /obj/random/coin, + /obj/random/coin, + /obj/item/clothing/head/pirate + ), + prob(4);list( + /obj/item/weapon/storage/bag/cash, + /obj/item/weapon/spacecash/c500, + /obj/item/weapon/spacecash/c100, + /obj/item/weapon/spacecash/c50 + ), + prob(3);list( + /obj/item/clothing/head/hardhat/orange, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold), + prob(1);list( + /obj/item/stack/material/phoron, + /obj/item/stack/material/phoron, + /obj/item/stack/material/phoron, + /obj/item/stack/material/phoron, + /obj/item/stack/material/diamond, + /obj/item/stack/material/diamond, + /obj/item/stack/material/diamond + ) + ) + +/obj/random/multiple/underdark/mechtool + name = "random underdark mech equipment" + desc = "Random mech equipment loot for Underdark." + icon = 'icons/mecha/mecha_equipment.dmi' + icon_state = "mecha_clamp" + +/obj/random/multiple/underdark/mechtool/item_to_spawn() + return pick( + prob(12);list(/obj/item/mecha_parts/mecha_equipment/tool/drill), + prob(10);list(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp), + prob(8);list(/obj/item/mecha_parts/mecha_equipment/generator), + prob(7);list(/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot/rigged), + prob(6);list(/obj/item/mecha_parts/mecha_equipment/repair_droid), + prob(3);list(/obj/item/mecha_parts/mecha_equipment/gravcatapult), + prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser), + prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged), + prob(1);list(/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill), + ) +//VOREStation Add End \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 384cb0fcd7..fad4613909 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -47,6 +47,7 @@ /obj/item/clothing/head/soft, /obj/item/clothing/suit/storage/hooded/wintercoat/cargo, /obj/item/clothing/suit/storage/hooded/wintercoat/cargo/qm, + /obj/item/clothing/head/beret/qm, /obj/item/clothing/shoes/boots/winter/supply) /obj/structure/closet/secure_closet/quartermaster/Initialize() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 9e2aa36cb4..5050fbcb80 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -28,6 +28,8 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/engineering, /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/ce, /obj/item/clothing/shoes/boots/winter/engineering, + /obj/item/clothing/head/beret/engineering/ce, + /obj/item/clothing/head/beret/engineering/ce/white, /obj/item/weapon/tank/emergency/oxygen/engi, /obj/item/weapon/reagent_containers/spray/windowsealant, //VOREStation Add, /obj/item/weapon/pipe_dispenser) //YW Add diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 062913f692..c55f51d00c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -141,6 +141,8 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/medical, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/cmo, /obj/item/clothing/shoes/boots/winter/medical, + /obj/item/clothing/head/beret/medical/cmo, + /obj/item/clothing/head/beret/medical/cmo/blue, /obj/item/weapon/storage/box/freezer, /obj/item/clothing/mask/gas, /obj/item/taperoll/medical, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index c9cea196b3..a23147b0c5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -47,6 +47,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/science, /obj/item/clothing/suit/storage/hooded/wintercoat/science/rd, /obj/item/clothing/shoes/boots/winter/science, + /obj/item/clothing/head/beret/science/rd, /obj/item/weapon/bluespace_harpoon) //VOREStation Add /obj/structure/closet/secure_closet/xenoarchaeologist 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 8a8becaff9..82e5dcbafc 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -61,7 +61,9 @@ /obj/item/clothing/under/suit_jacket/teal, /obj/item/clothing/under/suit_jacket/teal/skirt, /obj/item/clothing/glasses/sunglasses, - /obj/item/clothing/suit/storage/hooded/wintercoat/hop) + /obj/item/clothing/suit/storage/hooded/wintercoat/hop, + /obj/item/clothing/head/caphat/hop/beret/, + /obj/item/clothing/head/caphat/hop/beret/white) /obj/structure/closet/secure_closet/hos diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 7ba61d9dd4..f04d420909 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -464,6 +464,7 @@ /obj/item/clothing/suit/captunic, /obj/item/clothing/suit/captunic/capjacket, /obj/item/clothing/head/caphat/cap, + /obj/item/clothing/head/caphat/beret, /obj/item/clothing/under/rank/captain, /obj/item/clothing/shoes/brown, /obj/item/clothing/gloves/captain, diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm index 5a7f7fa6ba..171a5f5941 100644 --- a/code/game/objects/structures/ghost_pods/event_vr.dm +++ b/code/game/objects/structures/ghost_pods/event_vr.dm @@ -41,7 +41,8 @@ "Frost Giant Spider" = /mob/living/simple_mob/animal/giant_spider/frost, "Nurse Giant Spider" = /mob/living/simple_mob/animal/giant_spider/nurse/eggless, "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless, - "Weretiger" = /mob/living/simple_mob/vore/weretiger + "Weretiger" = /mob/living/simple_mob/vore/weretiger, + "Catslug" = /mob/living/simple_mob/vore/alienanimals/catslug ) /obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M) diff --git a/code/game/turfs/simulated/fancy_shuttles.dm b/code/game/turfs/simulated/fancy_shuttles.dm index 2de10aeb38..010dced63f 100644 --- a/code/game/turfs/simulated/fancy_shuttles.dm +++ b/code/game/turfs/simulated/fancy_shuttles.dm @@ -58,13 +58,10 @@ GLOBAL_LIST_EMPTY(fancy_shuttles) /turf/simulated/wall/fancy_shuttle/Initialize(mapload, materialtype, rmaterialtype, girdertype) . = ..(mapload, MAT_STEELHULL, MAT_STEELHULL, MAT_STEELHULL) -/turf/simulated/wall/fancy_shuttle/window +/turf/simulated/wall/fancy_shuttle/low //you can see over it and it doesn't block air but you still cant walk over it + blocks_air = FALSE opacity = FALSE - icon_state = "hull_transparent" - -/turf/simulated/wall/fancy_shuttle/window/attack_generic(mob/user, damage, attack_message) - take_damage(damage) - return damage + icon_state = "hull_low" /turf/simulated/wall/fancy_shuttle/nondense density = FALSE @@ -180,6 +177,41 @@ GLOBAL_LIST_EMPTY(fancy_shuttles) /obj/effect/floor_decal/fancy_shuttle/get_cache_key(var/turf/T) return "[alpha]-[color]-[dir]-[icon_state]-[T.layer]-[icon_file]" +/** + * Shuttle Glass + */ + //OLD GLASS - USE NEW GLASS +/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 + +//NEW GLASS +/obj/structure/window/fancy_shuttle + name = "shuttle window" + desc = "It looks rather strong. Might take a few good hits to shatter it." + icon = 'icons/turf/fancy_shuttles/_fancy_helpers.dmi' + icon_state = "hull_window" + density = TRUE + fulltile = TRUE + maxhealth = 60 + reinf = 1 + force_threshold = 7 + var/fancy_shuttle_tag + +// Trust me, this is WAY faster than the normal wall overlays shenanigans, don't worry about performance +/obj/structure/window/fancy_shuttle/update_icon() + 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]" + /** * Invisible ship equipment (otherwise the same as normal) */ @@ -252,24 +284,24 @@ GLOBAL_LIST_EMPTY(fancy_shuttles) icon = 'icons/turf/fancy_shuttles/exploration_preview.dmi' /** - * Sec shuttle - * North facing: W:13, H:18 + * Secbus shuttle + * North facing: W:11, H:16 */ -/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' +/obj/effect/fancy_shuttle/secbus + icon = 'icons/turf/fancy_shuttles/secbus_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/secbus.dmi' +/obj/effect/fancy_shuttle_floor_preview/secbus + icon = 'icons/turf/fancy_shuttles/secbus_preview.dmi' /** - * Med shuttle - * North facing: W:13, H:18 + * Medbus shuttle + * North facing: W:11, H:16 */ -/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' +/obj/effect/fancy_shuttle/medbus + icon = 'icons/turf/fancy_shuttles/medbus_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/medbus.dmi' +/obj/effect/fancy_shuttle_floor_preview/medbus + icon = 'icons/turf/fancy_shuttles/medbus_preview.dmi' /** * Orange line tram @@ -283,7 +315,7 @@ GLOBAL_LIST_EMPTY(fancy_shuttles) /** * Tour bus - * North facing: W:7, H:13 + * North facing: W:7, H:12 */ /obj/effect/fancy_shuttle/tourbus icon = 'icons/turf/fancy_shuttles/tourbus_preview.dmi' @@ -291,6 +323,16 @@ GLOBAL_LIST_EMPTY(fancy_shuttles) /obj/effect/fancy_shuttle_floor_preview/tourbus icon = 'icons/turf/fancy_shuttles/tourbus_preview.dmi' +/** + * Stellar Delight Shuttle + * North facing: W:9, H:14 + */ +/obj/effect/fancy_shuttle/sd_shuttle + icon = 'icons/turf/fancy_shuttles/sd_shuttle_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/sd_shuttle.dmi' +/obj/effect/fancy_shuttle_floor_preview/sd_shuttle + icon = 'icons/turf/fancy_shuttles/sd_shuttle_preview.dmi' + /** * Delivery shuttle * North facing: W:8, H:10 diff --git a/code/modules/ai/ai_holder_targeting.dm b/code/modules/ai/ai_holder_targeting.dm index 560ad61a06..e3d98f1620 100644 --- a/code/modules/ai/ai_holder_targeting.dm +++ b/code/modules/ai/ai_holder_targeting.dm @@ -4,7 +4,8 @@ var/hostile = FALSE // Do we try to hurt others? var/retaliate = FALSE // Attacks whatever struck it first. Mobs will still attack back if this is false but hostile is true. var/mauling = FALSE // Attacks unconscious mobs - var/handle_corpse = FALSE // Allows AI to acknowledge corpses (e.g. nurse spiders) + var/unconscious_vore = FALSE //VOREStation Add - allows a mob to go for unconcious targets IF their vore prefs align + var/handle_corpse = FALSE // Allows AI to acknowledge corpses (e.g. nurse spiders) var/atom/movable/target = null // The thing (mob or object) we're trying to kill. var/atom/movable/preferred_target = null// If set, and if given the chance, we will always prefer to target this over other options. @@ -129,6 +130,14 @@ if(L.stat == UNCONSCIOUS) // Do we have mauling? Yes? Then maul people who are sleeping but not SSD if(mauling) return TRUE + //VOREStation Add Start + else if(unconscious_vore && L.allowmobvore) + var/mob/living/simple_mob/vore/eater = holder + if(eater.will_eat(L)) + return TRUE + else + return FALSE + //VOREStation Add End else return FALSE if(holder.IIsAlly(L)) diff --git a/code/modules/busy_space_vr/organizations.dm b/code/modules/busy_space_vr/organizations.dm index cd3a707a63..f52a61fe2d 100644 --- a/code/modules/busy_space_vr/organizations.dm +++ b/code/modules/busy_space_vr/organizations.dm @@ -2665,6 +2665,61 @@ "Expeditionary Fleet HQ" ) +/datum/lore/organization/gov/altevian_hegemony + name = "The Altevian Hegemony" + short_name = "Altevian Hegemony " + acronym = "AH" + desc = "The Altevians are a space-faring race of rodents that resemble Earth-like rats. \ + They do not have a place they call home in terms of a planet, and instead have massive multiple-kilometer-long colony-ships \ + that are constantly on the move and typically keep operations outside of known populated systems to not eat the resources from others. \ + Their primary focus is trade and slavage operations and can be expected to be seen around both densely populated and empty systems for their work." + history = "" + work = "salvage and trade operators" + headquarters = "AH-CV Migrant" + motto = "" + + ship_prefixes = list("AH-DV" = "a diplomatic", "AH-EV" = "an exploration", "AH-FV" = "a fueling", "AH-FV" = "a cargo", "AH-SV" = "a research", "AH-TV" = "a colony-transporter", "AH-RV" = "an emergency response", "AH-RV" = "a response", "AH-MV" = "a medical") + ship_names = list( + "Platinum", + "Warson", + "Mane", + "Holland", + "Arauz", + "Diamond", + "Gold", + "Steam", + "Boiler", + "Slip", + "Lavender", + "Wheel", + "Stuntson", + "Desto", + "Palos", + "Matterson", + "Mill", + "Smoke", + "Squeson", + "Rabion", + "Strikedown", + "Cluster", + "Raling", + "Archaeologist", + "Beaker" + ) + destination_names = list( + "the AH-CV Migrant flagship", + "one of our research colony-ships", + "the AH-CV Lotus", + "the AH-CV Anvil", + "the AH-CV Generations", + "the AH-CV Galley", + "the AH-CV Prosperity", + "the AH-CV Kitsap", + "the AH-CV Diamondback", + "one of our colony-ships", + "one of our production fleets" + ) + ////////////////////////////////////////////////////////////////////////////////// // Military @@ -3022,4 +3077,4 @@ i-- //ex: "Phalanx One-Niner", "Sledgehammer Actual" (CO/VIP), "Kodiak Seven-Four", "Tomahawk Two-Zero" - //probably a more elegant (read: fancier) way to do the second part but fuck it, this works just fine + //probably a more elegant (read: fancier) way to do the second part but fuck it, this works just fine \ No newline at end of file diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 2e492aca03..b98d08131d 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -22,12 +22,27 @@ desc = "No one in a commanding position should be without a perfect, white hat of ultimate authority." icon_state = "officercap" +/obj/item/clothing/head/caphat/beret + name = "captain's beret" + desc = "A beret fit for a leader." + icon_state = "beretcap" + //HOP /obj/item/clothing/head/caphat/hop name = "crew resource's hat" desc = "A stylish hat that both protects you from enraged former-crewmembers and gives you a false sense of authority." icon_state = "hopcap" +/obj/item/clothing/head/caphat/hop/beret + name = "head of personnel's beret" + desc = "The symbol of true bureaucratic micromanagement, although in a fancy form." + icon_state = "berethop" + +/obj/item/clothing/head/caphat/hop/beret/white + name = "head of personnel's white beret" + desc = "The symbol of true bureaucratic micromanagement, although in a fancy form." + icon_state = "berethopwhite" + //Chaplain /obj/item/clothing/head/chaplain_hood name = "chaplain's hood" @@ -207,3 +222,62 @@ desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is navy blue." icon_state = "surgcap_navyblue" item_state_slots = list(slot_r_hand_str = "beret_navy", slot_l_hand_str = "beret_navy") + +/obj/item/clothing/head/beret/medical + name = "medical officer's beret" + desc = "A fancy beret with a blue cross, smells sterile." + icon_state = "beretmed" + +/obj/item/clothing/head/beret/medical/chem + name = "chemist's beret" + desc = "A fancy beret with an orange beaker. You're not sure if you should smell it." + icon_state = "beretchem" + +/obj/item/clothing/head/beret/medical/viro + name = "virologist's beret" + desc = "A fancy beret with a green cross. Hopefully it's virus free!" + icon_state = "beretviro" + +/obj/item/clothing/head/beret/medical/cmo + name = "chief medical officer's beret" + desc = "A fancy beret with a green cross, signifying your status in the station's medbay." + icon_state = "beretcmo" + +/obj/item/clothing/head/beret/medical/cmo/blue + name = "chief medical officer's beret" + desc = "A fancy beret with a blue and white cross. Try not to be the chief malpractice officer in it!" + icon_state = "beretcmoblue" + +//Science + +/obj/item/clothing/head/beret/science + name = "scientist's beret" + desc = "A scientist's beret. Looks like it's covered in slime." + icon_state = "beretsci" + +/obj/item/clothing/head/beret/science/robotics + name = "roboticist's beret" + desc = "A roboticist's beret. It strongly smells of oil." + icon_state = "beretrobo" + +/obj/item/clothing/head/beret/science/rd + name = "research director's beret" + desc = "A beret worn only by highly intelligent people. Or so its wearers say." + icon_state = "beretrd" + +//Chief Engineer +/obj/item/clothing/head/beret/engineering/ce + name = "chief engineer's beret" + desc = "A beret that will surely make you look way cooler than a hard hat, although lack of protection is the price." + icon_state = "beretce" + +/obj/item/clothing/head/beret/engineering/ce/white + name = "chief engineer's white beret" + desc = "A beret that will surely make you look way cooler than a hard hat, although lack of protection is the price." + icon_state = "beretcewhite" + +//Quartermaster +/obj/item/clothing/head/beret/qm + name = "quartermaster's white beret" + desc = "This headwear shows off your Cargonian leadership." + icon_state = "beretqm" \ No newline at end of file diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 16f39f167d..8367a6e045 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -67,6 +67,36 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO rolled_sleeves = -1 //Please never +/obj/item/clothing/under/clown //i'm only putting it here to make subtypes of it, since the original suit is under/rank/clown + name = "clown suit" + desc = "Honk!" + icon_state = "clown" + rolled_sleeves = -1 + +/obj/item/clothing/under/clown/green + name = "green clown suit" + icon_state = "greenclown" + +/obj/item/clothing/under/clown/purple + name = "purple clown suit" + icon_state = "purpleclown" + +/obj/item/clothing/under/clown/yellow + name = "yellow clown suit" + icon_state = "yellowclown" + +/obj/item/clothing/under/clown/orange + name = "orange clown suit" + icon_state = "orangeclown" + +/obj/item/clothing/under/clown/blue + name = "blue clown suit" + icon_state = "blueclown" + +/obj/item/clothing/under/clown/rainbow + name = "rainbow clown suit" + icon_state = "rainbowclown" + /obj/item/clothing/under/rank/vice name = "vice officer's jumpsuit" desc = "It's the standard issue pretty-boy outfit, as seen on Holo-Vision." @@ -244,6 +274,11 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO rolled_sleeves = -1 //Please never +/obj/item/clothing/under/sexymime/dress //another style of dress closer to the jumpsuit than the sexy outfit + name = "mime's jumpskirt" + desc = "It's not very colourful." + icon_state = "mimedress" + /obj/item/clothing/under/gladiator name = "gladiator uniform" desc = "Are you not entertained? Is that not why you are here?" diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index b1cfd9ad17..6f7d8d7a4b 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -1239,7 +1239,8 @@ /obj/item/clothing/mask/surgical = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/medical = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt = 5, - /obj/item/clothing/shoes/boots/winter/medical = 5 + /obj/item/clothing/shoes/boots/winter/medical = 5, + /obj/item/clothing/head/beret/medical = 5 ) req_log_access = access_hop has_logs = 1 @@ -1256,6 +1257,7 @@ /obj/item/clothing/shoes/white = 5, /obj/item/clothing/suit/storage/toggle/labcoat/chemist = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/chemist = 5, + /obj/item/clothing/head/beret/medical/chem = 5, /obj/item/weapon/storage/backpack/chemistry = 5, /obj/item/weapon/storage/backpack/satchel/chem = 5, /obj/item/weapon/storage/bag/chemistry = 5 @@ -1292,6 +1294,7 @@ /obj/item/clothing/shoes/white = 5, /obj/item/clothing/suit/storage/toggle/labcoat/virologist = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro = 5, + /obj/item/clothing/head/beret/medical/viro = 5, /obj/item/clothing/mask/surgical = 5, /obj/item/weapon/storage/backpack/virology = 5, /obj/item/weapon/storage/backpack/satchel/vir = 5 @@ -1315,6 +1318,7 @@ /obj/item/clothing/shoes/slippers = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/science = 5, /obj/item/clothing/shoes/boots/winter/science = 5, + /obj/item/clothing/head/beret/science = 5, /obj/item/weapon/storage/backpack/toxins = 5, /obj/item/weapon/storage/backpack/satchel/tox = 5 ) @@ -1331,6 +1335,7 @@ /obj/item/clothing/under/rank/roboticist = 5, /obj/item/clothing/suit/storage/toggle/labcoat/roboticist = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/science/robotics = 5, + /obj/item/clothing/head/beret/science/robotics = 5, /obj/item/clothing/shoes/black = 5, /obj/item/clothing/gloves/black = 5, /obj/item/weapon/storage/backpack/toxins = 5, @@ -1537,4 +1542,51 @@ /obj/item/clothing/suit/storage/forensics/red = 5 ) req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/mimedrobe + name = "mime wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "..." + icon_state = "mimedrobe" + req_access = list(access_mime) + products = list( + /obj/item/clothing/under/mime = 1, + /obj/item/clothing/under/sexymime = 1, + /obj/item/clothing/under/sexymime/dress = 1, + /obj/item/clothing/mask/gas/mime = 1, + /obj/item/clothing/mask/gas/sexymime = 1, + /obj/item/clothing/head/soft/mime = 1, + /obj/item/clothing/head/collectable/beret = 1, + /obj/item/clothing/suit/suspenders = 1, + /obj/item/clothing/shoes/mime = 1 + ) + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/clowndrobe + name = "clown wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Honk!" + icon_state = "clowndrobe" + req_access = list(access_clown) + products = list( + /obj/item/clothing/under/rank/clown = 1, + /obj/item/clothing/under/sexyclown = 1, + /obj/item/clothing/under/clown/green = 1, + /obj/item/clothing/under/clown/purple = 1, + /obj/item/clothing/under/clown/yellow = 1, + /obj/item/clothing/under/clown/orange = 1, + /obj/item/clothing/under/clown/blue = 1, + /obj/item/clothing/mask/gas/clown_hat = 1, + /obj/item/clothing/mask/gas/sexyclown = 1, + /obj/item/clothing/mask/emotions = 1, + /obj/item/clothing/shoes/clown_shoes = 1, + /obj/item/weapon/reagent_containers/food/snacks/pie = 5, + /obj/item/weapon/bananapeel = 5 + ) + contraband = list( + /obj/item/clothing/under/clown/rainbow = 1 + ) + req_log_access = access_hop has_logs = 1 \ No newline at end of file diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index e4a516d177..0963dffeff 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -11,6 +11,7 @@ icon_state = "mining_drill" circuit = /obj/item/weapon/circuitboard/miningdrill var/braces_needed = 2 + var/total_brace_tier = 0 var/list/obj/machinery/mining/brace/supports = list() var/supported = 0 var/active = 0 @@ -176,6 +177,9 @@ if(newtag) name = "[initial(name)] #[newtag]" to_chat(user, "You changed the drill ID to: [newtag]") + else + name = "[initial(name)]" + to_chat(user, SPAN_NOTICE("You removed the drill's ID and any extraneous labels.")) return if(default_deconstruction_screwdriver(user, O)) return @@ -199,6 +203,7 @@ /obj/machinery/mining/drill/attack_hand(mob/user as mob) check_supports() + RefreshParts() if (panel_open && cell && user.Adjacent(src)) to_chat(user, "You take out \the [cell].") @@ -219,6 +224,8 @@ if(active) visible_message("\The [src] lurches downwards, grinding noisily.") need_update_field = 1 + harvest_speed *= total_brace_tier + charge_use *= total_brace_tier else visible_message("\The [src] shudders to a grinding halt.") else @@ -249,9 +256,7 @@ for(var/obj/item/weapon/stock_parts/P in component_parts) if(istype(P, /obj/item/weapon/stock_parts/micro_laser)) - harvest_speed = P.rating - if(P.rating >= 5) - harvest_speed *= 2 + harvest_speed = P.rating ** 2 // 1, 4, 9, 16, 25 exotic_drilling = P.rating - 1 if(exotic_drilling >= 1) ore_types |= ore_types_uncommon @@ -277,6 +282,7 @@ /obj/machinery/mining/drill/proc/check_supports() supported = 0 + total_brace_tier = 0 if((!supports || !supports.len) && initial(anchored) == 0) icon_state = "mining_drill" @@ -291,6 +297,8 @@ else for(var/obj/machinery/mining/brace/check in supports) if(check.brace_tier > 3) supported = 1 + for(var/obj/machinery/mining/brace/check in supports) + total_brace_tier += check.brace_tier update_icon() @@ -357,7 +365,7 @@ /obj/machinery/mining/brace/examine(mob/user) . = ..() - if(brace_tier > 3) + if(brace_tier > 2) . += SPAN_NOTICE("The internals of the brace look resilient enough to support a drill by itself.") /obj/machinery/mining/brace/Initialize() diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm index 38eacfc56f..3e53242a77 100644 --- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm @@ -122,6 +122,8 @@ EQUIPMENT("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000), EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1200), EQUIPMENT("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000), + EQUIPMENT("KA Temperature Modulator", /obj/item/borg/upgrade/modkit/heater, 1000), + EQUIPMENT("KA Off-Station Modulator", /obj/item/borg/upgrade/modkit/indoors/offsite, 1500), EQUIPMENT("KA Holster", /obj/item/clothing/accessory/holster/waist/kinetic_accelerator, 350), EQUIPMENT("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250), EQUIPMENT("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 300), diff --git a/code/modules/mob/language/station_vr.dm b/code/modules/mob/language/station_vr.dm index 985212f501..38c5a7d8b7 100644 --- a/code/modules/mob/language/station_vr.dm +++ b/code/modules/mob/language/station_vr.dm @@ -158,6 +158,17 @@ colour = "spacer" machine_understands = TRUE +/datum/language/tavan + name = LANGUAGE_TAVAN + desc = "A language native to the Altevians, it has been adopted by other rodent faring species over time." + key = "E" + speech_verb = "squeaks" + whisper_verb = "squiks" + exclaim_verb = "squeaks loudly" + syllables = list ("sque", "uik", "squeak", "squee", "eak", "eek", "uek", "squik", + "squeek", "sq", "squee", "ee", "ek", "ak", "ueak", "squea") + colour = "tavan" + /datum/language/unathi flags = 0 /datum/language/tajaran diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm index 75b2b1b6e5..16d50aa393 100755 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm @@ -147,10 +147,10 @@ if(!H) //Human could have been deleted in this amount of time. Observing does this, mannequins, etc. return if(!H.nif) - var/obj/item/device/nif/bioadap/new_nif = new() + var/obj/item/device/nif/protean/new_nif = new() new_nif.quick_implant(H) else - H.nif.durability = rand(21,25) + H.nif.durability = 25 /datum/species/protean/hug(var/mob/living/carbon/human/H, var/mob/living/target) return ..() //Wut diff --git a/code/modules/mob/living/silicon/ai/ai_vr.dm b/code/modules/mob/living/silicon/ai/ai_vr.dm index 3234d7269e..481dd97297 100644 --- a/code/modules/mob/living/silicon/ai/ai_vr.dm +++ b/code/modules/mob/living/silicon/ai/ai_vr.dm @@ -7,6 +7,7 @@ add_language(LANGUAGE_DAEMON, 1) add_language(LANGUAGE_ENOCHIAN, 1) add_language(LANGUAGE_DRUDAKAR, 1) + add_language(LANGUAGE_TAVAN, 1) /mob/AIize(var/move = TRUE) . = ..() @@ -16,4 +17,5 @@ add_language(LANGUAGE_ECUREUILIAN, 1) add_language(LANGUAGE_DAEMON, 1) add_language(LANGUAGE_ENOCHIAN, 1) - add_language(LANGUAGE_DRUDAKAR, 1) \ No newline at end of file + add_language(LANGUAGE_DRUDAKAR, 1) + add_language(LANGUAGE_TAVAN, 1) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index 697e6a20e0..920c125a8c 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -36,7 +36,8 @@ LANGUAGE_ECUREUILIAN= 1, LANGUAGE_DAEMON = 1, LANGUAGE_ENOCHIAN = 1, - LANGUAGE_DRUDAKAR = 1 + LANGUAGE_DRUDAKAR = 1, + LANGUAGE_TAVAN = 1 ) /hook/startup/proc/robot_modules_vr() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm new file mode 100644 index 0000000000..3347494b4e --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm @@ -0,0 +1,171 @@ +GLOBAL_VAR_CONST(max_jellyfish, 50) +GLOBAL_VAR_INIT(jellyfish_count, 0) + + +/datum/category_item/catalogue/fauna/space_jellyfish + name = "Alien Wildlife - Space Jellyfish" + desc = "A hostile space predator. \ + This space jellyfish uses hypnotic patterns to lure in prey, which it then wraps in tentacles to leech energy from.\ + It is somewhat weak, but uses unknown means to stun prey. It uses the energy of its prey to replicate itself. \ + These creatures can quickly grow out of control if left to feed and reproduce unchecked. \ + Notable weakness to rapid cooling from ice based weaponry.\ + The flesh is typically non-toxic and quite delicious. Their cores are considered a delicacy in many regions." + value = CATALOGUER_REWARD_EASY + + +/mob/living/simple_mob/vore/alienanimals/space_jellyfish + name = "space jellyfish" + desc = "A semi-translucent space creature, possessing of tentacles and a hypnotizing, flashing bio-luminescent display." + tt_desc = "Semaeostomeae Stellarus" + catalogue_data = list(/datum/category_item/catalogue/fauna/space_jellyfish) + + icon = 'icons/mob/alienanimals_x32.dmi' + icon_state = "space_jellyfish" + icon_living = "space_jellyfish" + icon_dead = "space_jellyfish_dead" + has_eye_glow = TRUE + hovering = TRUE + + + faction = "jellyfish" + maxHealth = 100 + health = 100 + nutrition = 150 + pass_flags = PASSTABLE + movement_cooldown = 3.25 + + see_in_dark = 10 + + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "punches" + + harm_intent_damage = 1 + melee_damage_lower = 1 + melee_damage_upper = 2 + attack_sharp = FALSE + attack_sound = 'sound/weapons/tap.ogg' + attacktext = list("drained", "bludgeoned", "wraped", "tentacle whipped") + + ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/jellyfish + + 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 = 900 + + speak_emote = list("thrumms") + + meat_amount = 0 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/jellyfishcore + + say_list_type = /datum/say_list/jellyfish + + vore_active = 1 + vore_capacity = 1 + vore_bump_chance = 25 + vore_ignores_undigestable = 0 + vore_default_mode = DM_DRAIN + vore_icons = SA_ICON_LIVING + vore_stomach_name = "internal chamber" + vore_default_contamination_flavor = "Wet" + vore_default_contamination_color = "grey" + vore_default_item_mode = IM_DIGEST + + var/reproduction_cooldown = 0 + +/datum/say_list/jellyfish + emote_see = list("flickers", "flashes", "looms","pulses","sways","shimmers hypnotically") + + +/mob/living/simple_mob/vore/alienanimals/space_jellyfish/init_vore() + ..() + var/obj/belly/B = vore_selected + B.name = "internal chamber" + B.desc = "It's smooth and translucent. You can see the world around you distort and wobble with the movement of the space jellyfish. It floats casually, while the delicate flesh seems to form to you. It's surprisingly cool, and flickers with its own light. You're on display for all to see, trapped within the confines of this strange space alien!" + B.mode_flags = 40 + B.digest_brute = 0.5 + B.digest_burn = 0.5 + B.digestchance = 0 + B.absorbchance = 0 + B.escapechance = 15 + + +/mob/living/simple_mob/vore/alienanimals/space_jellyfish/apply_melee_effects(var/atom/A) + if(isliving(A)) + var/mob/living/L = A + var/leech = rand(1,100) + if(L.nutrition) + L.adjust_nutrition(-leech) + adjust_nutrition(leech) + if(prob(25)) + L.adjustHalLoss(leech) + +/mob/living/simple_mob/vore/alienanimals/space_jellyfish/New(newloc, jellyfish) + GLOB.jellyfish_count ++ + var/mob/living/simple_mob/vore/alienanimals/space_jellyfish/parent = jellyfish + if(parent) + parent.faction = faction + ..() + +/mob/living/simple_mob/vore/alienanimals/space_jellyfish/death() + . = ..() + new /obj/item/weapon/reagent_containers/food/snacks/jellyfishcore(loc, nutrition) + GLOB.jellyfish_count -- + qdel(src) + +/mob/living/simple_mob/vore/alienanimals/space_jellyfish/Life() + . = ..() + if(client) + return + reproduce() + +/mob/living/simple_mob/vore/alienanimals/space_jellyfish/proc/reproduce() + if(reproduction_cooldown > 0) + reproduction_cooldown -- + return + if(GLOB.jellyfish_count >= GLOB.max_jellyfish) + return + if(nutrition < 500) + return + if(prob(10)) + new /mob/living/simple_mob/vore/alienanimals/space_jellyfish(loc, src) + adjust_nutrition(-400) + reproduction_cooldown = 60 + +/mob/living/simple_mob/vore/alienanimals/space_jellyfish/Process_Spacemove(var/check_drift = 0) + return TRUE + +/datum/ai_holder/simple_mob/melee/evasive/jellyfish + hostile = TRUE + cooperative = FALSE + retaliate = TRUE + speak_chance = 2 + wander = TRUE + unconscious_vore = TRUE + +/obj/item/weapon/reagent_containers/food/snacks/jellyfishcore + name = "jellyfish core" + icon = 'icons/obj/food_vr.dmi' + icon_state = "jellyfish_core" + desc = "The pulsing core of a space jellyfish! ... It smells delicious." + nutriment_amt = 50 + bitesize = 1000 + nutriment_desc = list("heavenly space meat" = 100) + + var/inherited_nutriment = 0 + +/obj/item/weapon/reagent_containers/food/snacks/jellyfishcore/New(newloc, inherit) + inherited_nutriment = inherit + . = ..() + +/obj/item/weapon/reagent_containers/food/snacks/jellyfishcore/Initialize() + nutriment_amt += inherited_nutriment + . = ..() + reagents.add_reagent("nutriment", nutriment_amt, nutriment_desc) \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm new file mode 100644 index 0000000000..3963cec0b6 --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm @@ -0,0 +1,219 @@ +/datum/category_item/catalogue/fauna/space_ghost + name = "Alien Wildlife - Space Ghost" + desc = "A mysterious and unknown creature made of radical energy.\ + This creature's energy interferes the nervous system in many kinds of creatures, which may result in hallucinations.\ + This creature's lack of a physical form leaves it quite resistant to physical damage.\ + Smaller variants of this creature seem to be vulnerable to bright light.\ + While both variants are quite vulnerable to laser and energy weapons." + value = CATALOGUER_REWARD_EASY + + +/mob/living/simple_mob/vore/alienanimals/space_ghost + name = "space ghost" + desc = "A pulsing mass of darkness that seems to have gained sentience." + tt_desc = "?????" + catalogue_data = list(/datum/category_item/catalogue/fauna/space_ghost) + + icon = 'icons/mob/alienanimals_x32.dmi' + icon_state = "space_ghost" + icon_living = "space_ghost" + icon_dead = "space_ghost_dead" + has_eye_glow = TRUE + hovering = TRUE + pass_flags = PASSTABLE + + faction = "space ghost" + maxHealth = 50 + health = 50 + movement_cooldown = 3.25 + + see_in_dark = 10 + + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "punches" + + harm_intent_damage = 0 + melee_damage_lower = 1 + melee_damage_upper = 1 + attack_sharp = FALSE + attacktext = list("spooked", "startled", "jumpscared", "screamed at") + + ai_holder_type = /datum/ai_holder/simple_mob/melee/space_ghost + + 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 = 999999 + + armor = list( + "melee" = 100, + "bullet" = 100, + "laser" = 0, + "energy" = 0, + "bomb" = 0, + "bio" = 0, + "rad" = 100) + + armor_soak = list( + "melee" = 100, + "bullet" = 100, + "laser" = 0, + "energy" = 0, + "bomb" = 0, + "bio" = 0, + "rad" = 100 + ) + + speak_emote = list("rumbles") + + loot_list = list(/obj/item/weapon/ore/diamond) + + vore_active = 0 + + projectiletype = /mob/living/simple_mob/vore/alienanimals/spooky_ghost + projectilesound = null + projectile_accuracy = 0 + projectile_dispersion = 0 + + needs_reload = TRUE + reload_max = 1 + reload_count = 0 + reload_time = 7 SECONDS + + +/datum/ai_holder/simple_mob/ranged/kiting/space_ghost + hostile = TRUE + retaliate = TRUE + destructive = TRUE + violent_breakthrough = TRUE + speak_chance = 0 + +/mob/living/simple_mob/vore/alienanimals/space_ghost/apply_melee_effects(var/atom/A) + var/mob/living/L = A + L.hallucination += 50 + +/mob/living/simple_mob/vore/alienanimals/space_ghost/shoot(atom/A) //We're shooting ghosts at people and need them to have the same faction as their parent, okay? + if(!projectiletype) + return + if(A == get_turf(src)) + return + face_atom(A) + if(reload_count >= reload_max) + return + var/mob/living/simple_mob/P = new projectiletype(loc, src) + + if(!P) + return + if(needs_reload) + reload_count++ + + P.faction = faction + playsound(src, projectilesound, 80, 1) + +/mob/living/simple_mob/vore/alienanimals/space_ghost/death(gibbed, deathmessage = "fades away!") + . = ..() + qdel(src) + +/mob/living/simple_mob/vore/alienanimals/spooky_ghost + name = "space ghost" + desc = "A pulsing mass of darkness that seems to have gained sentience." + tt_desc = "?????" + catalogue_data = list(/datum/category_item/catalogue/fauna/space_ghost) + + icon = 'icons/mob/alienanimals_x32.dmi' + icon_state = "spookyghost-1" + icon_living = "spookyghost-1" + icon_dead = "space_ghost_dead" + hovering = TRUE + pass_flags = PASSTABLE + + faction = "space ghost" + maxHealth = 5 + health = 5 + movement_cooldown = 1 + + see_in_dark = 10 + alpha = 128 + + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "punches" + + harm_intent_damage = 0 + melee_damage_lower = 1 + melee_damage_upper = 1 + attack_sharp = FALSE + attacktext = list("spooked", "startled", "jumpscared", "screamed at") + + 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 = 999999 + + armor = list( + "melee" = 100, + "bullet" = 100, + "laser" = 0, + "energy" = 0, + "bomb" = 0, + "bio" = 0, + "rad" = 100) + + armor_soak = list( + "melee" = 100, + "bullet" = 100, + "laser" = 0, + "energy" = 0, + "bomb" = 0, + "bio" = 0, + "rad" = 100 + ) + + speak_emote = list("rumbles") + + vore_active = 0 + + ai_holder_type = /datum/ai_holder/simple_mob/melee/space_ghost + +/mob/living/simple_mob/vore/alienanimals/spooky_ghost/Initialize() + . = ..() + icon_living = "spookyghost-[rand(1,2)]" + icon_state = icon_living + addtimer(CALLBACK(src, .proc/death), 2 MINUTES) + update_icon() + +/datum/ai_holder/simple_mob/melee/space_ghost + hostile = TRUE + retaliate = TRUE + destructive = TRUE + violent_breakthrough = TRUE + speak_chance = 0 + +/mob/living/simple_mob/vore/alienanimals/spooky_ghost/death(gibbed, deathmessage = "fades away!") + . = ..() + qdel(src) + +/mob/living/simple_mob/vore/alienanimals/spooky_ghost/apply_melee_effects(var/atom/A) + var/mob/living/L = A + L.hallucination += rand(1,50) + +/mob/living/simple_mob/vore/alienanimals/spooky_ghost/Life() + . = ..() + var/turf/T = get_turf(src) + if(!T) + return + if(T.get_lumcount() >= 0.5) + adjustBruteLoss(1) \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm new file mode 100644 index 0000000000..362232bd8e --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm @@ -0,0 +1,175 @@ +/datum/category_item/catalogue/fauna/startreader + name = "Alien Wildlife - Star Treader" + desc = "A hard shelled creature that lives on asteroids.\ + It is quite durable and very opportunistic in its feeding habits.\ + It is vulnerable to extreme vibrations, and from the bottom." + value = CATALOGUER_REWARD_EASY + + +/mob/living/simple_mob/vore/alienanimals/startreader + name = "asteroid star treader" + desc = "A slow, hard shelled creature that stalks asteroids." + tt_desc = "Testudines Stellarus" + catalogue_data = list(/datum/category_item/catalogue/fauna/startreader) + + icon = 'icons/mob/alienanimals_x32.dmi' + icon_state = "startreader" + icon_living = "startreader" + icon_dead = "startreader_dead" + + faction = "space turtle" + maxHealth = 1000 + health = 1000 + movement_cooldown = 20 + + see_in_dark = 10 + + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "punches" + + harm_intent_damage = 1 + melee_damage_lower = 1 + melee_damage_upper = 10 + attack_sharp = FALSE + attacktext = list("chomped", "bashed", "monched", "bumped") + + ai_holder_type = /datum/ai_holder/simple_mob/melee/startreader + + 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 = 900 + + loot_list = list(/obj/random/underdark/uncertain) + + armor = list( + "melee" = 100, + "bullet" = 100, + "laser" = 100, + "energy" = 100, + "bomb" = 0, + "bio" = 100, + "rad" = 100) + + armor_soak = list( + "melee" = 30, + "bullet" = 30, + "laser" = 10, + "energy" = 10, + "bomb" = 0, + "bio" = 100, + "rad" = 100 + ) + + speak_emote = list("rumbles") + + say_list_type = /datum/say_list/startreader + + vore_active = 1 + vore_capacity = 2 + vore_bump_chance = 25 + vore_ignores_undigestable = 0 + vore_default_mode = DM_DRAIN + vore_icons = SA_ICON_LIVING + vore_stomach_name = "gastric sac" + vore_default_contamination_flavor = "Wet" + vore_default_contamination_color = "grey" + vore_default_item_mode = IM_DIGEST + + var/flipped = FALSE + var/flip_cooldown = 0 + +/datum/say_list/startreader + emote_see = list("bobs", "digs around","gnashes at something","yawns","snaps at something") + emote_hear = list("thrumms","clicks","rattles","groans","burbles") + + +/mob/living/simple_mob/vore/alienanimals/startreader/init_vore() + ..() + var/obj/belly/B = vore_selected + B.name = "gastric sac" + B.desc = "It's cramped and hot! You're forced into a small ball as your shape is squeezed into the slick, wet chamber. Despite being swallowed into the creature, you find that you actually stretch out of the top a ways, and can JUST BARELY wiggle around..." + B.mode_flags = 40 + B.digest_brute = 0.5 + B.digest_burn = 0.5 + B.digestchance = 10 + B.absorbchance = 0 + B.escapechance = 15 + +/datum/ai_holder/simple_mob/melee/startreader + hostile = TRUE + retaliate = TRUE + destructive = TRUE + violent_breakthrough = TRUE + +/mob/living/simple_mob/vore/alienanimals/startreader/apply_melee_effects(var/atom/A) + if(prob(25)) + var/mob/living/L = A + if(isliving(A)) + visible_message("\The [src] trips \the [L]!!") + L.weakened += rand(1,10) + +/mob/living/simple_mob/vore/alienanimals/startreader/Life() + . = ..() + if(flip_cooldown == 1) + flip_cooldown = 0 + flipped = FALSE + handle_flip() + visible_message("\The [src] rights itself!!!") + return + if(flip_cooldown) + flip_cooldown -- + SetStunned(2) + +/mob/living/simple_mob/vore/alienanimals/startreader/proc/handle_flip() + if(flipped) + armor = list( + "melee" = 0, + "bullet" = 0, + "laser" = 0, + "energy" = 0, + "bomb" = 0, + "bio" = 0, + "rad" = 0) + + armor_soak = list( + "melee" = 0, + "bullet" = 0, + "laser" = 0, + "energy" = 0, + "bomb" = 0, + "bio" = 0, + "rad" = 0 + ) + icon_living = "startreader_flipped" + AdjustStunned(flip_cooldown) + else + armor = list( + "melee" = 100, + "bullet" = 100, + "laser" = 100, + "energy" = 100, + "bomb" = 0, + "bio" = 100, + "rad" = 100) + + armor_soak = list( + "melee" = 30, + "bullet" = 30, + "laser" = 10, + "energy" = 10, + "bomb" = 0, + "bio" = 100, + "rad" = 100 + ) + icon_living = "startreader" + SetStunned(0) + + update_icon() \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm index 1d45bf8489..2735256b15 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm @@ -687,7 +687,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? amount_grown -= rand(100,250) if(not_hungy) do_breeding() - if(prob(0.5)) + if(!client && prob(0.5)) teppi_sound() /mob/living/simple_mob/vore/alienanimals/teppi/proc/do_breeding() diff --git a/code/modules/nifsoft/nif.dm b/code/modules/nifsoft/nif.dm index 35de7b260b..78d21a468e 100644 --- a/code/modules/nifsoft/nif.dm +++ b/code/modules/nifsoft/nif.dm @@ -618,6 +618,12 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable durability = 75 bioadap = TRUE +/obj/item/device/nif/protean // Proteans' integrated NIF + name = "protean integrated NIF" + desc = "A NIF that is part of a protean's body structure. Where did you get that anyway?" + durability = 25 + bioadap = TRUE + //////////////////////////////// // Special Promethean """surgery""" /obj/item/device/nif/attack(mob/living/M, mob/living/user, var/target_zone) diff --git a/code/modules/overmap/ships/panicbutton.dm b/code/modules/overmap/ships/panicbutton.dm index dcbcbf500f..aa55ab8ad5 100644 --- a/code/modules/overmap/ships/panicbutton.dm +++ b/code/modules/overmap/ships/panicbutton.dm @@ -9,6 +9,9 @@ var/glass = TRUE var/launched = FALSE +/obj/structure/panic_button/small + icon_state = "smallpanicbutton" + // In case we're annihilated by a meteor /obj/structure/panic_button/Destroy() if(!launched) @@ -26,10 +29,10 @@ /obj/structure/panic_button/attack_hand(mob/living/user) if(!istype(user)) return ..() - + if(user.incapacitated()) return - + // Already launched if(launched) to_chat(user, "The button is already depressed; the beacon has been launched already.") @@ -61,10 +64,10 @@ S.distress(user) //Kind of pricey, but this is a one-time thing that can't be reused, so I'm not too worried. var/list/hear_z = GetConnectedZlevels(z) // multiz 'physical' connections only, not crazy overmap connections - + var/mapsize = (world.maxx+world.maxy)*0.5 var/turf/us = get_turf(src) - + for(var/hz in hear_z) for(var/mob/M as anything in GLOB.players_by_zlevel[hz]) var/sound/SND = sound('sound/misc/emergency_beacon_launched.ogg') // Inside the loop because playsound_local modifies it for each person, so, need separate instances diff --git a/code/modules/persistence/graffiti.dm b/code/modules/persistence/graffiti.dm index c1717d1c20..cbd2fe01a9 100644 --- a/code/modules/persistence/graffiti.dm +++ b/code/modules/persistence/graffiti.dm @@ -39,7 +39,7 @@ . = ..() /obj/effect/decal/writing/examine(mob/user) - ..() + . = ..() . += "\n It reads \"[message]\"." /obj/effect/decal/writing/attackby(var/obj/item/thing, var/mob/user) diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm index fb581a4eb3..59e006124b 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm @@ -30,6 +30,13 @@ if(environment.temperature > HEATMODE_TEMP - 30) . = TRUE +/proc/offsite_environment_check(turf/simulated/T) + . = TRUE + if(!istype(T)) + return + if(T.z in using_map.station_levels) + . = FALSE + /obj/item/weapon/gun/energy/kinetic_accelerator name = "proto-kinetic accelerator" desc = "A self recharging, ranged mining tool that does increased damage in low pressure." @@ -221,6 +228,7 @@ #define KA_ENVIRO_TYPE_COLD 0 #define KA_ENVIRO_TYPE_HOT 1 +#define KA_ENVIRO_TYPE_OFFSITE 2 //Projectiles /obj/item/projectile/kinetic @@ -262,6 +270,11 @@ name = "weakened [name]" damage = damage * pressure_decrease pressure_decrease_active = TRUE + else if(environment == KA_ENVIRO_TYPE_OFFSITE) + if(!offsite_environment_check(get_turf(src))) + name = "nullified [name]" + damage = 0 + pressure_decrease_active = TRUE return ..() /obj/item/projectile/kinetic/attack_mob(mob/living/target_mob, distance, miss_modifier) @@ -276,6 +289,11 @@ name = "weakened [name]" damage = damage * pressure_decrease pressure_decrease_active = TRUE + else if(environment == KA_ENVIRO_TYPE_OFFSITE) + if(!offsite_environment_check(get_turf(src))) + name = "nullified [name]" + damage = 0 + pressure_decrease_active = TRUE return ..() /obj/item/projectile/kinetic/on_range() @@ -302,6 +320,11 @@ name = "weakened [name]" damage = damage * pressure_decrease pressure_decrease_active = TRUE + else if(environment == KA_ENVIRO_TYPE_OFFSITE) + if(!offsite_environment_check(get_turf(src))) + name = "nullified [name]" + damage = 0 + pressure_decrease_active = TRUE var/turf/target_turf = get_turf(target) if(!target_turf) target_turf = get_turf(src) @@ -391,8 +414,8 @@ if(forcemove) forceMove(get_turf(KA)) +//use this one to modify the projectile itself /obj/item/borg/upgrade/modkit/proc/modify_projectile(obj/item/projectile/kinetic/K) - //use this one for effects you want to trigger before any damage is done at all and before damage is decreased by pressure /obj/item/borg/upgrade/modkit/proc/projectile_prehit(obj/item/projectile/kinetic/K, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) //use this one for effects you want to trigger before mods that do damage @@ -617,7 +640,7 @@ //Indoors /obj/item/borg/upgrade/modkit/indoors - name = "decrease pressure penalty" + name = "hacked pressure modulator" desc = "A remarkably illegal modification kit that increases the damage a kinetic accelerator does in pressurized environments." modifier = 2 denied_type = /obj/item/borg/upgrade/modkit/indoors @@ -627,6 +650,15 @@ /obj/item/borg/upgrade/modkit/indoors/modify_projectile(obj/item/projectile/kinetic/K) K.pressure_decrease *= modifier +/obj/item/borg/upgrade/modkit/offsite + name = "offsite pressure modulator" + desc = "A non-standard modification kit that increases the damage a kinetic accelerator does in pressurized environments, \ + in exchange for nullifying any projected forces while on or in an associated facility." + cost = 35 + +/obj/item/borg/upgrade/modkit/indoors/offsite/modify_projectile(obj/item/projectile/kinetic/K) + K.environment = KA_ENVIRO_TYPE_OFFSITE + // Atmospheric /obj/item/borg/upgrade/modkit/heater name = "temperature modulator" @@ -634,7 +666,7 @@ in exchange for making them weak elsewhere, like the cold or in space." denied_type = /obj/item/borg/upgrade/modkit/indoors maximum_of_type = 1 - cost = 30 + cost = 10 /obj/item/borg/upgrade/modkit/heater/modify_projectile(obj/item/projectile/kinetic/K) K.environment = KA_ENVIRO_TYPE_HOT diff --git a/code/modules/projectiles/guns/energy/pummeler_vr.dm b/code/modules/projectiles/guns/energy/pummeler_vr.dm index 75563208f2..b4dd9ad472 100644 --- a/code/modules/projectiles/guns/energy/pummeler_vr.dm +++ b/code/modules/projectiles/guns/energy/pummeler_vr.dm @@ -45,4 +45,14 @@ L.Confuse(1) L.throw_at(get_edge_target_turf(L, throwdir), rand(3,6), 10) + //VOREStation Add Start + if(istype(L, /mob/living/simple_mob/vore/alienanimals/startreader)) + var/mob/living/simple_mob/vore/alienanimals/startreader/S = L + if(!S.flipped) + S.adjustBruteLoss(100) + S.visible_message("\The [S] is flipped over!!!") + S.flipped = TRUE + S.flip_cooldown = 10 + S.handle_flip() + //VOREStation Add End return 1 diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index ee75074cc7..187ae88334 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -87,7 +87,12 @@ new_temperature = round(new_temperature * temp_factor) L.bodytemperature = new_temperature - + //VOREStation Add Start - The last metroid has escaped from captivity, the galaxy is no longer safe. + if(istype(L, /mob/living/simple_mob/vore/alienanimals/space_jellyfish) && target_temperature <= T0C) + var/mob/living/simple_mob/vore/alienanimals/space_jellyfish/J = L + J.adjustFireLoss(75) + J.movement_cooldown *= 2 + //VOREStation Add End return 1 /obj/item/projectile/temp/hot diff --git a/code/modules/vchat/css/ss13styles.css b/code/modules/vchat/css/ss13styles.css index 7c4b097e3e..499e29dbc8 100644 --- a/code/modules/vchat/css/ss13styles.css +++ b/code/modules/vchat/css/ss13styles.css @@ -176,11 +176,11 @@ h1.alert, h2.alert {color: #000000;} .interface {color: #330033;} .spacer {color: #9c660b;} /* VOREStation Add */ .blob {color: #ff950d; font-weight: bold; font-style: italic;} +.tavan {color: #f54298; font-family: Arial} /* YW Edit start */ .psionic {color: #993399;} .wingdings {font-family: Wingdings, Webdings} /* YW Edit End */ - .black {color: #000000;} .darkgray {color: #808080;} .gray {color: #A9A9A9;} diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 5f5a06221a..4534d96f85 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -28,12 +28,14 @@ var/digestchance = 0 // % Chance of stomach beginning to digest if prey struggles var/absorbchance = 0 // % Chance of stomach beginning to absorb if prey struggles var/escapechance = 0 // % Chance of prey beginning to escape if prey struggles. - var/transferchance = 0 // % Chance of prey being + var/transferchance = 0 // % Chance of prey being trasnsfered, goes from 0-100% + var/transferchance_secondary = 0 // % Chance of prey being transfered to transferchance_secondary, also goes 0-100% var/can_taste = FALSE // If this belly prints the flavor of prey when it eats someone. var/bulge_size = 0.25 // The minimum size the prey has to be in order to show up on examine. var/display_absorbed_examine = FALSE // Do we display absorption examine messages for this belly at all? var/shrink_grow_size = 1 // This horribly named variable determines the minimum/maximum size it will shrink/grow prey to. var/transferlocation // Location that the prey is released if they struggle and get dropped off. + var/transferlocation_secondary // Secondary location that prey is released to. var/release_sound = "Splatter" // Sound for letting someone out. Replaced from True/false var/mode_flags = 0 // Stripping, numbing, etc. var/fancy_vore = FALSE // Using the new sounds? @@ -152,7 +154,9 @@ "absorbchance", "escapechance", "transferchance", + "transferchance_secondary", "transferlocation", + "transferlocation_secondary", "bulge_size", "display_absorbed_examine", "shrink_grow_size", @@ -762,6 +766,27 @@ transfer_contents(R, dest_belly) return + else if(prob(transferchance_secondary) && transferlocation_secondary) //After the first potential mess getting into, run the secondary one which might be even bigger of a mess. + var/obj/belly/dest_belly + for(var/obj/belly/B as anything in owner.vore_organs) + if(B.name == transferlocation_secondary) + dest_belly = B + break + + if(!dest_belly) + to_chat(owner, "Something went wrong with your belly transfer settings. Your [lowertext(name)] has had it's transfer chance and transfer location cleared as a precaution.") + transferchance_secondary = 0 + transferlocation_secondary = null + return + + to_chat(R, "Your attempt to escape [lowertext(name)] has failed and your struggles only results in you sliding into [owner]'s [transferlocation_secondary]!") + to_chat(owner, "Someone slid into your [transferlocation_secondary] due to their struggling inside your [lowertext(name)]!") + if(C) + transfer_contents(C, dest_belly) + return + transfer_contents(R, dest_belly) + return + else if(prob(absorbchance) && digest_mode != DM_ABSORB) //After that, let's have it run the absorb chance. to_chat(R, "In response to your struggling, \the [lowertext(name)] begins to cling more tightly...") to_chat(owner, "You feel your [lowertext(name)] start to cling onto its contents...") @@ -852,7 +877,9 @@ dupe.absorbchance = absorbchance dupe.escapechance = escapechance dupe.transferchance = transferchance + dupe.transferchance_secondary = transferchance_secondary dupe.transferlocation = transferlocation + dupe.transferlocation_secondary = transferlocation_secondary dupe.bulge_size = bulge_size dupe.shrink_grow_size = shrink_grow_size dupe.mode_flags = mode_flags diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index eebcb40214..bd2f2af99d 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -188,6 +188,8 @@ selected_list["interacts"]["escapetime"] = selected.escapetime selected_list["interacts"]["transferchance"] = selected.transferchance selected_list["interacts"]["transferlocation"] = selected.transferlocation + selected_list["interacts"]["transferchance_secondary"] = selected.transferchance_secondary + selected_list["interacts"]["transferlocation_secondary"] = selected.transferlocation_secondary selected_list["interacts"]["absorbchance"] = selected.absorbchance selected_list["interacts"]["digestchance"] = selected.digestchance @@ -948,6 +950,21 @@ else host.vore_selected.transferlocation = choice.name . = TRUE + if("b_transferchance_secondary") + var/transfer_secondary_chance_input = input(user, "Set secondary belly transfer chance on resist (as %). You must also set the location for this to have any effect.", "Prey Escape Time") as num|null + if(!isnull(transfer_secondary_chance_input)) + host.vore_selected.transferchance_secondary = sanitize_integer(transfer_secondary_chance_input, 0, 100, initial(host.vore_selected.transferchance_secondary)) + . = TRUE + if("b_transferlocation_secondary") + var/obj/belly/choice_secondary = tgui_input_list(usr, "Where do you want your [lowertext(host.vore_selected.name)] to alternately lead if prey resists?","Select Belly", (host.vore_organs + "None - Remove" - host.vore_selected)) + + if(!choice_secondary) //They cancelled, no changes + return FALSE + else if(choice_secondary == "None - Remove") + host.vore_selected.transferlocation_secondary = null + else + host.vore_selected.transferlocation_secondary = choice_secondary.name + . = TRUE if("b_absorbchance") var/absorb_chance_input = input(user, "Set belly absorb mode chance on resist (as %)", "Prey Absorb Chance") as num|null if(!isnull(absorb_chance_input)) @@ -977,6 +994,10 @@ dest_for = B.name failure_msg += "This is the destiantion for at least '[dest_for]' belly transfers. Remove it as the destination from any bellies before deleting it. " break + if(B.transferlocation_secondary == host.vore_selected) + dest_for = B.name + failure_msg += "This is the destiantion for at least '[dest_for]' secondary belly transfers. Remove it as the destination from any bellies before deleting it. " + break if(host.vore_selected.contents.len) failure_msg += "You cannot delete bellies with contents! " //These end with spaces, to be nice looking. Make sure you do the same. diff --git a/icons/inventory/head/item.dmi b/icons/inventory/head/item.dmi index d91aa7369f..ad89caf2c0 100644 Binary files a/icons/inventory/head/item.dmi and b/icons/inventory/head/item.dmi differ diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi index 01b97296d5..356aab58f5 100644 Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ diff --git a/icons/inventory/uniform/item.dmi b/icons/inventory/uniform/item.dmi index 14761a73e0..8188b08848 100644 Binary files a/icons/inventory/uniform/item.dmi and b/icons/inventory/uniform/item.dmi differ diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi index d0670504d0..4e0bb00389 100644 Binary files a/icons/inventory/uniform/mob.dmi and b/icons/inventory/uniform/mob.dmi differ diff --git a/icons/mob/alienanimals_x32.dmi b/icons/mob/alienanimals_x32.dmi index f3cb748708..ca7a825c23 100644 Binary files a/icons/mob/alienanimals_x32.dmi and b/icons/mob/alienanimals_x32.dmi differ diff --git a/icons/obj/card_alt_vr.dmi b/icons/obj/card_alt_vr.dmi index 445dddb156..d18adbb882 100644 Binary files a/icons/obj/card_alt_vr.dmi and b/icons/obj/card_alt_vr.dmi differ diff --git a/icons/obj/doors/DoorHazardHidden_shuttle.dmi b/icons/obj/doors/DoorHazardHidden_shuttle.dmi new file mode 100644 index 0000000000..2aa9056837 Binary files /dev/null and b/icons/obj/doors/DoorHazardHidden_shuttle.dmi differ diff --git a/icons/obj/doors/rapid_pdoor.dmi b/icons/obj/doors/rapid_pdoor.dmi index 01ab429f32..eb72f0521d 100644 Binary files a/icons/obj/doors/rapid_pdoor.dmi and b/icons/obj/doors/rapid_pdoor.dmi differ diff --git a/icons/obj/food_vr.dmi b/icons/obj/food_vr.dmi index 9adbcc00c5..0530aef455 100644 Binary files a/icons/obj/food_vr.dmi and b/icons/obj/food_vr.dmi differ diff --git a/icons/obj/objects_vr.dmi b/icons/obj/objects_vr.dmi index db7f71aef3..96d3738355 100644 Binary files a/icons/obj/objects_vr.dmi and b/icons/obj/objects_vr.dmi differ diff --git a/icons/obj/vending_job.dmi b/icons/obj/vending_job.dmi index 77d22e3dd1..b0398272ff 100644 Binary files a/icons/obj/vending_job.dmi and b/icons/obj/vending_job.dmi differ diff --git a/icons/turf/fancy_shuttles/_fancy_helpers.dmi b/icons/turf/fancy_shuttles/_fancy_helpers.dmi index 8b7fcb5eaf..2ddcb7fb06 100644 Binary files a/icons/turf/fancy_shuttles/_fancy_helpers.dmi and b/icons/turf/fancy_shuttles/_fancy_helpers.dmi differ diff --git a/icons/turf/fancy_shuttles/medbus.dmi b/icons/turf/fancy_shuttles/medbus.dmi new file mode 100644 index 0000000000..68f0fb96e6 Binary files /dev/null and b/icons/turf/fancy_shuttles/medbus.dmi differ diff --git a/icons/turf/fancy_shuttles/medbus_preview.dmi b/icons/turf/fancy_shuttles/medbus_preview.dmi new file mode 100644 index 0000000000..61a3093728 Binary files /dev/null and b/icons/turf/fancy_shuttles/medbus_preview.dmi differ diff --git a/icons/turf/fancy_shuttles/medical.dmi b/icons/turf/fancy_shuttles/medical.dmi deleted file mode 100644 index dc1833cc55..0000000000 Binary files a/icons/turf/fancy_shuttles/medical.dmi and /dev/null differ diff --git a/icons/turf/fancy_shuttles/medical_preview.dmi b/icons/turf/fancy_shuttles/medical_preview.dmi deleted file mode 100644 index 1b688eb8f0..0000000000 Binary files a/icons/turf/fancy_shuttles/medical_preview.dmi and /dev/null differ diff --git a/icons/turf/fancy_shuttles/sd_shuttle.dmi b/icons/turf/fancy_shuttles/sd_shuttle.dmi new file mode 100644 index 0000000000..856a771d80 Binary files /dev/null and b/icons/turf/fancy_shuttles/sd_shuttle.dmi differ diff --git a/icons/turf/fancy_shuttles/sd_shuttle_preview.dmi b/icons/turf/fancy_shuttles/sd_shuttle_preview.dmi new file mode 100644 index 0000000000..7d6177b164 Binary files /dev/null and b/icons/turf/fancy_shuttles/sd_shuttle_preview.dmi differ diff --git a/icons/turf/fancy_shuttles/secbus.dmi b/icons/turf/fancy_shuttles/secbus.dmi new file mode 100644 index 0000000000..d47f5fc552 Binary files /dev/null and b/icons/turf/fancy_shuttles/secbus.dmi differ diff --git a/icons/turf/fancy_shuttles/secbus_preview.dmi b/icons/turf/fancy_shuttles/secbus_preview.dmi new file mode 100644 index 0000000000..cfc42fb2e2 Binary files /dev/null and b/icons/turf/fancy_shuttles/secbus_preview.dmi differ diff --git a/icons/turf/fancy_shuttles/security.dmi b/icons/turf/fancy_shuttles/security.dmi deleted file mode 100644 index 70fdbfbc65..0000000000 Binary files a/icons/turf/fancy_shuttles/security.dmi and /dev/null differ diff --git a/icons/turf/fancy_shuttles/security_preview.dmi b/icons/turf/fancy_shuttles/security_preview.dmi deleted file mode 100644 index d0017da2a4..0000000000 Binary files a/icons/turf/fancy_shuttles/security_preview.dmi and /dev/null differ diff --git a/icons/turf/fancy_shuttles/tourbus.dmi b/icons/turf/fancy_shuttles/tourbus.dmi index beb0b4b30d..c9e1d4d5e1 100644 Binary files a/icons/turf/fancy_shuttles/tourbus.dmi 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 index 56e5b6d455..e174aec5b7 100644 Binary files a/icons/turf/fancy_shuttles/tourbus_preview.dmi and b/icons/turf/fancy_shuttles/tourbus_preview.dmi differ diff --git a/maps/expedition_vr/beach/submaps/BlastMine1.dmm b/maps/expedition_vr/beach/submaps/BlastMine1.dmm index 388018e940..ca21c8d481 100644 --- a/maps/expedition_vr/beach/submaps/BlastMine1.dmm +++ b/maps/expedition_vr/beach/submaps/BlastMine1.dmm @@ -1,4 +1,4 @@ -"a" = (/turf/simulated/mineral,/area/submap/cave/BlastMine1) +"a" = (/turf/simulated/mineral/cave,/area/submap/cave/BlastMine1) "b" = (/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/submap/cave/BlastMine1) "c" = (/obj/structure/sign/warning/bomb_range,/turf/simulated/wall/sandstone,/area/submap/cave/BlastMine1) "d" = (/obj/structure/table/rack,/obj/item/weapon/syndie/c4explosive,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/submap/cave/BlastMine1) diff --git a/maps/expedition_vr/beach/submaps/SupplyDrop1.dmm b/maps/expedition_vr/beach/submaps/SupplyDrop1.dmm index 2ac5a64f9e..cbc92c28d8 100644 --- a/maps/expedition_vr/beach/submaps/SupplyDrop1.dmm +++ b/maps/expedition_vr/beach/submaps/SupplyDrop1.dmm @@ -1,4 +1,4 @@ -"a" = (/turf/simulated/mineral,/area/submap/cave/SupplyDrop1) +"a" = (/turf/simulated/mineral/cave,/area/submap/cave/SupplyDrop1) "b" = (/turf/template_noop,/area/template_noop) "c" = (/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/submap/cave/SupplyDrop1) "d" = (/turf/simulated/wall/titanium,/area/submap/cave/SupplyDrop1) diff --git a/maps/expedition_vr/beach/submaps/SwordCave.dmm b/maps/expedition_vr/beach/submaps/SwordCave.dmm index a67cccdcb8..f14417c782 100644 --- a/maps/expedition_vr/beach/submaps/SwordCave.dmm +++ b/maps/expedition_vr/beach/submaps/SwordCave.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/template_noop) "b" = ( -/turf/simulated/mineral, +/turf/simulated/mineral/cave, /area/submap/cave/swordcave) "c" = ( /turf/simulated/mineral/floor/ignore_mapgen/cave, diff --git a/maps/expedition_vr/beach/submaps/deadspy.dmm b/maps/expedition_vr/beach/submaps/deadspy.dmm index 5f3da504c7..5410d8ab2f 100644 --- a/maps/expedition_vr/beach/submaps/deadspy.dmm +++ b/maps/expedition_vr/beach/submaps/deadspy.dmm @@ -19,7 +19,7 @@ "s" = (/obj/item/weapon/card/emag_broken,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/submap/deadspy) "t" = (/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel,/obj/random/landmine,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/submap/deadspy) "u" = (/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel,/obj/effect/decal/cleanable/ash,/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/submap/deadspy) -"v" = (/turf/simulated/mineral,/area/submap/deadspy) +"v" = (/turf/simulated/mineral/cave,/area/submap/deadspy) (1,1,1) = {" abbbbvv diff --git a/maps/expedition_vr/beach/submaps/excavation1.dmm b/maps/expedition_vr/beach/submaps/excavation1.dmm index 3cacccb2eb..ed191c4c2e 100644 --- a/maps/expedition_vr/beach/submaps/excavation1.dmm +++ b/maps/expedition_vr/beach/submaps/excavation1.dmm @@ -1,4 +1,4 @@ -"a" = (/turf/simulated/mineral,/area/template_noop) +"a" = (/turf/simulated/mineral/cave,/area/template_noop) "b" = (/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/template_noop) "c" = (/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/submap/Excavation) "d" = (/obj/structure/cliff/automatic{icon_state = "cliffbuilder"; dir = 9},/turf/simulated/mineral/floor/ignore_mapgen/cave,/area/submap/Excavation) diff --git a/maps/stellardelight/stellar_delight1.dmm b/maps/stellardelight/stellar_delight1.dmm index 3517a361a9..72f8ffb1dc 100644 --- a/maps/stellardelight/stellar_delight1.dmm +++ b/maps/stellardelight/stellar_delight1.dmm @@ -8,6 +8,7 @@ "ac" = ( /obj/structure/table/steel_reinforced, /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 1; name = "night shift APC"; nightshift_setting = 2 @@ -3113,8 +3114,9 @@ dir = 4 }, /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 8; - req_access = list(31) + req_access = list(31,5) }, /obj/structure/cable/yellow, /obj/machinery/light/floortube{ @@ -3933,7 +3935,11 @@ }, /obj/machinery/recharger/wallcharger{ pixel_x = 4; - pixel_y = 28 + pixel_y = 29 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 38 }, /turf/simulated/floor/tiled/dark, /area/security/security_cell_hallway) @@ -4212,6 +4218,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/station_map{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) "iT" = ( @@ -4251,6 +4260,15 @@ /obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/starboard) +"iX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/fore) "iY" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -4585,6 +4603,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/mining) "jG" = ( @@ -4828,6 +4847,17 @@ }, /turf/simulated/floor/lino, /area/chapel/office) +"kl" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/milspec/color/emerald/half{ + dir = 4 + }, +/obj/machinery/station_map{ + dir = 8; + pixel_x = 32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/aft) "km" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -5971,6 +6001,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/machinery/station_map{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/starboard) "mF" = ( @@ -6120,6 +6153,15 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/starboard) +"mT" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/fore) "mU" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/tiled/dark, @@ -7958,6 +8000,9 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/resleeving) +"qX" = ( +/turf/space/internal_edge/right, +/area/stellardelight/deck1/starboard) "qY" = ( /obj/effect/floor_decal/milspec/color/orange/half, /turf/simulated/floor/tiled/dark, @@ -8145,6 +8190,11 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/substation/security) +"rt" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/folder/blue, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/explobriefing) "ru" = ( /obj/machinery/light_switch{ dir = 4; @@ -9572,6 +9622,9 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/stellardelight/deck1/dorms/dorm2) +"uw" = ( +/turf/space/internal_edge/left, +/area/stellardelight/deck1/starboard) "ux" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -9678,6 +9731,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 9 }, +/obj/structure/closet/emergsuit_wall{ + dir = 8; + pixel_x = -27 + }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "uH" = ( @@ -10756,6 +10813,9 @@ /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/tiled/dark, /area/security/security_processing) +"xe" = ( +/turf/simulated/wall/bay/r_wall/brown, +/area/stellardelight/deck1/starboard) "xf" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -10975,15 +11035,12 @@ /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/oreprocessing) "xE" = ( -/obj/machinery/power/apc/angled{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/station_map{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/fore) "xF" = ( @@ -11200,8 +11257,9 @@ dir = 8 }, /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 4; - req_access = list(19,43,67) + req_access = list(19,43,67,66,5) }, /obj/structure/cable/green{ color = "#42038a" @@ -14042,6 +14100,9 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_cell_hallway) +"Ef" = ( +/turf/space/internal_edge/top, +/area/stellardelight/deck1/starboard) "Eg" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -14215,6 +14276,18 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology) +"EA" = ( +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 10 + }, +/obj/machinery/firealarm/angled{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/fore) "EB" = ( /obj/machinery/door/window/eastright{ dir = 8; @@ -14263,6 +14336,18 @@ pixel_x = 4; pixel_y = 5 }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 20 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 28 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 36 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck1/explobriefing) "EG" = ( @@ -14424,6 +14509,9 @@ }, /turf/simulated/floor/tiled/dark, /area/chapel/main) +"EZ" = ( +/turf/space/internal_edge/bottomright, +/area/stellardelight/deck1/starboard) "Fa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 @@ -16004,18 +16092,19 @@ /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "Iu" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/angled_bay/external/glass{ dir = 4; door_color = "#525252"; name = "Exploration Shuttle"; - req_one_access = list(19,43,67,66); + req_one_access = list(19,43,67,66,5); stripe_color = "#408f3b" }, /obj/structure/cable/green{ color = "#42038a"; icon_state = "4-8" }, +/obj/machinery/atmospheric_field_generator/perma/underdoors, +/obj/machinery/door/firedoor/glass/talon, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/exploshuttle) "Iw" = ( @@ -16243,6 +16332,9 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/portcent) +"IT" = ( +/turf/space/internal_edge/bottom, +/area/stellardelight/deck1/starboard) "IU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, @@ -17664,17 +17756,19 @@ /turf/simulated/wall/bay/r_wall/steel, /area/stellardelight/deck1/exploration) "Ma" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/angled_bay/external/glass{ dir = 4; door_color = "#a88860"; name = "Mining Shuttle"; - req_access = list(31); + req_access = null; + req_one_access = list(31,5); stripe_color = "#69461a" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospheric_field_generator/perma/underdoors, +/obj/machinery/door/firedoor/glass/talon, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/miningshuttle) "Mb" = ( @@ -17744,6 +17838,9 @@ /obj/structure/low_wall/bay/reinforced/purple, /turf/simulated/floor, /area/rnd/workshop) +"Mh" = ( +/turf/space/internal_edge/topleft, +/area/stellardelight/deck1/starboard) "Mi" = ( /obj/structure/table/standard, /obj/item/weapon/stock_parts/matter_bin, @@ -18465,6 +18562,9 @@ /area/assembly/robotics) "NN" = ( /obj/structure/table/steel_reinforced, +/obj/machinery/recharger{ + pixel_y = 5 + }, /turf/simulated/floor/tiled/dark, /area/security/lobby) "NP" = ( @@ -18496,6 +18596,9 @@ }, /turf/simulated/floor, /area/stellardelight/deck1/mining) +"NT" = ( +/turf/space/internal_edge/topright, +/area/stellardelight/deck1/starboard) "NV" = ( /obj/structure/cable/green{ color = "#42038a"; @@ -19556,7 +19659,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm/angled, +/obj/machinery/station_map{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/fore) "Qp" = ( @@ -20233,6 +20338,9 @@ }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/exam_room) +"RI" = ( +/turf/space/internal_edge/bottomleft, +/area/stellardelight/deck1/starboard) "RJ" = ( /obj/machinery/light{ dir = 4 @@ -20332,7 +20440,7 @@ }, /obj/machinery/recharger/wallcharger{ pixel_x = 4; - pixel_y = 28 + pixel_y = 29 }, /obj/machinery/recharger/wallcharger{ pixel_x = 4; @@ -20341,14 +20449,24 @@ /obj/effect/floor_decal/milspec/color/red/half{ dir = 4 }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 38 + }, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "RX" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 9 + }, +/obj/machinery/power/apc/angled{ + dir = 8 }, /obj/structure/cable/green{ - icon_state = "1-8" + icon_state = "0-2" }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/fore) @@ -21318,6 +21436,8 @@ /obj/machinery/alarm/angled{ dir = 4 }, +/obj/item/paint_palette, +/obj/item/paint_brush, /turf/simulated/floor/wood, /area/library) "TW" = ( @@ -21613,6 +21733,7 @@ /area/rnd/research) "UB" = ( /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 1; name = "night shift APC"; nightshift_setting = 2 @@ -22217,7 +22338,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/structure/ore_box, +/obj/structure/table/standard, +/obj/machinery/recharger{ + pixel_y = 5 + }, /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/mining) "VF" = ( @@ -23424,6 +23548,7 @@ /obj/machinery/camera/network/mining{ dir = 8 }, +/obj/structure/ore_box, /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/mining) "Yi" = ( @@ -23573,7 +23698,9 @@ /area/security/tactical) "Yy" = ( /obj/structure/table/steel_reinforced, -/obj/machinery/recharger, +/obj/machinery/recharger{ + pixel_y = 5 + }, /obj/structure/sign/vacuum{ pixel_y = 32 }, @@ -23911,7 +24038,9 @@ /area/stellardelight/deck1/miningequipment) "Zh" = ( /obj/structure/table/woodentable, -/obj/item/weapon/folder/blue, +/obj/machinery/recharger{ + pixel_y = 5 + }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "Zi" = ( @@ -24093,7 +24222,14 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) "ZC" = ( -/obj/machinery/firealarm/angled, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 20 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 29 + }, /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/mining) "ZD" = ( @@ -24156,6 +24292,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/machinery/firealarm/angled{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/mining) "ZK" = ( @@ -24189,9 +24328,9 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/structure/closet/emergsuit_wall{ - dir = 8; - pixel_x = -27 +/obj/machinery/station_map{ + dir = 4; + pixel_x = -32 }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) @@ -31231,7 +31370,7 @@ Rz TC oZ Zh -zZ +rt OB Rz ny @@ -33157,7 +33296,7 @@ Zy SQ Yv xE -RX +zW xZ MA Zt @@ -33439,9 +33578,9 @@ Xk OD ZR QG -XC -IF -zW +RX +iX +mT Ku Ku Ku @@ -33742,13 +33881,13 @@ rW lC HT ER -uq -uq -uq -uq -uq -uq -uq +EZ +qX +qX +qX +qX +qX +NT vu Br AP @@ -33884,13 +34023,13 @@ SH jD PI IZ -uq -uq -uq -uq -uq -uq -uq +IT +xe +xe +xe +xe +xe +Ef AT Aq WE @@ -34026,13 +34165,13 @@ zg aj Wl IZ -uq -uq -uq -uq -uq -uq -uq +IT +xe +xe +xe +xe +xe +Ef AT Qd VH @@ -34168,13 +34307,13 @@ bi bi bi bi -uq -uq -uq -uq -uq -uq -uq +IT +xe +xe +xe +xe +xe +Ef IC IC IC @@ -34310,13 +34449,13 @@ Si gK LX wE -uq -uq -uq -uq -uq -uq -uq +IT +xe +xe +xe +xe +xe +Ef PA da dc @@ -34452,13 +34591,13 @@ KG sn kL wE -uq -uq -uq -uq -uq -uq -uq +IT +xe +xe +xe +xe +xe +Ef PA Wk iT @@ -34594,13 +34733,13 @@ HX Gu JB bi -uq -uq -uq -uq -uq -uq -uq +RI +uw +uw +uw +uw +uw +Mh IC RM De @@ -34859,7 +34998,7 @@ HN Tg Vr Hs -zb +EA zc zW Ku @@ -35751,7 +35890,7 @@ Wj MH xx xF -XJ +kl CV kv jg diff --git a/maps/stellardelight/stellar_delight2.dmm b/maps/stellardelight/stellar_delight2.dmm index 259e61b0d3..2401500979 100644 --- a/maps/stellardelight/stellar_delight2.dmm +++ b/maps/stellardelight/stellar_delight2.dmm @@ -628,6 +628,9 @@ pixel_x = 32; pixel_y = 18 }, +/obj/structure/railing/grey{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, /area/stellardelight/deck2/aftport) "bn" = ( @@ -695,6 +698,9 @@ pixel_x = -32; pixel_y = 18 }, +/obj/structure/railing/grey{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/stellardelight/deck2/aftstarboard) "bs" = ( @@ -2113,9 +2119,6 @@ /area/stellardelight/deck2/aftport) "eE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portsolars) "eF" = ( @@ -2948,6 +2951,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) +"gA" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck2/fore) "gB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2992,10 +3001,10 @@ /area/engineering/storage) "gF" = ( /obj/structure/cable/orange{ - icon_state = "2-8" + icon_state = "1-2" }, /obj/structure/cable/orange{ - icon_state = "1-2" + icon_state = "2-8" }, /turf/simulated/floor/airless, /area/stellardelight/deck2/exterior) @@ -3168,9 +3177,6 @@ /obj/machinery/alarm/angled{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardsolars) "hb" = ( @@ -4149,13 +4155,15 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "jz" = ( -/obj/machinery/firealarm/angled, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, +/obj/machinery/station_map{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftstarboard) "jA" = ( @@ -5085,6 +5093,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) "lu" = ( @@ -5460,6 +5472,16 @@ }, /turf/simulated/floor/airless, /area/stellardelight/deck2/exterior) +"mb" = ( +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 4 + }, +/obj/machinery/station_map{ + dir = 8; + pixel_x = 32 + }, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/port) "md" = ( /obj/effect/floor_decal/industrial/outline, /obj/effect/floor_decal/steeldecal/steel_decals9, @@ -5512,14 +5534,15 @@ /area/stellardelight/deck2/port) "mj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/structure/cable{ - icon_state = "0-2" - }, /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 4; name = "night shift APC"; nightshift_setting = 2 }, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardsolars) "mk" = ( @@ -5771,6 +5794,10 @@ /obj/effect/floor_decal/milspec/color/silver/corner{ dir = 4 }, +/obj/machinery/station_map{ + dir = 8; + pixel_x = 32 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "mO" = ( @@ -6022,6 +6049,10 @@ /obj/effect/floor_decal/milspec/color/orange/half{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftport) "nx" = ( @@ -6694,6 +6725,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, +/obj/machinery/station_map{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "pb" = ( @@ -6802,9 +6836,6 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/structure/cable{ - icon_state = "1-8" - }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portsolars) "pl" = ( @@ -7154,12 +7185,13 @@ /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck2/o2production) "pZ" = ( -/obj/machinery/firealarm/angled{ - dir = 4 - }, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, +/obj/machinery/station_map{ + dir = 8; + pixel_x = 32 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "qa" = ( @@ -7220,6 +7252,9 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardsolars) "qi" = ( @@ -7608,6 +7643,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portsolars) "qZ" = ( @@ -8691,9 +8729,6 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/structure/cable{ - icon_state = "1-4" - }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardsolars) "ty" = ( @@ -8704,6 +8739,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) "tz" = ( @@ -10375,6 +10411,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftport) "xy" = ( @@ -11258,12 +11298,13 @@ dir = 4 }, /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 8; name = "night shift APC"; nightshift_setting = 2 }, -/obj/structure/cable{ - icon_state = "0-2" +/obj/structure/cable/green{ + icon_state = "0-4" }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portsolars) @@ -12126,6 +12167,12 @@ /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, /area/engineering/storage) +"BA" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck2/fore) "BB" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -12537,6 +12584,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) "CA" = ( @@ -12965,6 +13015,15 @@ "DB" = ( /turf/simulated/floor, /area/maintenance/stellardelight/deck2/atmos) +"DC" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/obj/machinery/firealarm/angled{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/fore) "DD" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/alarm/freezer{ @@ -13089,9 +13148,13 @@ /turf/simulated/floor/tiled/freezer/cold, /area/crew_quarters/kitchen) "DQ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 1; + name = "Atmospherics"; + sortType = "Atmospherics" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftport) "DR" = ( @@ -14548,6 +14611,7 @@ /obj/machinery/power/terminal{ dir = 8 }, +/obj/structure/cable, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portsolars) "GP" = ( @@ -14930,6 +14994,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/machinery/station_map{ + dir = 4; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftport) "HH" = ( @@ -15218,6 +15286,7 @@ }, /obj/random/vendordrink, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/firealarm/angled, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftstarboard) "Il" = ( @@ -15336,6 +15405,16 @@ /obj/machinery/recharger, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck2/triage) +"Iv" = ( +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 8 + }, +/obj/machinery/station_map{ + dir = 4; + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/starboard) "Iw" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -17241,7 +17320,9 @@ /area/crew_quarters/bar) "MM" = ( /obj/structure/table/standard, -/obj/machinery/recharger, +/obj/machinery/recharger{ + pixel_y = 5 + }, /obj/machinery/light/floortube{ pixel_y = -4 }, @@ -17943,6 +18024,7 @@ /area/medical/surgery2) "Oq" = ( /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 8 }, /obj/structure/cable/cyan{ @@ -18181,6 +18263,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) "OU" = ( @@ -21553,6 +21639,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/monitoring) "WB" = ( @@ -21862,9 +21951,6 @@ /obj/machinery/alarm/angled{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portsolars) "Xo" = ( @@ -21896,9 +21982,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardsolars) "Xs" = ( @@ -30170,8 +30253,8 @@ UG cv cv cv -ZG -Jh +CP +SO Jh Jh Jh @@ -30312,6 +30395,7 @@ Zt qM Vm mq +Wb ZG Jh Jh @@ -30332,7 +30416,6 @@ Jh Jh Jh Jh -Jh "} (52,1,1) = {" Jh @@ -30454,6 +30537,7 @@ LG AV Vm Vm +Wb ZG Jh Jh @@ -30474,7 +30558,6 @@ Jh Jh Jh Jh -Jh "} (53,1,1) = {" Jh @@ -30596,8 +30679,8 @@ yg AV cv cv -ZG -Jh +Ds +kL Jh Jh Jh @@ -30880,8 +30963,8 @@ MP PB cv cv -ZG -Jh +CP +SO Jh Jh Jh @@ -31022,6 +31105,7 @@ ay wm Vm mq +Wb ZG Jh Jh @@ -31042,7 +31126,6 @@ Jh Jh Jh Jh -Jh "} (57,1,1) = {" Jh @@ -31164,6 +31247,7 @@ DR AV Vm Vm +Wb ZG Jh Jh @@ -31184,7 +31268,6 @@ Jh Jh Jh Jh -Jh "} (58,1,1) = {" Jh @@ -31306,8 +31389,8 @@ eg tk cv cv -ZG -Jh +Ds +kL Jh Jh Jh @@ -31682,7 +31765,7 @@ VP bA bA bA -bA +mb bA BP wF @@ -32094,7 +32177,7 @@ nt Rq Rq lQ -aA +gA Jq Xi kF @@ -33798,7 +33881,7 @@ nt Rq Rq lY -aA +BA Jq IK kF @@ -34238,7 +34321,7 @@ Ru nL WL WL -iu +Iv iu ec YX @@ -34500,7 +34583,7 @@ Zr Zr vj pZ -Zr +DC Zr OV Zr @@ -34714,8 +34797,8 @@ uo BN nq nq -ZG -Jh +CP +SO Jh Jh Jh @@ -34856,6 +34939,7 @@ cF Jk VJ Dw +Wb ZG Jh Jh @@ -34876,7 +34960,6 @@ Jh Jh Jh Jh -Jh "} (84,1,1) = {" Jh @@ -34998,6 +35081,7 @@ Nt Lw VJ VJ +Wb ZG Jh Jh @@ -35018,7 +35102,6 @@ Jh Jh Jh Jh -Jh "} (85,1,1) = {" Jh @@ -35140,8 +35223,8 @@ lk Lw nq nq -ZG -Jh +Ds +kL Jh Jh Jh @@ -35424,8 +35507,8 @@ jA Lw nq nq -ZG -Jh +CP +SO Jh Jh Jh @@ -35566,6 +35649,7 @@ lX yA VJ Dw +Wb ZG Jh Jh @@ -35586,7 +35670,6 @@ Jh Jh Jh Jh -Jh "} (89,1,1) = {" Jh @@ -35708,6 +35791,7 @@ nO nq VJ VJ +Wb ZG Jh Jh @@ -35728,7 +35812,6 @@ Jh Jh Jh Jh -Jh "} (90,1,1) = {" Jh @@ -35850,8 +35933,8 @@ SG rT rT rT -ZG -Jh +Ds +kL Jh Jh Jh diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellardelight/stellar_delight3.dmm index 2ab4fb98b1..619926bec2 100644 --- a/maps/stellardelight/stellar_delight3.dmm +++ b/maps/stellardelight/stellar_delight3.dmm @@ -51,6 +51,9 @@ /obj/structure/sign/directions/cargo{ pixel_x = 32 }, +/obj/structure/railing/grey{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, /area/stellardelight/deck3/aft) "ai" = ( @@ -78,6 +81,9 @@ /obj/structure/sign/directions/cargo{ pixel_x = -32 }, +/obj/structure/railing/grey{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/stellardelight/deck3/aft) "al" = ( @@ -126,15 +132,6 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/aftstarroom) -"ax" = ( -/obj/item/modular_computer/console/preset/civilian{ - dir = 8 - }, -/obj/machinery/alarm/angled{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) "aA" = ( /turf/simulated/wall/bay/r_wall/steel, /area/stellardelight/deck3/transitgateway) @@ -198,11 +195,24 @@ /turf/simulated/open, /area/stellardelight/deck2/starboard) "aP" = ( -/obj/structure/cable{ - icon_state = "2-4" +/obj/structure/bed/chair/shuttle{ + dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -28 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "aQ" = ( /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/stellardelight/deck3/commandhall) @@ -230,11 +240,18 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portaft) "be" = ( -/obj/machinery/shipsensors{ - dir = 1 +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + dir = 4; + id = "shuttleshutter" }, -/turf/simulated/floor/airless, -/area/shuttle/sdboat/fore) +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/reinforced/airless, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "bg" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -327,6 +344,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/heads/hor) +"bB" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck3/starboardcent) "bC" = ( /obj/structure/closet/crate, /obj/random/maintenance, @@ -481,13 +506,9 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tcommsat/computer) "ch" = ( -/obj/structure/table/rack/shelf, -/obj/random/contraband, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/drinkbottle, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/machinery/vending/wardrobe/mimedrobe, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "ci" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/blue{ @@ -541,6 +562,20 @@ temperature = 80 }, /area/tcommsat/chamber) +"cn" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "cp" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -689,15 +724,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) -"cQ" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/structure/closet/emergsuit_wall{ - dir = 4; - pixel_x = 27 - }, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) "cS" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -793,13 +819,6 @@ /obj/machinery/papershredder, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) -"dq" = ( -/obj/structure/bed/chair/bay/shuttle{ - dir = 4 - }, -/obj/machinery/light, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) "dr" = ( /obj/machinery/light{ dir = 4 @@ -913,6 +932,18 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/crew_quarters/bar) +"dQ" = ( +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + id = "shuttleshutter" + }, +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/reinforced/airless, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "dS" = ( /obj/machinery/camera/network/command{ dir = 4 @@ -1182,8 +1213,12 @@ /turf/simulated/wall/bay/r_wall/steel, /area/crew_quarters/bar) "eJ" = ( -/turf/simulated/wall/rshull, -/area/shuttle/sdboat/fore) +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "eK" = ( /obj/machinery/atmospherics/unary/vent_pump{ external_pressure_bound = 0; @@ -1352,14 +1387,20 @@ /turf/simulated/floor/tiled/steel_ridged, /area/maintenance/stellardelight/deck3/portaft) "fg" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/handrail{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6 +/obj/machinery/alarm{ + dir = 1; + pixel_y = -28 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "fh" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -1369,6 +1410,19 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/stellardelight/deck3/foreportroomb) +"fj" = ( +/obj/structure/table/woodentable, +/obj/item/toy/figure/clown, +/obj/item/weapon/pen/crayon/marker/rainbow, +/obj/item/weapon/pen/crayon/rainbow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "fk" = ( /obj/machinery/telecomms/server/presets/common, /turf/simulated/floor/tiled/dark{ @@ -1377,9 +1431,6 @@ temperature = 80 }, /area/tcommsat/chamber) -"fn" = ( -/turf/simulated/wall/rshull, -/area/shuttle/sdboat/aft) "fs" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -1512,6 +1563,14 @@ temperature = 80 }, /area/tcommsat/chamber) +"gi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "gj" = ( /obj/structure/table/rack/shelf, /obj/item/weapon/disk/nifsoft/compliance, @@ -1532,11 +1591,19 @@ /turf/simulated/floor/wood, /area/stellardelight/deck3/cafe) "gl" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor, -/area/shuttle/sdboat/fore) +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "gm" = ( /obj/structure/lattice, /obj/structure/cable/blue{ @@ -1748,12 +1815,6 @@ temperature = 80 }, /area/tcommsat/chamber) -"gY" = ( -/obj/structure/handrail{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) "hb" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -1802,6 +1863,20 @@ }, /turf/simulated/floor/reinforced/airless, /area/stellardelight/deck3/exterior) +"hg" = ( +/obj/effect/fancy_shuttle/sd_shuttle{ + dir = 1; + fancy_shuttle_tag = "sdboat" + }, +/obj/effect/fancy_shuttle_floor_preview/sd_shuttle{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "hj" = ( /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled/techfloor/grid, @@ -1942,13 +2017,16 @@ /turf/simulated/wall/bay/r_wall/steel, /area/maintenance/stellardelight/deck3/aftstarroom) "hR" = ( -/obj/machinery/airlock_sensor{ - dir = 8; - pixel_x = 24 +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/effect/map_helper/airlock/sensor/int_sensor, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "hT" = ( /obj/structure/cable/blue{ icon_state = "4-8" @@ -2037,11 +2115,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/landmark{ - name = "morphspawn" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "ir" = ( /obj/structure/cable/blue{ icon_state = "4-8" @@ -2068,14 +2143,22 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portaft) "iw" = ( -/obj/structure/bed/chair/shuttle{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "iy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -2109,27 +2192,8 @@ }, /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck3/cryo) -"iD" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/angled/open{ - id = "shuttleshutter" - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor, -/area/shuttle/sdboat/aft) "iE" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/angled_bay/hatch{ - door_color = "#e6ab22"; - name = "Shield Generator"; - req_access = list(11,24); - stripe_color = "#e6ab22" - }, /obj/machinery/door/airlock/angled_bay/hatch{ door_color = "#e6ab22"; name = "Shield Generator"; @@ -2182,22 +2246,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor/grid, /area/tcommsat/computer) -"iM" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/angled/open{ - dir = 4; - id = "shuttleshutter" - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor, -/area/shuttle/sdboat/aft) "iN" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2278,8 +2326,13 @@ /area/crew_quarters/bar) "jc" = ( /obj/machinery/computer/ship/sensors/adv, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "jd" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -2362,6 +2415,16 @@ /obj/random/maintenance/cargo, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/aftstarroom) +"jy" = ( +/obj/structure/window/bay/reinforced, +/obj/structure/low_wall/bay/reinforced/steel, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/angled/open{ + dir = 4; + id = "clownmimeoffice" + }, +/turf/simulated/floor, +/area/stellardelight/deck3/clownmimeoffice) "jC" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2420,6 +2483,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/heads/hor) +"jO" = ( +/obj/machinery/station_map{ + dir = 4; + pixel_x = -32 + }, +/turf/simulated/floor/tiled/eris/dark/gray_platform, +/area/stellardelight/deck3/commandhall) "jP" = ( /obj/machinery/alarm/angled, /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -2574,12 +2644,9 @@ /turf/simulated/floor/tiled/steel_grid, /area/stellardelight/deck3/aft) "ku" = ( -/obj/structure/table/rack, -/obj/random/firstaid, -/obj/random/maintenance, -/obj/random/maintenance, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/structure/barricade/cutout/mime, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "kw" = ( /obj/machinery/light{ dir = 8 @@ -2607,16 +2674,25 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/airlock/angled_bay/external/glass{ - dir = 4; - frequency = 1380; - id_tag = null; - locked = 1; - name = "Docking Port Airlock" +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 6; + pixel_x = 7; + pixel_y = 26 }, +/obj/effect/map_helper/airlock/sensor/ext_sensor, /obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/steel_ridged, -/area/shuttle/sdboat/aft) +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_external, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "kB" = ( /obj/machinery/porta_turret/ai_defense, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2718,18 +2794,22 @@ /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck3/cryo) "kZ" = ( -/obj/structure/fuel_port{ - dir = 4; - pixel_x = 32 - }, /obj/structure/handrail{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10 +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 29; + pixel_y = 2 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "la" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2746,10 +2826,20 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "lc" = ( -/obj/machinery/power/terminal, -/obj/structure/cable/green, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/structure/fuel_port{ + dir = 8; + pixel_x = -32 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/obj/machinery/atmospherics/binary/pump/fuel{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "le" = ( /obj/structure/railing/grey{ dir = 8 @@ -2885,8 +2975,18 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/stellardelight/deck3/forestarroomb) "lB" = ( -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "lC" = ( /obj/machinery/power/apc/angled{ dir = 4 @@ -2995,6 +3095,12 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/readingroom) +"lV" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "lY" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -3060,14 +3166,38 @@ }, /turf/simulated/open, /area/stellardelight/deck2/central) -"mi" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume, -/obj/effect/map_helper/airlock/atmos/pump_out_external, -/obj/structure/handrail{ +"mh" = ( +/obj/structure/table/steel_reinforced, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 1; + pixel_y = 1 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/airless, -/area/shuttle/sdboat/fore) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) +"mi" = ( +/obj/machinery/shipsensors/fancy_shuttle, +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "mj" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -3143,23 +3273,18 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portfore) "mv" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 +/obj/effect/map_helper/airlock/atmos/pump_out_external, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "sdboat_docker_pump_out_external" }, -/turf/simulated/floor/airless, -/area/shuttle/sdboat/aft) -"mw" = ( -/obj/machinery/door/airlock/angled_bay/standard/glass{ - door_color = "#9fccc7"; - name = "Cockpit"; - req_access = list(67); - stripe_color = "#ffffff" +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "sdboat" }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/shuttle/sdboat/fore) +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "mA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -3183,8 +3308,8 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "mF" = ( -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "mI" = ( /obj/structure/cable/blue{ icon_state = "1-8" @@ -3258,10 +3383,6 @@ /obj/machinery/space_heater, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) -"mU" = ( -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) "mX" = ( /obj/structure/bed/chair{ dir = 4 @@ -3744,12 +3865,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) "oD" = ( @@ -3777,15 +3894,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/maintenance/stellardelight/deck3/portcent) -"oJ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) "oM" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -4027,6 +4135,12 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) "px" = ( @@ -4267,6 +4381,12 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) "qg" = ( @@ -4521,24 +4641,24 @@ /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck3/cryo) "ri" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/wall/rshull, -/area/shuttle/sdboat/aft) +/obj/structure/handrail, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "rj" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/foreportroomb) -"rk" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) "rl" = ( /obj/structure/sign/painting/library_secure{ pixel_x = -30 @@ -4696,6 +4816,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/open, /area/stellardelight/deck2/port) +"rX" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "rZ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -4706,19 +4840,19 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/airlock/angled_bay/external/glass{ - dir = 4; - frequency = 1380; - id_tag = null; - locked = 1; - name = "Docking Port Airlock" +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_external, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/steel_ridged, -/area/shuttle/sdboat/aft) +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "sb" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/blue{ @@ -5235,13 +5369,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai_cyborg_station) -"ue" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/handrail{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) "uf" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment, @@ -5250,18 +5377,21 @@ /turf/simulated/open, /area/stellardelight/deck2/port) "ui" = ( -/obj/machinery/power/smes/buildable{ - charge = 500000 +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" }, -/obj/structure/cable{ - icon_state = "0-4" +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 1 }, /obj/machinery/door/window/southleft{ dir = 1; req_one_access = list(11,67) }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "uj" = ( /turf/simulated/wall/bay/r_wall/blue, /area/crew_quarters/heads/hor) @@ -5386,12 +5516,22 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portcent) "uM" = ( -/obj/structure/table/rack, -/obj/item/device/paicard, -/obj/random/maintenance, -/obj/random/maintenance, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/machinery/alarm/angled, +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp/clown{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/weapon/bikehorn{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/weapon/stamp/clown{ + pixel_x = 6; + pixel_y = 9 + }, +/turf/simulated/floor/wood, +/area/stellardelight/deck3/clownmimeoffice) "uQ" = ( /obj/machinery/alarm/angled{ dir = 8 @@ -5551,6 +5691,16 @@ }, /turf/simulated/wall/bay/r_wall/steel, /area/maintenance/stellardelight/deck3/portaft) +"vr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "vt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -5708,15 +5858,20 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1380; - id_tag = null +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" }, -/obj/effect/map_helper/airlock/atmos/pump_out_internal, -/obj/structure/handrail, -/turf/simulated/floor/tiled/eris/dark/monofloor, -/area/shuttle/sdboat/aft) +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "wa" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -5802,8 +5957,13 @@ /area/crew_quarters/heads/hos) "wr" = ( /obj/machinery/computer/ship/engines/adv, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "wt" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -5868,10 +6028,12 @@ /area/ai_cyborg_station) "wP" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/camera/network/halls, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, +/obj/machinery/station_map{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "wQ" = ( @@ -5903,22 +6065,6 @@ /obj/machinery/holoplant, /turf/simulated/floor/bluegrid, /area/ai) -"wT" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/angled/open{ - dir = 4; - id = "shuttleshutter" - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor, -/area/shuttle/sdboat/fore) "wV" = ( /obj/structure/cable/blue{ icon_state = "4-8" @@ -5947,22 +6093,6 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/transitgateway) -"wX" = ( -/obj/machinery/computer/shuttle_control/explore/sdboat{ - dir = 4 - }, -/obj/machinery/power/apc/angled{ - dir = 8; - name = "night shift APC"; - nightshift_setting = 2; - req_access = null; - req_one_access = list(11,67) - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) "wY" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -5971,9 +6101,15 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "wZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/turf/simulated/wall/rshull, -/area/shuttle/sdboat/aft) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "xb" = ( /obj/machinery/light/small{ dir = 4 @@ -6011,21 +6147,17 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai_server_room) "xf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, -/obj/machinery/airlock_sensor{ - dir = 8; - frequency = 1380; - id_tag = null; - pixel_x = 24 - }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, /obj/structure/handrail{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/monofloor, -/area/shuttle/sdboat/aft) +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "xg" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -6076,11 +6208,11 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/landmark{ - name = "maint_pred" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/turf/simulated/floor/wood, +/area/stellardelight/deck3/clownmimeoffice) +"xp" = ( +/turf/simulated/floor/wood, +/area/stellardelight/deck3/clownmimeoffice) "xu" = ( /obj/machinery/door/airlock/angled_bay/external/glass{ dir = 4; @@ -6179,6 +6311,13 @@ /obj/structure/low_wall/bay/reinforced/steel, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/foreportroomb) +"xL" = ( +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "xM" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -6246,17 +6385,22 @@ /turf/simulated/floor/wood, /area/stellardelight/deck3/cafe) "ya" = ( -/obj/structure/bed/chair/bay/shuttle{ - dir = 1 - }, /obj/machinery/button/remote/blast_door{ id = "shuttleshutter"; name = "Shutter Control"; pixel_x = 17; pixel_y = 27 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "yb" = ( /obj/structure/sign/deck3{ pixel_x = 32 @@ -6421,21 +6565,6 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/portdock) -"yG" = ( -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/door/window/southright{ - dir = 1; - req_one_access = list(11,67) - }, -/obj/machinery/atmospherics/portables_connector/fuel{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) "yI" = ( /obj/item/weapon/folder{ pixel_x = -4 @@ -6703,6 +6832,16 @@ }, /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/stellardelight/deck3/commandhall) +"zC" = ( +/obj/item/toy/figure/mime, +/obj/item/weapon/pen/crayon/marker/mime, +/obj/item/weapon/pen/crayon/mime, +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "zD" = ( /obj/structure/cable/blue{ icon_state = "1-2" @@ -6723,23 +6862,14 @@ /turf/simulated/floor/wood, /area/stellardelight/deck3/cafe) "zF" = ( -/obj/machinery/power/apc/angled{ - dir = 8; - name = "night shift APC"; - nightshift_setting = 2 - }, /obj/structure/cable{ icon_state = "0-4" }, -/obj/structure/closet/crate, -/obj/random/contraband, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/machinery/power/apc/angled{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "zH" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -6828,11 +6958,17 @@ /obj/structure/handrail{ dir = 1 }, -/obj/machinery/atmospherics/binary/pump/fuel{ - dir = 4 +/obj/machinery/power/apc{ + pixel_y = -28 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/structure/cable, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "zV" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -6859,19 +6995,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/tcommsat/computer) -"Ab" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/angled/open{ - id = "shuttleshutter" - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor, -/area/shuttle/sdboat/fore) "Ae" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7017,6 +7140,32 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai_cyborg_station) +"AD" = ( +/obj/structure/handrail, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "sdboat_docker"; + pixel_x = 5; + pixel_y = 25 + }, +/obj/machinery/airlock_sensor{ + dir = 8; + frequency = 1380; + id_tag = null; + pixel_x = 25; + pixel_y = 2 + }, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "AE" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -7128,13 +7277,23 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "Bb" = ( -/obj/item/device/radio/intercom{ - dir = 1; - pixel_x = -32; - pixel_y = 24 +/obj/structure/bed/chair/bay/comfy/blue{ + dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) +/obj/structure/panic_button/small{ + pixel_x = -29; + pixel_y = 30 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Bd" = ( /obj/machinery/alarm/angled{ dir = 8 @@ -7459,17 +7618,22 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "BW" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 +/obj/machinery/power/terminal{ + dir = 1 }, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "0-4" }, -/obj/machinery/light{ - dir = 8 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "BY" = ( /obj/machinery/newscaster{ layer = 3.3; @@ -7654,7 +7818,7 @@ /area/crew_quarters/bar) "CC" = ( /turf/simulated/wall/bay/r_wall/steel, -/area/maintenance/stellardelight/deck3/forestarroomc) +/area/stellardelight/deck3/clownmimeoffice) "CD" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -7838,13 +8002,9 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai_cyborg_station) "Du" = ( -/obj/structure/table/rack/shelf, -/obj/random/contraband, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/item/weapon/storage/fancy/candle_box, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/machinery/vending/wardrobe/clowndrobe, +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "Dw" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -7973,8 +8133,21 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "clownmimeoffice"; + name = "Window Lockdown"; + pixel_x = 23; + pixel_y = 7 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "DY" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -7994,7 +8167,7 @@ /area/maintenance/stellardelight/deck3/starboardcent) "Ec" = ( /turf/simulated/wall/bay/steel, -/area/maintenance/stellardelight/deck3/forestarroomc) +/area/stellardelight/deck3/clownmimeoffice) "Ed" = ( /turf/simulated/wall/bay/r_wall/steel, /area/stellardelight/deck3/aft) @@ -8088,14 +8261,16 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) "Ex" = ( -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) -"Ez" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/structure/bed/chair/bay/comfy/blue{ + dir = 1 }, -/turf/simulated/wall/rshull, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "EE" = ( /obj/structure/table/rack{ dir = 8; @@ -8161,20 +8336,6 @@ /obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/steel_ridged, /area/tcommsat/computer) -"EM" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/angled{ - cell_type = /obj/item/weapon/cell/super; - dir = 1; - name = "night shift APC"; - nightshift_setting = 2; - req_access = null; - req_one_access = list(11,67) - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) "EN" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -8244,6 +8405,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/stellardelight/deck3/commandhall) +"EX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "EY" = ( /obj/structure/table/reinforced, /obj/machinery/computer/skills{ @@ -8942,6 +9113,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) "HN" = ( @@ -8987,6 +9160,9 @@ "HR" = ( /obj/structure/table/steel, /obj/random/contraband, +/obj/machinery/chemical_dispenser/bar_coffee/full{ + pixel_y = 8 + }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/foreportrooma) "HS" = ( @@ -9053,21 +9229,12 @@ /turf/simulated/open, /area/stellardelight/deck2/central) "Ia" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/angled/open{ - dir = 4; - id = "shuttleshutter" +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "sdboat" }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor, -/area/shuttle/sdboat/aft) +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Ib" = ( /obj/machinery/alarm/angled{ dir = 4 @@ -9127,15 +9294,19 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) "Ir" = ( -/obj/structure/bed/chair/shuttle, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 +/obj/structure/bed/chair/shuttle{ + dir = 1 }, /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "It" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 @@ -9255,14 +9426,18 @@ /area/stellardelight/deck3/portdock) "IS" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/angled_bay/standard/glass{ - name = "glass airlock" - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/door/airlock/angled_bay/hatch{ + name = "Clown and Mime Office"; + req_one_access = list(138,136); + stripe_color = "#454545" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/forestarroomc) +/area/stellardelight/deck3/clownmimeoffice) "IU" = ( /obj/machinery/hologram/holopad, /obj/structure/sign/warning/secure_area{ @@ -9372,6 +9547,13 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/transitgateway) +"Jm" = ( +/obj/structure/barricade/cutout/clown, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/stellardelight/deck3/clownmimeoffice) "Jn" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/angled_bay/hatch{ @@ -9603,11 +9785,24 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/starboarddock) +"Ke" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Kf" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/machinery/camera/network/halls{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Kg" = ( @@ -9633,11 +9828,25 @@ /turf/simulated/floor, /area/stellardelight/deck2/central) "Kj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 +/obj/machinery/computer/shuttle_control/explore/sdboat{ + dir = 4 }, -/turf/simulated/wall/rshull, -/area/shuttle/sdboat/aft) +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/power/apc{ + pixel_y = -28 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Kk" = ( /obj/structure/table/steel, /obj/random/maintenance/clean, @@ -10007,8 +10216,13 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "LP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -10095,13 +10309,6 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portaft) -"LZ" = ( -/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ - dir = 6 - }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/turf/simulated/wall/rshull, -/area/shuttle/sdboat/aft) "Mc" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10184,12 +10391,13 @@ /turf/simulated/floor, /area/ai_cyborg_station) "Mr" = ( -/obj/structure/table/rack, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/machinery/chemical_dispenser/bar_coffee/full, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/clowndouble, +/obj/structure/curtain/black{ + color = "#361447" + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "Ms" = ( /obj/structure/table/reinforced, /obj/item/weapon/stamp/hop, @@ -10394,8 +10602,16 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "MZ" = ( /obj/machinery/alarm/angled{ dir = 8 @@ -10668,6 +10884,16 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portaft) +"NS" = ( +/obj/machinery/atmospherics/unary/engine/fancy_shuttle{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "NT" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 @@ -10716,16 +10942,11 @@ /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/starboarddock) "NZ" = ( -/obj/structure/closet/crate, -/obj/random/contraband, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/mre, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/item/weapon/bedsheet/mimedouble, +/obj/structure/bed/double/padded, +/obj/structure/curtain/black, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "Oa" = ( /obj/machinery/door/firedoor/glass, /obj/structure/sign/poster{ @@ -11118,11 +11339,21 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai_upload) "Pl" = ( +/obj/machinery/door/firedoor/glass, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) +/obj/machinery/door/airlock/glass{ + name = "Starstuff Cockpit"; + req_one_access = list(67) + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Pm" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11150,6 +11381,10 @@ }, /turf/simulated/floor/tiled/dark, /area/lawoffice) +"Pp" = ( +/obj/effect/landmark/start/clown, +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "Pq" = ( /obj/structure/bed/chair{ dir = 8 @@ -11174,8 +11409,21 @@ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/machinery/camera/network/halls{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) +"PB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "PC" = ( /obj/machinery/alarm/angled{ dir = 4 @@ -11287,17 +11535,21 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1380; - id_tag = "sd_bittyshuttle"; - pixel_y = 29 +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/handrail, -/obj/effect/shuttle_landmark/shuttle_initializer/sdboat, /obj/effect/overmap/visitable/ship/landable/sd_boat, -/turf/simulated/floor/tiled/eris/dark/monofloor, -/area/shuttle/sdboat/aft) +/obj/effect/shuttle_landmark/shuttle_initializer/sdboat, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Qf" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -11305,6 +11557,16 @@ /obj/effect/landmark/start/ce, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) +"Qh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Qi" = ( /obj/structure/sign/painting/public{ pixel_x = -30 @@ -11343,16 +11605,6 @@ "Qp" = ( /turf/simulated/wall/bay/r_wall/steel, /area/crew_quarters/bar) -"Qq" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 - }, -/obj/structure/closet/emergsuit_wall{ - dir = 8; - pixel_x = -27 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) "Qs" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -11490,13 +11742,6 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) -"QR" = ( -/obj/structure/table/steel_reinforced, -/obj/structure/panic_button{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) "QS" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -11525,8 +11770,8 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "QZ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -11540,13 +11785,6 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/starboarddock) -"Rb" = ( -/obj/structure/bed/chair/shuttle, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 29 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) "Rc" = ( /obj/machinery/porta_turret/ai_defense, /obj/structure/cable/cyan{ @@ -11666,11 +11904,14 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Rw" = ( -/obj/structure/bed/chair/shuttle{ - dir = 8 +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/turf/simulated/floor/reinforced/airless, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Rx" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -11779,25 +12020,38 @@ /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck2/central) "RW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/portables_connector{ + dir = 1 }, -/obj/structure/handrail{ - dir = 8 +/obj/machinery/door/window/southright{ + dir = 1; + req_one_access = list(11,67) }, -/obj/machinery/light, -/turf/simulated/floor/tiled/eris/dark/monofloor, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "RX" = ( /turf/simulated/wall/bay/steel, /area/stellardelight/deck2/central) "RY" = ( -/obj/structure/bed/chair/shuttle, +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "RZ" = ( /obj/structure/cable/blue{ icon_state = "1-2" @@ -11938,15 +12192,14 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "SJ" = ( -/obj/structure/bed/chair/bay/shuttle{ - dir = 8 +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" }, -/obj/machinery/light, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) +/turf/simulated/floor/reinforced/airless, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "SK" = ( /obj/structure/lattice, /turf/space, @@ -12159,6 +12412,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 8; name = "night shift APC"; nightshift_setting = 2 @@ -12399,10 +12653,12 @@ /area/stellardelight/deck3/exterior) "Uy" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/camera/network/halls, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, +/obj/machinery/station_map{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "UA" = ( @@ -12426,6 +12682,16 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) +"UD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "UF" = ( /obj/machinery/light/small, /turf/simulated/floor, @@ -12605,6 +12871,21 @@ /obj/structure/low_wall/bay/reinforced/steel, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardfore) +"Vh" = ( +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + id = "shuttleshutter" + }, +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 + }, +/turf/simulated/floor/reinforced/airless, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Vi" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -12623,8 +12904,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/effect/landmark/start/mime, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "Vm" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -12693,11 +12975,16 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_cyborg_station) "Vw" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/bed/chair/shuttle{ + dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Vx" = ( /obj/structure/cable/blue{ icon_state = "1-4" @@ -12856,20 +13143,37 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Wg" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/bed/chair/shuttle{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 24 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Wi" = ( /obj/structure/closet/secure_closet/personal, /turf/simulated/floor/bluegrid, /area/ai) "Wj" = ( /obj/machinery/computer/ship/helm/adv, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Wl" = ( /obj/structure/sign/warning/falling{ pixel_x = -32 @@ -12877,15 +13181,19 @@ /turf/simulated/open, /area/stellardelight/deck2/port) "Wn" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 +/obj/machinery/power/smes/buildable{ + charge = 500000 }, -/obj/item/device/radio/intercom{ - dir = 8; - pixel_x = -24 +/obj/structure/cable{ + icon_state = "0-4" }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Wp" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/open, @@ -12930,17 +13238,22 @@ /turf/simulated/floor/airless, /area/stellardelight/deck3/exterior) "Ww" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1380; - id_tag = null - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, /obj/structure/handrail{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/monofloor, -/area/shuttle/sdboat/aft) +/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/obj/machinery/light, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = "sdboat_docker_pump_out_internal" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Wx" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 @@ -13011,21 +13324,12 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/stellardelight/deck3/foreportrooma) "WK" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/angled/open{ - dir = 4; - id = "shuttleshutter" +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor, -/area/shuttle/sdboat/fore) +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "WL" = ( /obj/structure/closet/crate, /obj/random/contraband, @@ -13057,6 +13361,7 @@ /area/lawoffice) "WQ" = ( /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 4; name = "night shift APC"; nightshift_setting = 2 @@ -13118,11 +13423,8 @@ /turf/simulated/floor/tiled/eris/white/cargo, /area/crew_quarters/heads/cmo) "Xb" = ( -/obj/machinery/alarm/angled{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "Xc" = ( /obj/structure/lattice, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -13655,12 +13957,12 @@ /turf/simulated/open, /area/crew_quarters/bar) "Zd" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" }, -/obj/machinery/alarm/angled, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Ze" = ( /turf/simulated/floor/bluegrid{ name = "Mainframe Base"; @@ -20390,17 +20692,17 @@ sM sM sM sM -be -fn -Ia -fn -fn -fn -Ia -fn -fn sM sM +Ia +Zd +Zd +Vh +gi +gi +Qh +hg +sM IK SK NL @@ -20529,19 +20831,19 @@ qz Ii hk eJ -eJ WK -eJ -eJ -fn +WK +WK +dQ +Zd +Zd Zd -Qq Wn BW lc ui -fn -sM +EX +NS sM IK Jh @@ -20670,20 +20972,20 @@ qz qz Ii Iz -Ab -QR -mU -wX +WK +WK +Kj +WK gl RY aP -LO -LO -rk +Zd +rX +MX fg -yG -iD -sM +Zd +Zd +Zd sM IK Jh @@ -20812,19 +21114,19 @@ qz qz Ii Iz -Ab +be wr Bb SJ -eJ -Rb +Vw +Vw Vw Rw -Rw +cn iw zS -fn -fn +Zd +xL sM sM IK @@ -20954,13 +21256,13 @@ qz qz Ii Iz -Ab +be Wj ya Pl -mw LO -oJ +LO +LO lB hR MX @@ -21096,19 +21398,19 @@ qz qz Ii Iz -Ab +be jc Ex -dq -eJ -Rb +SJ Vw -gY -fn +Vw +Vw +Zd +Rw sa -fn -fn -fn +Zd +PB +xL sM sM IK @@ -21238,20 +21540,20 @@ qz qz Ii hk -Ab -mU -mU -ax +WK +WK +mh +WK gl Ir Wg -ue +Zd ri vX Ww -Ww -iD -sM +UD +Zd +Zd sM IK Jh @@ -21380,20 +21682,20 @@ qz qz Ii Iz -eJ -eJ -wT -eJ -eJ -Ez -EM -cQ -ri +mi +WK +WK +WK +dQ +Zd +Zd +Zd +AD Qe xf RW -fn -sM +Ke +NS sM Di af @@ -21526,17 +21828,17 @@ sM sM sM sM -mi -Kj -iM -fn -LZ -kz -fn -fn -fn sM sM +Ia +Zd +Zd +kz +gi +gi +vr +Zd +sM IK SK NL @@ -23598,7 +23900,7 @@ BK aQ aQ sf -aQ +jO aQ BK aQ @@ -25589,7 +25891,7 @@ Ps eE dx ch -mF +lV zF NZ Ec @@ -25733,7 +26035,7 @@ dx ku mF Vk -mF +zC Ec hr al @@ -25873,9 +26175,9 @@ FE UF dx uM -mF +xp xo -mF +Jm Ec kp bm @@ -26015,9 +26317,9 @@ Rg FE dx Mr -mF +Pp ip -mF +fj Ec RE bh @@ -26161,11 +26463,11 @@ Xb QW DW IS -hB +bB HL -hB -hB -hB +bB +bB +bB pt aB Mw @@ -26299,8 +26601,8 @@ FD FD EZ CC -CC -CC +jy +jy CC CC Vg @@ -26440,7 +26742,6 @@ DQ DQ DQ DQ -DQ UU DQ DQ @@ -26448,6 +26749,7 @@ DQ DQ DQ DQ +DQ ez xH DE diff --git a/maps/stellardelight/stellar_delight_areas.dm b/maps/stellardelight/stellar_delight_areas.dm index d1da4bf824..47bb681c0a 100644 --- a/maps/stellardelight/stellar_delight_areas.dm +++ b/maps/stellardelight/stellar_delight_areas.dm @@ -129,6 +129,7 @@ soundproofed = TRUE limit_mob_size = FALSE block_suit_sensors = TRUE + forbid_events = TRUE /area/stellardelight/deck1/dorms/dorm1 name = "Dormitory One" @@ -277,6 +278,10 @@ /area/stellardelight/deck3/readingroom name = "Reading Rooms" sound_env = SMALL_SOFTFLOOR + flags = RAD_SHIELDED| BLUE_SHIELDED |AREA_FLAG_IS_NOT_PERSISTENT + soundproofed = TRUE + block_suit_sensors = TRUE + forbid_events = TRUE /area/stellardelight/deck3/portdock name = "Port Dock" @@ -286,6 +291,9 @@ name = "Starboard Dock" ambience = AMBIENCE_ARRIVALS +/area/stellardelight/deck3/clownmimeoffice + name = "Clown and Mime Office" + /area/stellardelight/deck1/exterior name = "Deck One Exterior" /area/stellardelight/deck2/exterior diff --git a/maps/stellardelight/stellar_delight_defines.dm b/maps/stellardelight/stellar_delight_defines.dm index 8e3ac822f6..e95d9813d7 100644 --- a/maps/stellardelight/stellar_delight_defines.dm +++ b/maps/stellardelight/stellar_delight_defines.dm @@ -4,15 +4,16 @@ #define Z_LEVEL_SHIP_HIGH 3 #define Z_LEVEL_CENTCOM 4 #define Z_LEVEL_MISC 5 -#define Z_LEVEL_BEACH 6 -#define Z_LEVEL_BEACH_CAVE 7 -#define Z_LEVEL_AEROSTAT 8 -#define Z_LEVEL_AEROSTAT_SURFACE 9 -#define Z_LEVEL_DEBRISFIELD 10 -#define Z_LEVEL_FUELDEPOT 11 -#define Z_LEVEL_OVERMAP 12 -#define Z_LEVEL_OFFMAP1 13 -#define Z_LEVEL_GATEWAY 14 +#define Z_LEVEL_SPACE_ROCKS 6 +#define Z_LEVEL_BEACH 7 +#define Z_LEVEL_BEACH_CAVE 8 +#define Z_LEVEL_AEROSTAT 9 +#define Z_LEVEL_AEROSTAT_SURFACE 10 +#define Z_LEVEL_DEBRISFIELD 11 +#define Z_LEVEL_FUELDEPOT 12 +#define Z_LEVEL_OVERMAP 13 +#define Z_LEVEL_OFFMAP1 14 +#define Z_LEVEL_GATEWAY 15 //Camera networks #define NETWORK_HALLS "Halls" @@ -46,12 +47,12 @@ lobby_screens = list("youcanttaketheskyfromme") id_hud_icons = 'icons/mob/hud_jobs_vr.dmi' -/* + holomap_smoosh = list(list( - Z_LEVEL_SURFACE_LOW, - Z_LEVEL_SURFACE_MID, - Z_LEVEL_SURFACE_HIGH)) -*/ + Z_LEVEL_SHIP_LOW, + Z_LEVEL_SHIP_MID, + Z_LEVEL_SHIP_HIGH)) + station_name = "NRV Stellar Delight" station_short = "Stellar Delight" dock_name = "Virgo-3B Colony" @@ -126,6 +127,7 @@ lateload_z_levels = list( list("Ship - Central Command"), list("Ship - Misc"), //Shuttle transit zones, holodeck templates, etc + list("V3b Asteroid Field"), list("Desert Planet - Z1 Beach","Desert Planet - Z2 Cave"), list("Remmi Aerostat - Z1 Aerostat","Remmi Aerostat - Z2 Surface"), list("Debris Field - Z1 Space"), @@ -177,17 +179,13 @@ . += "As an employee or contractor of NanoTrasen, operators of the Adephagia and one of the galaxy's largest corporations, you're probably just here to do a job." return jointext(., "
") -/* + /datum/map/stellar_delight/perform_map_generation() - new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_SURFACE_MINE, world.maxx, world.maxy) // Create the mining Z-level. - new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_SURFACE_MINE, 64, 64) // Create the mining ore distribution map. - - new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_SOLARS, world.maxx, world.maxy) // Create the mining Z-level. - new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_SOLARS, 64, 64) // Create the mining ore distribution map. - + new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_SPACE_ROCKS, world.maxx, world.maxy) // Create the mining Z-level. + new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_SPACE_ROCKS, 64, 64) // Create the mining ore distribution map. return 1 -*/ + /datum/skybox_settings/stellar_delight icon_state = "space5" @@ -200,12 +198,6 @@ Z_LEVEL_BEACH ) -// For making the 6-in-1 holomap, we calculate some offsets -#define SHIP_MAP_SIZE 140 // Width and height of compiled in tether z levels. -#define SHIP_HOLOMAP_CENTER_GUTTER 40 // 40px central gutter between columns -#define SHIP_HOLOMAP_MARGIN_X ((HOLOMAP_ICON_SIZE - (2*TETHER_MAP_SIZE) - TETHER_HOLOMAP_CENTER_GUTTER) / 2) // 80 -#define SHIP_HOLOMAP_MARGIN_Y ((HOLOMAP_ICON_SIZE - (2*TETHER_MAP_SIZE)) / 2) // 30 - /obj/effect/landmark/map_data/stellar_delight height = 3 @@ -241,6 +233,11 @@ return cached_skybox_image.add_overlay("glow") +// For making the 6-in-1 holomap, we calculate some offsets +#define SHIP_MAP_SIZE 140 // Width and height of compiled in tether z levels. +#define SHIP_HOLOMAP_CENTER_GUTTER 40 // 40px central gutter between columns +#define SHIP_HOLOMAP_MARGIN_X ((HOLOMAP_ICON_SIZE - (2*SHIP_MAP_SIZE) - SHIP_HOLOMAP_CENTER_GUTTER) / 2) // 80 +#define SHIP_HOLOMAP_MARGIN_Y ((HOLOMAP_ICON_SIZE - (2*SHIP_MAP_SIZE)) / 2) // 30 // We have a bunch of stuff common to the station z levels /datum/map_z_level/stellar_delight @@ -253,18 +250,24 @@ name = "Deck 1" base_turf = /turf/space transit_chance = 33 + holomap_offset_x = SHIP_HOLOMAP_MARGIN_X + holomap_offset_y = SHIP_HOLOMAP_MARGIN_Y /datum/map_z_level/stellar_delight/deck_two z = Z_LEVEL_SHIP_MID name = "Deck 2" base_turf = /turf/simulated/open transit_chance = 33 + holomap_offset_x = SHIP_HOLOMAP_MARGIN_X + holomap_offset_y = SHIP_HOLOMAP_MARGIN_Y + SHIP_MAP_SIZE /datum/map_z_level/stellar_delight/deck_three z = Z_LEVEL_SHIP_HIGH name = "Deck 3" base_turf = /turf/simulated/open transit_chance = 33 + holomap_offset_x = HOLOMAP_ICON_SIZE - SHIP_HOLOMAP_MARGIN_X - SHIP_MAP_SIZE + holomap_offset_y = SHIP_HOLOMAP_MARGIN_Y + SHIP_MAP_SIZE /datum/map_template/ship_lateload allow_duplicates = FALSE @@ -307,6 +310,26 @@ name = "Misc" flags = MAP_LEVEL_ADMIN|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT +#include "../submaps/space_rocks/space_rocks.dm" +/datum/map_template/ship_lateload/space_rocks + name = "V3b Asteroid Field" + desc = "Space debris is common in V3b's orbit due to the proximity of Virgo 3" + mappath = 'maps/submaps/space_rocks/space_rocks.dmm' + + associated_map_datum = /datum/map_z_level/ship_lateload/space_rocks + +/datum/map_template/ship_lateload/space_rocks/on_map_loaded(z) + . = ..() + seed_submaps(list(Z_LEVEL_SPACE_ROCKS), 60, /area/sdmine/unexplored, /datum/map_template/space_rocks) + new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_SPACE_ROCKS, world.maxx - 4, world.maxy - 4) + new /datum/random_map/noise/ore/spacerocks(null, 1, 1, Z_LEVEL_SPACE_ROCKS, 64, 64) + +/datum/map_z_level/ship_lateload/space_rocks + z = Z_LEVEL_SPACE_ROCKS + name = "V3b Asteroid Field" + base_turf = /turf/space + flags = MAP_LEVEL_PLAYER|MAP_LEVEL_CONTACT|MAP_LEVEL_CONSOLES + /datum/map_template/ship_lateload/overmap name = "Overmap" desc = "Overmap lives here :3" diff --git a/maps/stellardelight/stellar_delight_shuttle_defs.dm b/maps/stellardelight/stellar_delight_shuttle_defs.dm index 371e0b15d4..e83c05be9e 100644 --- a/maps/stellardelight/stellar_delight_shuttle_defs.dm +++ b/maps/stellardelight/stellar_delight_shuttle_defs.dm @@ -114,7 +114,7 @@ /obj/effect/overmap/visitable/ship/landable/sd_boat name = "NTV Starstuff" desc = "A small shuttle from the NRV Stellar Delight." - vessel_mass = 1000 + vessel_mass = 2500 vessel_size = SHIP_SIZE_TINY shuttle = "Starstuff" known = TRUE @@ -131,9 +131,9 @@ /datum/shuttle/autodock/overmap/sdboat name = "Starstuff" current_location = "port_shuttlepad" - docking_controller_tag = "sd_bittyshuttle" + docking_controller_tag = "sdboat_docker" shuttle_area = list(/area/shuttle/sdboat/fore,/area/shuttle/sdboat/aft) - fuel_consumption = 2 + fuel_consumption = 1 defer_initialisation = TRUE /area/shuttle/sdboat/fore @@ -240,7 +240,7 @@ [i]Transponder[/i]: Transmitting (CIV), NanoTrasen IFF [b]Notice[/b]: NanoTrasen Base, authorized personnel only"} known = TRUE - in_space = FALSE + in_space = TRUE icon = 'icons/obj/overmap_vr.dmi' icon_state = "virgo3b" @@ -250,8 +250,11 @@ skybox_pixel_x = 0 skybox_pixel_y = 0 + initial_generic_waypoints = list("sr-c","sr-n","sr-s") initial_restricted_waypoints = list("Central Command Shuttlepad" = list("cc_shuttlepad")) + extra_z_levels = list(Z_LEVEL_SPACE_ROCKS) + /////SD Starts at V3b to pick up crew refuel and repair (And to make sure it doesn't spawn on hazards) /obj/effect/overmap/visitable/sector/virgo3b/Initialize() . = ..() @@ -278,4 +281,7 @@ //For ships, it's safe to assume they're big enough to not be sneaky else if(istype(AM, /obj/effect/overmap/visitable/ship)) - atc.msg(message) \ No newline at end of file + atc.msg(message) + +/obj/effect/overmap/visitable/sector/virgo3b/get_space_zlevels() + return list(Z_LEVEL_SPACE_ROCKS) diff --git a/maps/submaps/space_rocks/bittynest1.dmm b/maps/submaps/space_rocks/bittynest1.dmm new file mode 100644 index 0000000000..9d73c9b765 --- /dev/null +++ b/maps/submaps/space_rocks/bittynest1.dmm @@ -0,0 +1,145 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"L" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest1) +"P" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/submap/space_rocks/bittynest1) +"W" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest1) +"Y" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest1) + +(1,1,1) = {" +a +a +a +a +P +P +a +a +a +a +"} +(2,1,1) = {" +a +a +a +P +P +P +P +W +a +a +"} +(3,1,1) = {" +a +a +P +P +W +W +W +W +P +a +"} +(4,1,1) = {" +a +P +P +W +W +P +P +P +P +a +"} +(5,1,1) = {" +P +P +W +W +W +W +W +Y +P +P +"} +(6,1,1) = {" +P +P +W +W +W +L +W +W +W +P +"} +(7,1,1) = {" +P +P +W +W +W +W +W +W +W +P +"} +(8,1,1) = {" +a +P +P +Y +W +W +W +W +P +P +"} +(9,1,1) = {" +a +a +P +P +P +P +P +P +P +a +"} +(10,1,1) = {" +a +a +a +a +a +P +P +a +a +a +"} diff --git a/maps/submaps/space_rocks/bittynest2.dmm b/maps/submaps/space_rocks/bittynest2.dmm new file mode 100644 index 0000000000..cb840bd5a4 --- /dev/null +++ b/maps/submaps/space_rocks/bittynest2.dmm @@ -0,0 +1,145 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"v" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/submap/space_rocks/bittynest2) +"B" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest2) +"R" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest2) +"W" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest2) + +(1,1,1) = {" +a +a +a +a +v +v +a +v +v +a +"} +(2,1,1) = {" +a +a +v +v +v +v +v +v +v +a +"} +(3,1,1) = {" +a +v +v +v +v +W +R +v +v +v +"} +(4,1,1) = {" +a +v +v +v +W +W +B +W +v +v +"} +(5,1,1) = {" +v +v +v +W +W +W +W +W +v +a +"} +(6,1,1) = {" +v +v +W +W +W +W +W +v +v +v +"} +(7,1,1) = {" +v +v +R +B +W +W +W +W +v +a +"} +(8,1,1) = {" +v +v +v +W +W +v +v +W +a +a +"} +(9,1,1) = {" +a +v +v +v +v +v +v +W +a +a +"} +(10,1,1) = {" +a +a +a +v +v +a +a +a +a +a +"} diff --git a/maps/submaps/space_rocks/bittynest3.dmm b/maps/submaps/space_rocks/bittynest3.dmm new file mode 100644 index 0000000000..7f845fd0c9 --- /dev/null +++ b/maps/submaps/space_rocks/bittynest3.dmm @@ -0,0 +1,145 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"p" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest3) +"N" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest3) +"Q" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest3) +"Z" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/submap/space_rocks/bittynest3) + +(1,1,1) = {" +a +a +Q +a +Z +Z +Z +Z +a +a +"} +(2,1,1) = {" +a +Z +Q +Q +Q +Z +Z +Z +Z +a +"} +(3,1,1) = {" +a +Z +Z +Q +Q +p +Q +Z +Z +Z +"} +(4,1,1) = {" +Z +Z +Z +Z +Z +Q +Q +Q +Z +Z +"} +(5,1,1) = {" +Z +Z +Z +p +Q +Z +Q +Q +Z +a +"} +(6,1,1) = {" +Z +Z +Q +Q +Q +Q +Q +Z +Z +a +"} +(7,1,1) = {" +Z +Z +Q +N +Q +Q +Q +Z +Z +a +"} +(8,1,1) = {" +a +Z +Z +Q +Q +Z +Z +Z +Z +a +"} +(9,1,1) = {" +a +a +Z +Z +Z +Z +Z +Z +a +a +"} +(10,1,1) = {" +a +a +a +Z +Z +Z +a +a +a +a +"} diff --git a/maps/submaps/space_rocks/bittynest4.dmm b/maps/submaps/space_rocks/bittynest4.dmm new file mode 100644 index 0000000000..2c4f133951 --- /dev/null +++ b/maps/submaps/space_rocks/bittynest4.dmm @@ -0,0 +1,145 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"m" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest4) +"x" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest4) +"P" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest4) +"V" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/submap/space_rocks/bittynest4) + +(1,1,1) = {" +a +a +V +V +V +P +V +V +a +a +"} +(2,1,1) = {" +a +V +V +V +P +P +P +V +V +a +"} +(3,1,1) = {" +V +V +P +P +P +x +V +V +V +V +"} +(4,1,1) = {" +V +V +P +P +V +V +V +V +V +V +"} +(5,1,1) = {" +a +V +P +V +V +m +P +x +V +V +"} +(6,1,1) = {" +V +V +P +V +P +P +P +P +P +V +"} +(7,1,1) = {" +V +V +P +P +P +P +V +V +P +V +"} +(8,1,1) = {" +V +V +V +P +V +V +V +P +P +V +"} +(9,1,1) = {" +a +V +V +V +V +V +P +m +V +V +"} +(10,1,1) = {" +a +a +V +V +V +P +P +V +V +a +"} diff --git a/maps/submaps/space_rocks/clearing.dmm b/maps/submaps/space_rocks/clearing.dmm new file mode 100644 index 0000000000..3ffa6ed085 --- /dev/null +++ b/maps/submaps/space_rocks/clearing.dmm @@ -0,0 +1,148 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"v" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/clearing) +"y" = ( +/obj/random/contraband/nofail, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/clearing) +"P" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/clearing) +"W" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/clearing) + +(1,1,1) = {" +a +a +a +a +v +v +a +a +a +a +"} +(2,1,1) = {" +a +a +v +v +v +v +v +v +a +a +"} +(3,1,1) = {" +a +v +v +v +v +v +v +v +v +a +"} +(4,1,1) = {" +a +v +v +v +v +v +v +v +v +a +"} +(5,1,1) = {" +v +v +v +v +P +v +v +v +v +v +"} +(6,1,1) = {" +v +v +v +W +v +y +v +v +v +v +"} +(7,1,1) = {" +a +v +v +v +v +v +v +v +v +a +"} +(8,1,1) = {" +a +v +v +v +v +v +v +v +v +a +"} +(9,1,1) = {" +a +a +v +v +v +v +v +v +a +a +"} +(10,1,1) = {" +a +a +a +a +v +v +a +a +a +a +"} diff --git a/maps/submaps/space_rocks/seventemple.dmm b/maps/submaps/space_rocks/seventemple.dmm new file mode 100644 index 0000000000..1c5162c676 --- /dev/null +++ b/maps/submaps/space_rocks/seventemple.dmm @@ -0,0 +1,498 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/obj/structure/loot_pile/surface/alien/medical, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/submap/space_rocks/seventemple) +"f" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/seventemple) +"h" = ( +/obj/structure/loot_pile/surface/alien/end, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/submap/space_rocks/seventemple) +"m" = ( +/turf/simulated/shuttle/floor/alien, +/area/submap/space_rocks/seventemple) +"p" = ( +/obj/structure/loot_pile/surface/bones, +/turf/simulated/shuttle/floor/alien/blue, +/area/submap/space_rocks/seventemple) +"q" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/seventemple) +"t" = ( +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/submap/space_rocks/seventemple) +"w" = ( +/obj/structure/loot_pile/surface/alien/security, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/submap/space_rocks/seventemple) +"y" = ( +/obj/structure/loot_pile/surface/drone, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/submap/space_rocks/seventemple) +"F" = ( +/turf/simulated/shuttle/floor/alien/blue, +/area/submap/space_rocks/seventemple) +"J" = ( +/turf/simulated/wall/eris/r_wall, +/area/submap/space_rocks/seventemple) +"R" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/seventemple) +"Y" = ( +/obj/structure/loot_pile/surface/alien/engineering, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/submap/space_rocks/seventemple) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +J +a +a +a +a +f +J +J +J +f +a +a +a +a +J +a +a +a +"} +(3,1,1) = {" +a +J +J +J +a +a +f +J +J +t +J +J +f +a +a +J +J +J +a +a +"} +(4,1,1) = {" +a +a +J +f +f +f +f +J +Y +t +t +J +f +f +f +f +J +a +a +a +"} +(5,1,1) = {" +a +a +a +f +R +f +f +J +t +t +t +J +f +f +f +f +a +a +a +a +"} +(6,1,1) = {" +a +a +f +f +f +f +f +J +t +y +t +J +f +f +R +f +f +a +a +a +"} +(7,1,1) = {" +a +f +f +f +f +f +J +J +t +m +t +J +J +f +f +f +f +f +a +a +"} +(8,1,1) = {" +a +f +f +f +f +J +J +m +t +t +t +m +J +J +f +f +f +f +a +a +"} +(9,1,1) = {" +a +f +q +f +J +J +t +t +t +F +t +t +t +J +J +f +f +f +a +a +"} +(10,1,1) = {" +J +f +f +f +J +w +t +t +F +p +F +t +t +h +J +f +f +f +J +a +"} +(11,1,1) = {" +a +f +f +f +J +J +t +t +t +F +t +t +t +J +J +f +f +f +a +a +"} +(12,1,1) = {" +a +f +f +f +f +J +J +m +t +t +t +m +J +J +f +f +f +f +a +a +"} +(13,1,1) = {" +a +f +f +f +f +f +J +J +t +m +t +J +J +f +f +f +q +f +a +a +"} +(14,1,1) = {" +a +a +f +f +f +f +f +J +t +y +t +J +f +f +f +f +f +a +a +a +"} +(15,1,1) = {" +a +a +a +f +R +f +f +J +t +t +t +J +f +f +R +f +a +a +a +a +"} +(16,1,1) = {" +a +a +J +f +f +f +f +J +b +t +t +J +f +f +f +f +J +a +a +a +"} +(17,1,1) = {" +a +J +J +J +a +a +f +J +J +t +J +J +f +a +a +J +J +J +a +a +"} +(18,1,1) = {" +a +a +J +a +a +a +a +f +J +J +J +f +a +a +a +a +J +a +a +a +"} +(19,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/submaps/space_rocks/space_rocks.dm b/maps/submaps/space_rocks/space_rocks.dm new file mode 100644 index 0000000000..3951d51171 --- /dev/null +++ b/maps/submaps/space_rocks/space_rocks.dm @@ -0,0 +1,61 @@ +#include "space_rocks_pois.dm" +#include "space_rocks_stuff.dm" + +/turf/simulated/mineral/vacuum/sdmine/make_ore(var/rare_ore) + if(mineral) + return + var/mineral_name + if(rare_ore) + mineral_name = pickweight(list( + "marble" = 3, + "uranium" = 10, + "platinum" = 10, + "hematite" = 20, + "carbon" = 5, + "diamond" = 1, + "gold" = 8, + "silver" = 8, + "phoron" = 18, + "lead" = 2, + "verdantium" = 1)) + else + mineral_name = pickweight(list( + "marble" = 2, + "uranium" = 5, + "platinum" = 5, + "hematite" = 35, + "carbon" = 5, + "gold" = 3, + "silver" = 3, + "phoron" = 25, + "lead" = 1)) + + if(mineral_name && (mineral_name in GLOB.ore_data)) + mineral = GLOB.ore_data[mineral_name] + UpdateMineral() + update_icon() + +/datum/random_map/noise/ore/spacerocks + descriptor = "asteroid field ore distribution map" + deep_val = 0.2 + rare_val = 0.1 + +/datum/random_map/noise/ore/spacerocks/check_map_sanity() + return 1 //Totally random, but probably beneficial. + +/area/sdmine/ + ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg') + base_turf = /turf/simulated/mineral/floor/vacuum +/area/sdmine/unexplored + name = "asteroid field" + icon_state = "unexplored" +/area/sdmine/explored + name = "asteroid field" + icon_state = "explored" + + +/obj/effect/overmap/visitable/sector/virgo3b/generate_skybox(zlevel) + var/static/image/smallone = image(icon = 'icons/skybox/virgo3b.dmi', icon_state = "small") + + if(zlevel == Z_LEVEL_SPACE_ROCKS) + return smallone \ No newline at end of file diff --git a/maps/submaps/space_rocks/space_rocks.dmm b/maps/submaps/space_rocks/space_rocks.dmm new file mode 100644 index 0000000000..13f3f7d605 --- /dev/null +++ b/maps/submaps/space_rocks/space_rocks.dmm @@ -0,0 +1,19911 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/space, +/area/space) +"b" = ( +/obj/effect/shuttle_landmark/premade/spacerocks/north, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/sdmine/explored) +"v" = ( +/obj/effect/shuttle_landmark/premade/spacerocks/south, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/sdmine/explored) +"y" = ( +/obj/effect/shuttle_landmark/premade/spacerocks/center, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/sdmine/explored) +"D" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/sdmine/explored) +"J" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/sdmine/unexplored) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(5,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +a +a +a +a +a +a +a +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(10,1,1) = {" +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(11,1,1) = {" +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(12,1,1) = {" +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(13,1,1) = {" +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(14,1,1) = {" +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(15,1,1) = {" +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(16,1,1) = {" +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(17,1,1) = {" +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(18,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(21,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(22,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(23,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(24,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(25,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(26,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(27,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(28,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +a +J +J +J +J +a +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(29,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(30,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(31,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(32,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(33,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(34,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(35,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(36,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(37,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +D +a +a +a +a +a +a +"} +(38,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +D +a +a +a +a +a +a +"} +(39,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +D +D +D +D +J +J +J +J +J +J +J +J +J +D +D +a +a +a +a +a +a +"} +(40,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +a +a +D +D +D +D +D +D +D +D +J +J +J +J +J +D +D +D +D +a +a +a +a +a +a +"} +(41,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +"} +(42,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +"} +(43,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +"} +(44,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +"} +(45,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +"} +(46,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +"} +(47,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +"} +(48,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +"} +(49,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +"} +(50,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +"} +(51,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +v +D +D +D +D +D +D +a +a +a +a +a +a +a +a +"} +(52,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +"} +(53,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +"} +(54,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +"} +(55,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +"} +(56,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +"} +(57,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +"} +(58,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +D +D +D +a +a +a +a +a +"} +(59,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +a +a +a +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +D +a +a +a +a +a +"} +(60,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +a +a +a +a +a +"} +(61,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(62,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(63,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(64,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(65,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(66,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(67,1,1) = {" +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(68,1,1) = {" +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(69,1,1) = {" +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(70,1,1) = {" +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(71,1,1) = {" +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(72,1,1) = {" +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(73,1,1) = {" +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(74,1,1) = {" +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(75,1,1) = {" +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(76,1,1) = {" +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(77,1,1) = {" +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(78,1,1) = {" +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(79,1,1) = {" +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(80,1,1) = {" +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(81,1,1) = {" +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +y +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(82,1,1) = {" +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(83,1,1) = {" +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +b +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(84,1,1) = {" +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(85,1,1) = {" +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(86,1,1) = {" +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(87,1,1) = {" +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(88,1,1) = {" +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(89,1,1) = {" +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(90,1,1) = {" +a +a +a +a +a +a +a +a +D +D +D +D +J +J +J +J +J +J +J +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(91,1,1) = {" +a +a +a +a +a +a +a +a +D +D +D +J +J +J +J +J +J +J +J +J +J +J +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(92,1,1) = {" +a +a +a +a +a +a +a +a +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(93,1,1) = {" +a +a +a +a +a +a +a +a +a +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(94,1,1) = {" +a +a +a +a +a +a +a +a +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(95,1,1) = {" +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(96,1,1) = {" +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(97,1,1) = {" +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(98,1,1) = {" +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(99,1,1) = {" +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(100,1,1) = {" +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(101,1,1) = {" +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(102,1,1) = {" +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(103,1,1) = {" +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(104,1,1) = {" +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(105,1,1) = {" +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(106,1,1) = {" +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(107,1,1) = {" +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(108,1,1) = {" +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(109,1,1) = {" +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(110,1,1) = {" +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(111,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(112,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +"} +(113,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(114,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +"} +(115,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +"} +(116,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +"} +(117,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +"} +(118,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +"} +(119,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +"} +(120,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +"} +(121,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(122,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(123,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(124,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(125,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(126,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(127,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +a +J +J +a +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(128,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(129,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(130,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(131,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(132,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(133,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(134,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(135,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(136,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(137,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(138,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(139,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(140,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/submaps/space_rocks/space_rocks_pois.dm b/maps/submaps/space_rocks/space_rocks_pois.dm new file mode 100644 index 0000000000..3c42dc57d6 --- /dev/null +++ b/maps/submaps/space_rocks/space_rocks_pois.dm @@ -0,0 +1,96 @@ +#if MAP_TEST +#include "bittynest1.dmm" +#include "bittynest2.dmm" +#include "bittynest3.dmm" +#include "bittynest4.dmm" +#include "clearing.dmm" +#include "seventemple.dmm" +#include "spacecrystals.dmm" +#include "tunnel1.dmm" +#include "tunnel2.dmm" +#endif + +/area/submap/space_rocks + name = "POI - Space Rocks" + ambience = AMBIENCE_FOREBODING + +/area/submap/space_rocks/bittynest1 + name = "POI - Bittynest1" + +/datum/map_template/space_rocks/bittynest1 + name = "Bittynest1" + desc = "A smol nest for smol badguys" + mappath = 'bittynest1.dmm' + cost = 5 + +/area/submap/space_rocks/bittynest2 + name = "POI - Bittynest2" + +/datum/map_template/space_rocks/bittynest2 + name = "Bittynest2" + desc = "A smol nest for smol badguys" + mappath = 'bittynest2.dmm' + cost = 5 + +/area/submap/space_rocks/bittynest3 + name = "POI - Bittynest3" + +/datum/map_template/space_rocks/bittynest3 + name = "Bittynest3" + desc = "A smol nest for smol badguys" + mappath = 'bittynest3.dmm' + cost = 5 + +/area/submap/space_rocks/bittynest4 + name = "POI - Bittynest4" + +/datum/map_template/space_rocks/bittynest4 + name = "Bittynest4" + desc = "A smol nest for smol badguys" + mappath = 'bittynest4.dmm' + cost = 5 + +/area/submap/space_rocks/tunnel1 + name = "POI - Tunnel1" + +/datum/map_template/space_rocks/tunnel1 + name = "Tunnel1" + desc = "A tunnel left behind!" + mappath = 'tunnel1.dmm' + cost = 10 + +/area/submap/space_rocks/tunnel2 + name = "POI - Tunnel2" + +/datum/map_template/space_rocks/tunnel2 + name = "Tunnel2" + desc = "A tunnel left behind!" + mappath = 'tunnel2.dmm' + cost = 10 + +/area/submap/space_rocks/spacecrystals + name = "POI - Space Crystals" + +/datum/map_template/space_rocks/tunnel2 + name = "Space Crystals" + desc = "Some crystals living in space!" + mappath = 'spacecrystals.dmm' + cost = 10 + +/area/submap/space_rocks/clearing + name = "POI - Clearing" + +/datum/map_template/space_rocks/clearing + name = "Clearing" + desc = "A clear spot for mischief to happen." + mappath = 'clearing.dmm' + cost = 10 + +/area/submap/space_rocks/seventemple + name = "POI - Temple of the Seven" + +/datum/map_template/space_rocks/seventemple + name = "Temple of the Seven" + desc = "A mysterious space!" + mappath = 'seventemple.dmm' + cost = 25 diff --git a/maps/submaps/space_rocks/space_rocks_stuff.dm b/maps/submaps/space_rocks/space_rocks_stuff.dm new file mode 100644 index 0000000000..cacb70e387 --- /dev/null +++ b/maps/submaps/space_rocks/space_rocks_stuff.dm @@ -0,0 +1,30 @@ +/////LANDING LANDMARKS +/obj/effect/shuttle_landmark/premade/spacerocks/center + name = "asteroid field center" + landmark_tag = "sr-c" + +/obj/effect/shuttle_landmark/premade/spacerocks/north + name = "asteroid field north" + landmark_tag = "sr-n" + +/obj/effect/shuttle_landmark/premade/spacerocks/south + name = "asteroid field south" + landmark_tag = "sr-s" + +/obj/tether_away_spawner/asteroidbaddies + name = "Asteroid Mob Spawner" + faction = "space_rock" + atmos_comp = TRUE + prob_spawn = 100 + prob_fall = 40 + //guard = 20 + mobs_to_pick_from = list( + /mob/living/simple_mob/animal/space/bats = 10, + /mob/living/simple_mob/vore/alienanimals/space_jellyfish = 15, + /mob/living/simple_mob/vore/alienanimals/startreader = 15, + /mob/living/simple_mob/vore/alienanimals/space_ghost = 6, + /mob/living/simple_mob/vore/oregrub = 1, + /mob/living/simple_mob/animal/space/carp = 3, + /mob/living/simple_mob/animal/space/carp/large = 1, + /mob/living/simple_mob/animal/space/carp/large/huge = 1 + ) diff --git a/maps/submaps/space_rocks/spacecrystals.dmm b/maps/submaps/space_rocks/spacecrystals.dmm new file mode 100644 index 0000000000..6d799f7a1c --- /dev/null +++ b/maps/submaps/space_rocks/spacecrystals.dmm @@ -0,0 +1,471 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"c" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/spacecrystals) +"j" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/spacecrystals) +"W" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/submap/space_rocks/spacecrystals) +"X" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/spacecrystals) +"Z" = ( +/obj/machinery/crystal, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/spacecrystals) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +a +W +W +W +W +W +W +a +a +a +a +a +a +a +a +a +a +"} +(5,1,1) = {" +a +a +a +W +W +c +c +c +c +W +W +a +a +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +a +a +W +c +c +c +c +c +c +W +a +a +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +a +W +W +X +j +c +c +c +c +W +W +W +W +W +W +a +a +a +a +"} +(8,1,1) = {" +a +a +W +c +c +c +c +c +c +Z +c +c +c +c +W +W +a +a +a +a +"} +(9,1,1) = {" +a +a +W +c +c +c +c +Z +c +c +c +Z +c +c +c +W +W +a +a +a +"} +(10,1,1) = {" +a +a +W +W +c +c +c +c +c +c +c +c +c +j +c +c +W +a +a +a +"} +(11,1,1) = {" +a +a +a +W +W +W +c +c +c +Z +c +c +c +c +c +c +W +a +a +a +"} +(12,1,1) = {" +a +a +a +a +a +W +c +c +c +c +c +c +c +c +c +c +W +a +a +a +"} +(13,1,1) = {" +a +a +a +a +W +W +c +Z +c +c +c +Z +c +c +X +W +W +a +a +a +"} +(14,1,1) = {" +a +a +a +W +W +c +c +c +c +Z +c +c +W +W +W +W +a +a +a +a +"} +(15,1,1) = {" +a +a +a +W +c +c +j +X +c +c +c +W +W +a +a +a +a +a +a +a +"} +(16,1,1) = {" +a +a +a +W +c +c +c +c +c +c +W +W +a +a +a +a +a +a +a +a +"} +(17,1,1) = {" +a +a +a +W +c +c +c +c +c +W +W +a +a +a +a +a +a +a +a +a +"} +(18,1,1) = {" +a +a +a +W +W +c +W +c +W +W +a +a +a +a +a +a +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +W +W +W +W +W +a +a +a +a +a +a +a +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/submaps/space_rocks/tunnel1.dmm b/maps/submaps/space_rocks/tunnel1.dmm new file mode 100644 index 0000000000..ac611ad185 --- /dev/null +++ b/maps/submaps/space_rocks/tunnel1.dmm @@ -0,0 +1,251 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/template_noop) +"b" = ( +/turf/simulated/floor/airless, +/area/submap/space_rocks/tunnel1) +"k" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/tunnel1) +"l" = ( +/turf/simulated/wall, +/area/submap/space_rocks/tunnel1) +"x" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/tunnel1) +"L" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/submap/space_rocks/tunnel1) +"Z" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/tunnel1) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +L +l +L +L +L +L +l +x +L +L +L +L +l +x +x +L +L +L +l +L +"} +(4,1,1) = {" +L +b +L +L +Z +L +b +x +x +L +L +x +b +L +x +x +x +x +b +L +"} +(5,1,1) = {" +x +b +b +x +k +x +b +b +x +x +x +x +b +b +x +x +L +x +b +b +"} +(6,1,1) = {" +x +b +b +x +x +x +b +b +x +x +x +x +b +b +x +Z +k +x +b +b +"} +(7,1,1) = {" +L +b +L +k +x +L +b +x +x +x +x +x +b +x +x +L +x +x +b +L +"} +(8,1,1) = {" +L +l +x +x +L +L +l +L +x +x +L +L +l +L +L +L +L +L +l +L +"} +(9,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(10,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/submaps/space_rocks/tunnel2.dmm b/maps/submaps/space_rocks/tunnel2.dmm new file mode 100644 index 0000000000..9de921541c --- /dev/null +++ b/maps/submaps/space_rocks/tunnel2.dmm @@ -0,0 +1,275 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/template_noop) +"f" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/floor/airless, +/area/submap/space_rocks/tunnel2) +"i" = ( +/turf/simulated/floor/airless, +/area/submap/space_rocks/tunnel2) +"l" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/tunnel2) +"q" = ( +/turf/simulated/wall, +/area/submap/space_rocks/tunnel2) +"z" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/tunnel2) +"C" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/tunnel2) +"L" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/submap/space_rocks/tunnel2) + +(1,1,1) = {" +a +a +L +L +C +C +L +L +a +a +"} +(2,1,1) = {" +a +a +q +i +i +i +i +q +a +a +"} +(3,1,1) = {" +a +a +L +C +f +i +L +L +a +a +"} +(4,1,1) = {" +a +a +L +C +C +C +L +L +a +a +"} +(5,1,1) = {" +a +a +L +C +C +C +L +L +a +a +"} +(6,1,1) = {" +a +a +L +L +L +C +l +L +a +a +"} +(7,1,1) = {" +a +a +q +i +i +i +i +q +a +a +"} +(8,1,1) = {" +a +a +L +C +i +i +L +L +a +a +"} +(9,1,1) = {" +a +a +L +C +C +C +C +L +a +a +"} +(10,1,1) = {" +a +a +C +C +C +C +L +L +a +a +"} +(11,1,1) = {" +a +a +C +C +C +C +C +L +a +a +"} +(12,1,1) = {" +a +a +L +C +C +L +C +L +a +a +"} +(13,1,1) = {" +a +a +q +i +i +i +i +q +a +a +"} +(14,1,1) = {" +a +a +L +L +i +i +L +L +a +a +"} +(15,1,1) = {" +a +a +L +L +C +C +C +L +a +a +"} +(16,1,1) = {" +a +a +L +l +C +C +C +L +a +a +"} +(17,1,1) = {" +a +a +L +z +C +C +C +L +a +a +"} +(18,1,1) = {" +a +a +L +L +L +C +C +L +a +a +"} +(19,1,1) = {" +a +a +q +i +i +i +i +q +a +a +"} +(20,1,1) = {" +a +a +L +L +i +i +L +L +a +a +"} diff --git a/maps/tether/submaps/underdark_pois/underdark_things.dm b/maps/tether/submaps/underdark_pois/underdark_things.dm index b080985940..22dd2e4e5e 100644 --- a/maps/tether/submaps/underdark_pois/underdark_things.dm +++ b/maps/tether/submaps/underdark_pois/underdark_things.dm @@ -81,193 +81,6 @@ /mob/living/simple_mob/vore/aggressive/dragon = 1 ) -/obj/random/underdark - name = "random underdark loot" - desc = "Random loot for Underdark." - icon = 'icons/obj/items.dmi' - icon_state = "spickaxe" - -/obj/random/underdark/item_to_spawn() - return pick(prob(3);/obj/random/multiple/underdark/miningdrills, - prob(3);/obj/random/multiple/underdark/ores, - prob(2);/obj/random/multiple/underdark/treasure, - prob(1);/obj/random/multiple/underdark/mechtool) - -/obj/random/underdark/uncertain - icon_state = "upickaxe" - spawn_nothing_percentage = 65 //only 33% to spawn loot - -/obj/random/multiple/underdark/miningdrills - name = "random underdark mining tool loot" - desc = "Random mining tool loot for Underdark." - icon = 'icons/obj/items.dmi' - icon_state = "spickaxe" - -/obj/random/multiple/underdark/miningdrills/item_to_spawn() - return pick( - prob(10);list(/obj/item/weapon/pickaxe/silver), - prob(8);list(/obj/item/weapon/pickaxe/drill), - prob(6);list(/obj/item/weapon/pickaxe/jackhammer), - prob(5);list(/obj/item/weapon/pickaxe/gold), - prob(4);list(/obj/item/weapon/pickaxe/plasmacutter), - prob(2);list(/obj/item/weapon/pickaxe/diamond), - prob(1);list(/obj/item/weapon/pickaxe/diamonddrill) - ) - -/obj/random/multiple/underdark/ores - name = "random underdark mining ore loot" - desc = "Random mining utility loot for Underdark." - icon = 'icons/obj/mining.dmi' - icon_state = "satchel" - -/obj/random/multiple/underdark/ores/item_to_spawn() - return pick( - prob(9);list( - /obj/item/weapon/storage/bag/ore, - /obj/item/weapon/shovel, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/hydrogen, - /obj/item/weapon/ore/hydrogen, - /obj/item/weapon/ore/hydrogen, - /obj/item/weapon/ore/hydrogen, - /obj/item/weapon/ore/hydrogen, - /obj/item/weapon/ore/hydrogen - ), - prob(7);list( - /obj/item/weapon/storage/bag/ore, - /obj/item/weapon/pickaxe, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium - ), - prob(4);list( - /obj/item/clothing/suit/radiation, - /obj/item/clothing/head/radiation, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium), - prob(2);list( - /obj/item/device/flashlight/lantern, - /obj/item/clothing/glasses/material, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond - ), - prob(1);list( - /obj/item/weapon/mining_scanner, - /obj/item/weapon/shovel/spade, - /obj/item/weapon/ore/verdantium, - /obj/item/weapon/ore/verdantium, - /obj/item/weapon/ore/verdantium, - /obj/item/weapon/ore/verdantium, - /obj/item/weapon/ore/verdantium - ) - ) - -/obj/random/multiple/underdark/treasure - name = "random underdark treasure" - desc = "Random treasure loot for Underdark." - icon = 'icons/obj/storage.dmi' - icon_state = "cashbag" - -/obj/random/multiple/underdark/treasure/item_to_spawn() - return pick( - prob(5);list( - /obj/random/coin, - /obj/random/coin, - /obj/random/coin, - /obj/random/coin, - /obj/random/coin, - /obj/item/clothing/head/pirate - ), - prob(4);list( - /obj/item/weapon/storage/bag/cash, - /obj/item/weapon/spacecash/c500, - /obj/item/weapon/spacecash/c100, - /obj/item/weapon/spacecash/c50 - ), - prob(3);list( - /obj/item/clothing/head/hardhat/orange, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold), - prob(1);list( - /obj/item/stack/material/phoron, - /obj/item/stack/material/phoron, - /obj/item/stack/material/phoron, - /obj/item/stack/material/phoron, - /obj/item/stack/material/diamond, - /obj/item/stack/material/diamond, - /obj/item/stack/material/diamond - ) - ) - -/obj/random/multiple/underdark/mechtool - name = "random underdark mech equipment" - desc = "Random mech equipment loot for Underdark." - icon = 'icons/mecha/mecha_equipment.dmi' - icon_state = "mecha_clamp" - -/obj/random/multiple/underdark/mechtool/item_to_spawn() - return pick( - prob(12);list(/obj/item/mecha_parts/mecha_equipment/tool/drill), - prob(10);list(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp), - prob(8);list(/obj/item/mecha_parts/mecha_equipment/generator), - prob(7);list(/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot/rigged), - prob(6);list(/obj/item/mecha_parts/mecha_equipment/repair_droid), - prob(3);list(/obj/item/mecha_parts/mecha_equipment/gravcatapult), - prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser), - prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged), - prob(1);list(/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill), - ) - //POI STUFF VIRGO3B_TURF_CREATE(/turf/simulated/mineral/ignore_oregen) VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor/ignore_oregen) diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index a7659af287..9308c82448 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -11444,7 +11444,9 @@ /turf/simulated/wall/fancy_shuttle{ fancy_shuttle_tag = "lifeboat1" }, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "ask" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -21680,7 +21682,10 @@ /area/hallway/lower/third_south) "aJo" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_external/public, +/obj/machinery/door/airlock/glass_external/public{ + frequency = 1380; + id_tag = "tourbus_right" + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aJp" = ( @@ -21692,7 +21697,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_external/public, +/obj/machinery/door/airlock/glass_external/public{ + frequency = 1380; + id_tag = "tourbus_right" + }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) @@ -22823,7 +22831,10 @@ /area/rnd/robotics/mechbay) "aLA" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_external/public, +/obj/machinery/door/airlock/glass_external/public{ + frequency = 1380; + id_tag = "tourbus_right" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "aLB" = ( @@ -22835,7 +22846,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_external/public, +/obj/machinery/door/airlock/glass_external/public{ + frequency = 1380; + id_tag = "tourbus_right" + }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) @@ -23371,12 +23385,17 @@ /turf/simulated/wall/fancy_shuttle{ fancy_shuttle_tag = "lifeboat1" }, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "aMF" = ( -/turf/simulated/wall/fancy_shuttle/window{ - fancy_shuttle_tag = "lifeboat1" +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" }, -/area/shuttle/tether) +/turf/simulated/floor, +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "aMG" = ( /obj/structure/railing{ dir = 4 @@ -23582,12 +23601,24 @@ /obj/machinery/computer/shuttle_control/tether_backup{ req_one_access = list() }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, /turf/simulated/floor/tiled, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "aNb" = ( /obj/structure/closet/emcloset, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, /turf/simulated/floor/tiled, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "aNc" = ( /obj/machinery/alarm{ dir = 8; @@ -23670,8 +23701,14 @@ /obj/structure/bed/chair/shuttle{ dir = 8 }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, /turf/simulated/floor/tiled, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "aNn" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -23785,8 +23822,14 @@ locked = 1; name = "Shuttle Hatch" }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, /turf/simulated/floor/tiled, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "aNA" = ( /obj/machinery/power/apc{ dir = 4; @@ -23886,8 +23929,14 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "aNK" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, /turf/simulated/floor/tiled, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "aNL" = ( /obj/structure/window/basic/full, /obj/structure/grille, @@ -23924,8 +23973,14 @@ /obj/structure/bed/chair/shuttle{ dir = 4 }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, /turf/simulated/floor/tiled, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "aNQ" = ( /obj/machinery/firealarm{ dir = 4; @@ -27179,13 +27234,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/lower/third_south) -"aUq" = ( -/obj/machinery/atmospherics/binary/pump, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, -/turf/simulated/floor/tiled, -/area/shuttle/tourbus/general) "aUr" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -27234,17 +27282,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aUx" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/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) "aUy" = ( @@ -27398,15 +27447,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) -"aUN" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 4 - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, -/turf/simulated/floor/tiled, -/area/shuttle/tourbus/general) "aUO" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -28621,11 +28661,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "aXa" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/cable/green{ + dir = 1; + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -31502,17 +31544,17 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "bbX" = ( -/obj/effect/fancy_shuttle_floor_preview/tourbus{ - dir = 1 - }, /obj/effect/fancy_shuttle/tourbus{ dir = 1; fancy_shuttle_tag = "tourbus" }, +/obj/effect/fancy_shuttle_floor_preview/tourbus{ + dir = 1 + }, /obj/machinery/atmospherics/unary/engine/fancy_shuttle{ dir = 1 }, -/turf/simulated/wall/fancy_shuttle/nondense{ +/turf/simulated/wall/fancy_shuttle{ fancy_shuttle_tag = "tourbus" }, /area/shuttle/tourbus/general) @@ -33400,7 +33442,10 @@ /area/tether/surfacebase/shuttle_pad) "bfj" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_external/public, +/obj/machinery/door/airlock/glass_external/public{ + frequency = 1380; + id_tag = "tourbus_right" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "bfk" = ( @@ -33935,7 +33980,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_external/public, +/obj/machinery/door/airlock/glass_external/public{ + frequency = 1380; + id_tag = "tourbus_right" + }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) @@ -37792,40 +37840,29 @@ /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/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, -/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; +/obj/machinery/door/airlock/glass_external{ icon_state = "door_locked"; id_tag = "tourbus_left"; locked = 1; - name = "tourbus airlock" - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" + req_one_access = list() }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "cdf" = ( -/turf/simulated/wall/fancy_shuttle{ +/turf/simulated/wall/fancy_shuttle/nondense{ fancy_shuttle_tag = "tourbus" }, /area/shuttle/tourbus/cockpit) "cdv" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -37835,20 +37872,11 @@ 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" +/obj/machinery/door/airlock/glass_external/public{ + frequency = 1380; + id_tag = "tourbus_right" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "ceN" = ( @@ -37913,6 +37941,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"cta" = ( +/obj/machinery/shipsensors/fancy_shuttle, +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "tourbus" + }, +/area/shuttle/tourbus/cockpit) "cun" = ( /obj/machinery/atm{ pixel_x = -32 @@ -38035,16 +38069,6 @@ /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 @@ -38185,22 +38209,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "ddn" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 1 - }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; - req_access = list(); - req_one_access = list(11,67) - }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, /obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, +/obj/machinery/computer/ship/helm, /turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) "dgA" = ( @@ -38388,20 +38401,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_hallway) -"dVW" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, -/turf/simulated/floor/tiled, -/area/shuttle/tourbus/general) "dVZ" = ( /obj/structure/table/woodentable, /obj/item/clothing/accessory/permit/gun{ @@ -38560,9 +38559,14 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "eGv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/machinery/atmospherics/binary/pump, +/obj/structure/cable/green{ + dir = 1; + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -38635,8 +38639,14 @@ pixel_x = 23; tag_door = "tether_shuttle_hatch" }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, /turf/simulated/floor/tiled, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "eMY" = ( /obj/structure/sink{ pixel_y = 20 @@ -38673,30 +38683,20 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "fag" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, /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" = ( @@ -38708,6 +38708,10 @@ /turf/simulated/open, /area/tether/surfacebase/southhall) "fcg" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, /obj/effect/shuttle_landmark{ base_area = /area/tether/surfacebase/shuttle_pad; base_turf = /turf/simulated/floor/reinforced; @@ -38724,9 +38728,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "feu" = ( @@ -38829,19 +38830,24 @@ /turf/simulated/wall, /area/tether/surfacebase/security/iaa/officecommon) "fzG" = ( -/turf/simulated/wall/fancy_shuttle/nondense{ - fancy_shuttle_tag = "lifeboat1" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" }, -/area/shuttle/tether) +/obj/machinery/light/floortube, +/turf/simulated/floor/tiled, +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "fEX" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" +/obj/structure/cable/green{ + dir = 1; + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -38861,17 +38867,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "fJJ" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, /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" = ( @@ -38900,25 +38907,20 @@ /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/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 }, /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" = ( @@ -38947,9 +38949,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 10 }, -/turf/simulated/wall/fancy_shuttle{ +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + dir = 1; + id = "tourbus_windows"; + name = "Shuttle Blast Doors" + }, +/obj/structure/window/fancy_shuttle{ fancy_shuttle_tag = "tourbus" }, +/turf/simulated/floor, /area/shuttle/tourbus/general) "gfg" = ( /obj/machinery/light{ @@ -39078,16 +39087,18 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "gBr" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/machinery/door/window/northleft, /obj/machinery/atmospherics/portables_connector{ dir = 4 }, /obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/door/window/southleft{ +/obj/machinery/alarm{ dir = 1; - req_one_access = list(19,43,67) - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" + pixel_y = -28 }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -39103,49 +39114,57 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "gCZ" = ( -/obj/machinery/light/small, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, +/obj/machinery/door/window/northright, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 9 }, -/obj/machinery/door/window/southright{ - dir = 1; - req_one_access = list(19,43,67) +/obj/machinery/power/terminal{ + dir = 4 }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" +/obj/machinery/light, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -28; + req_access = list(); + req_one_access = list(11,67) + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/green{ + icon_state = "1-4" }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "gHc" = ( -/obj/structure/bed/chair/bay/chair{ +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ dir = 4 }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "gLd" = ( -/obj/machinery/power/smes/buildable{ - charge = 500000 - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, /obj/structure/window/reinforced{ dir = 1 }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" +/obj/machinery/power/smes/buildable/point_of_interest, +/obj/structure/cable/green{ + icon_state = "0-8" }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -39166,11 +39185,6 @@ }, /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 @@ -39192,6 +39206,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "gUL" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, /obj/structure/cable/orange{ d1 = 2; d2 = 4; @@ -39200,9 +39218,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "gVg" = ( @@ -39294,10 +39309,30 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_hallway) "hjt" = ( -/obj/machinery/shipsensors/fancy_shuttle, -/turf/simulated/wall/fancy_shuttle/nondense{ - fancy_shuttle_tag = "tourbus" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, +/obj/structure/table/standard, +/obj/machinery/power/apc{ + alarms_hidden = 1; + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "tourbus_windows"; + name = "window blast shields"; + pixel_y = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) "hoQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -39314,7 +39349,7 @@ /obj/machinery/atmospherics/unary/engine/fancy_shuttle{ dir = 1 }, -/turf/simulated/wall/fancy_shuttle/nondense{ +/turf/simulated/wall/fancy_shuttle{ fancy_shuttle_tag = "tourbus" }, /area/shuttle/tourbus/general) @@ -39592,18 +39627,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/upperhall) -"ivq" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 8 - }, -/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, @@ -39758,9 +39781,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 6 }, -/turf/simulated/wall/fancy_shuttle{ +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + dir = 1; + id = "tourbus_windows"; + name = "Shuttle Blast Doors" + }, +/obj/structure/window/fancy_shuttle{ fancy_shuttle_tag = "tourbus" }, +/turf/simulated/floor, /area/shuttle/tourbus/general) "jrn" = ( /obj/structure/cable/green{ @@ -39787,21 +39817,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"jvK" = ( -/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{ d1 = 1; @@ -39866,9 +39881,17 @@ /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "jER" = ( -/turf/simulated/wall/fancy_shuttle/window{ - fancy_shuttle_tag = "tourbus" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/bed/chair/bay/comfy/blue{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) "jFq" = ( /obj/structure/table/reinforced, @@ -40055,26 +40078,17 @@ /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "kcC" = ( -/obj/structure/fuel_port{ - pixel_x = 1 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, /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/bed/chair/bay/chair{ - dir = 4 - }, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" +/obj/structure/fuel_port, +/obj/structure/cable/green{ + dir = 1; + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -40613,7 +40627,9 @@ /turf/simulated/wall/fancy_shuttle{ fancy_shuttle_tag = "lifeboat1" }, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "lSv" = ( /obj/structure/cable/green{ d1 = 1; @@ -40632,14 +40648,15 @@ /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "lVB" = ( -/obj/structure/bed/chair/bay/chair{ +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ dir = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -40754,15 +40771,6 @@ }, /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 @@ -40917,14 +40925,11 @@ /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" + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, +/obj/machinery/computer/shuttle_control/explore/tourbus, /turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) "nfl" = ( @@ -40946,14 +40951,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "ngV" = ( -/obj/structure/bed/chair/bay/chair{ +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ dir = 4 }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -40977,15 +40983,6 @@ }, /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 @@ -41011,6 +41008,22 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"nnr" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/machinery/computer/ship/engines{ + dir = 8 + }, +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/cockpit) "nnY" = ( /obj/item/device/radio/intercom{ dir = 4; @@ -41035,6 +41048,16 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) +"nrQ" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) "nsm" = ( /obj/structure/sign/painting/library_secure{ pixel_y = -30 @@ -41260,6 +41283,12 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/recreation_area_restroom) +"oqz" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/tether/surfacebase/shuttle_pad) "oqI" = ( /obj/item/weapon/stool/padded{ dir = 4 @@ -41424,6 +41453,13 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/security/iaa/officeb) +"oPE" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) "oPG" = ( /obj/structure/closet/secure_closet/hos, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -41451,12 +41487,11 @@ /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" + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, +/obj/machinery/computer/ship/sensors, /turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) "oTr" = ( @@ -41728,17 +41763,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "pNk" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/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" + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/cable/green{ + icon_state = "2-8" }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) @@ -42138,13 +42168,33 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) "rbR" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) +"rdD" = ( /obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/button/remote/airlock{ + desiredstate = 1; + id = "tourbus_left"; + name = "hatch bolt control"; + pixel_x = -28; + pixel_y = 4; + req_one_access = list(19,43,67); + specialfunctions = 4 }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -42639,6 +42689,18 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) +"sVC" = ( +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + dir = 1; + id = "tourbus_windows"; + name = "Shuttle Blast Doors" + }, +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor, +/area/shuttle/tourbus/general) "sWs" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -42817,13 +42879,6 @@ }, /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, @@ -42950,7 +43005,11 @@ /area/tether/surfacebase/public_garden_three) "uhm" = ( /obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ + dir = 4 }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -43054,6 +43113,18 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"uzl" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, +/obj/machinery/light/floortube{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "uAI" = ( /obj/structure/cable/green{ d1 = 1; @@ -43084,11 +43155,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "uLh" = ( -/obj/machinery/computer/ship/sensors, -/obj/effect/floor_decal/fancy_shuttle{ +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + dir = 4; + id = "tourbus_windows"; + name = "Shuttle Blast Doors" + }, +/obj/structure/window/fancy_shuttle{ fancy_shuttle_tag = "tourbus" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor, /area/shuttle/tourbus/cockpit) "uMD" = ( /obj/machinery/hologram/holopad, @@ -43112,8 +43188,14 @@ landmark_tag = "tether_backup_low"; name = "Surface Hangar" }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, /turf/simulated/floor/tiled, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "uWw" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -43521,6 +43603,23 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/upperhall) +"wnm" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 8; + frequency = 1380; + id_tag = "tourbus_docker"; + pixel_x = 27; + pixel_y = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) "wob" = ( /obj/structure/table/reinforced, /obj/item/weapon/folder{ @@ -43605,7 +43704,7 @@ /turf/simulated/wall/fancy_shuttle{ fancy_shuttle_tag = "tourbus" }, -/area/shuttle/tourbus/general) +/area/shuttle/tourbus/cockpit) "wBv" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor/glass, @@ -43674,23 +43773,16 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) "wQf" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, /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" - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "wQs" = ( @@ -43878,9 +43970,22 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "xtq" = ( -/turf/simulated/wall/fancy_shuttle/nondense{ - fancy_shuttle_tag = "tourbus" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, +/obj/structure/bed/chair/bay/comfy/blue{ + dir = 1 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/structure/panic_button/small{ + pixel_x = 16; + pixel_y = -31 + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) "xud" = ( /obj/structure/table/rack/shelf, @@ -44051,16 +44156,22 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "xOa" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/cable/green{ + dir = 1; icon_state = "1-2" }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" +/obj/machinery/door/airlock/glass{ + name = "Tourbus Cockpit"; + req_access = null; + req_one_access = list(67) }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, -/area/shuttle/tourbus/general) +/area/shuttle/tourbus/cockpit) "xQv" = ( /obj/structure/table/reinforced, /obj/item/weapon/folder/red_hos, @@ -44170,6 +44281,11 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) +"ykY" = ( +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/area/shuttle/tourbus/general) (1,1,1) = {" aaa @@ -55191,16 +55307,16 @@ aHR awf aJn aKa -xtq -cdf -cdf +aKU cdf wyi -gQb -gQb +wyi +ykY +sVC +sVC ccN -gQb -gQb +ykY +sVC jpB gjD bbX @@ -55333,19 +55449,19 @@ aHR awf aJn aKa -cdf -cdf -jvK -cdf -kdx +aKU +wyi +wyi +hjt +wyi ngV uhm +oPE +rdD uhm -uhm -aUN fag -wyi -wyi +ykY +ykY aKU aOI aPb @@ -55475,19 +55591,19 @@ aXn aIy ats aKD -jER -tOT +aKU +uLh ddn -cdf -aUN +jER +wyi gHc -xOa -xOa -xOa -dVW +uhm +oPE +oPE +uhm wQf gBr -wyi +ykY aKU avs aKj @@ -55617,19 +55733,19 @@ aXp awf aJn aKa -jER -cUF +aKU +uLh ndK pNk xOa aXa -uhm +aXa kcC eGv -aUq +aXa fEX gCZ -wyi +ykY aKU aOI bgW @@ -55759,19 +55875,19 @@ aXu aIz aJn aKa -jER +aKU uLh oSQ -cdf -mse -mse -uhm +xtq +wyi +nrQ +nrQ gUL rbR aUx fJJ gLd -wyi +ykY aKU aOI bgW @@ -55901,19 +56017,19 @@ aIa aOJ ats ieb -cdf -cdf -nkq -cdf -ivq +aKU +wyi +wyi +nnr +wyi lVB -uhm +nrQ fcg -uhm -mse +wnm +nrQ fNO -wyi -wyi +ykY +ykY aKU aOK bgW @@ -56043,16 +56159,16 @@ aIa aIz aJn aKa -hjt -cdf -cdf -cdf +aKU +cta wyi -gQb -gQb +wyi +ykY +sVC +sVC cdv -gQb -gQb +ykY +sVC fWR gjD hpY @@ -57892,7 +58008,7 @@ aAN aAN aJn aKU -fzG +aME aME aME aNz @@ -58178,10 +58294,10 @@ aJn aKU aMF aNa +fzG aNK aNK -aNK -aNK +uzl asj aKU abg @@ -58460,7 +58576,7 @@ arJ arJ arJ aKU -fzG +aME aME aME aME @@ -58602,13 +58718,13 @@ aKn arJ arJ aKU -aKU +oqz aKU aKU aKI aKU aKU -aKU +oqz aKU aKj aOl diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 7d79670c6e..a59d0fd7fc 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -2785,6 +2785,14 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"afa" = ( +/obj/machinery/sleep_console, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "afe" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled, @@ -5781,19 +5789,17 @@ /turf/simulated/floor/tiled, /area/tether/exploration/pathfinder_office) "amU" = ( -/obj/machinery/power/apc{ - alarms_hidden = 1; - name = "south bump"; - pixel_y = -28; - req_access = list(); - req_one_access = list(11,67) +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "medbus" }, -/obj/structure/bed/chair/shuttle{ - dir = 4 +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + dir = 1; + id = "medivac blast"; + name = "Shuttle Blast Doors" }, -/obj/structure/cable, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/turf/simulated/floor/plating, +/area/shuttle/medivac/cockpit) "amX" = ( /obj/structure/table/rack/shelf, /obj/item/weapon/tank/oxygen, @@ -6558,9 +6564,6 @@ "aoJ" = ( /turf/simulated/wall/r_wall, /area/engineering/foyer) -"aoL" = ( -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) "aoN" = ( /obj/machinery/telecomms/bus/preset_four, /turf/simulated/floor/tiled/dark{ @@ -8676,6 +8679,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/monotile, /area/tether/station/dock_two) "auY" = ( @@ -13673,14 +13677,13 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) "bbl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/borderfloorwhite/corner{ dir = 8 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/paleblue/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "bbs" = ( /obj/structure/bed/chair/office/dark{ @@ -14060,6 +14063,11 @@ }, /turf/simulated/floor/tiled, /area/engineering/foyer) +"beU" = ( +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/general) "beY" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 @@ -14376,6 +14384,21 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/cargo) +"bnG" = ( +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "bnI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14458,7 +14481,7 @@ icon_state = "1-8" }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "bqj" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -14545,6 +14568,14 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/tether/exploration/pilot_office) +"btm" = ( +/obj/machinery/atmospherics/unary/engine/fancy_shuttle{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "btr" = ( /obj/structure/cable{ d1 = 4; @@ -15624,6 +15655,17 @@ /obj/item/device/multitool, /turf/simulated/floor/plating, /area/storage/tech) +"cbU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) "cbY" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -15769,6 +15811,22 @@ }, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) +"cic" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "cii" = ( /obj/structure/closet/secure_closet/xenoarchaeologist, /turf/simulated/floor/tiled/dark, @@ -15828,8 +15886,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "cjQ" = ( @@ -15862,6 +15921,14 @@ }, /turf/space, /area/space) +"cmX" = ( +/obj/machinery/atmospherics/unary/engine/fancy_shuttle{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) "cnB" = ( /obj/structure/cable/green{ d1 = 4; @@ -15994,6 +16061,24 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/storage/tech) +"cuj" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "cwo" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -16176,20 +16261,17 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/power) "cDk" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/machinery/camera/network/tether{ - dir = 4 +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) @@ -16209,6 +16291,17 @@ }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) +"cDU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "cEE" = ( /turf/simulated/wall/r_wall, /area/bridge/secondary/teleporter) @@ -16343,6 +16436,14 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary/teleporter) +"cMD" = ( +/obj/structure/bed/chair/bay/chair, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "cNg" = ( /obj/structure/cable/green{ d1 = 1; @@ -16981,6 +17082,22 @@ /obj/random/tool, /turf/simulated/floor, /area/storage/tech) +"doW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "dqh" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ dir = 8; @@ -17228,6 +17345,18 @@ }, /turf/simulated/floor, /area/maintenance/substation/exploration) +"dAx" = ( +/obj/machinery/power/smes/buildable/point_of_interest, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "dAV" = ( /obj/structure/bed/chair/shuttle, /obj/item/device/radio/intercom{ @@ -17245,6 +17374,28 @@ }, /turf/simulated/floor, /area/tether/exploration) +"dCt" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/station/dock_two) +"dDk" = ( +/obj/effect/fancy_shuttle/secbus{ + dir = 1; + fancy_shuttle_tag = "secbus" + }, +/obj/effect/fancy_shuttle_floor_preview/secbus{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) "dDo" = ( /obj/structure/bed/chair/comfy/beige{ dir = 4 @@ -17367,8 +17518,11 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "dNn" = ( /obj/structure/cable/green{ d1 = 1; @@ -17384,7 +17538,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/effect/floor_decal/corner/red/border{ +/obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ @@ -17394,7 +17548,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "dNU" = ( /obj/machinery/firealarm{ dir = 8; @@ -17468,6 +17622,26 @@ /obj/structure/closet/secure_closet/pilot, /turf/simulated/floor/tiled, /area/tether/exploration/pilot_office) +"dRZ" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 10 + }, +/obj/structure/table/standard, +/obj/item/weapon/tank/phoron, +/obj/random/medical, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "dSp" = ( /turf/simulated/wall, /area/mine/explored/upper_level) @@ -17585,6 +17759,21 @@ }, /turf/simulated/floor/reinforced, /area/tether/exploration) +"dYK" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "dYO" = ( /obj/machinery/portable_atmospherics/canister/empty, /obj/machinery/atmospherics/portables_connector, @@ -17686,6 +17875,12 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/power) +"eif" = ( +/obj/machinery/door/airlock/glass_external, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "ejF" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -17838,26 +18033,11 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "etg" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/camera/network/tether{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/turf/space, +/area/space) "etY" = ( /turf/simulated/wall, /area/maintenance/station/exploration) @@ -17874,6 +18054,11 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) +"ewT" = ( +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "exi" = ( /obj/item/device/radio/intercom{ dir = 8; @@ -17906,13 +18091,22 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "eyT" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/machinery/camera/network/tether{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "ezh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, @@ -18177,7 +18371,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "ePh" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ dir = 4 @@ -18234,6 +18428,17 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) +"eSM" = ( +/obj/structure/bed/chair/bay/chair, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "eTo" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 @@ -18247,28 +18452,23 @@ fancy_shuttle_tag = "explo" }, /area/shuttle/excursion/general) -"eTQ" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "medivac blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/medivac/general) "eUE" = ( -/obj/machinery/shipsensors{ - dir = 4 +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/effect/floor_decal/industrial/warning/full, -/turf/simulated/floor/airless, -/area/shuttle/medivac/cockpit) +/turf/simulated/floor/plating, +/area/tether/station/dock_two) +"eVl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 6 + }, +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) "eVP" = ( /obj/structure/closet/secure_closet/pilot, /obj/effect/floor_decal/borderfloor{ @@ -18454,7 +18654,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "fji" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -18494,7 +18694,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "fkj" = ( /obj/machinery/atmospherics/binary/pump/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -18616,6 +18816,22 @@ /area/tether/outpost/solars_outside{ name = "\improper Telecomms Solar Field" }) +"fpK" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "fpX" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/firealarm{ @@ -18805,9 +19021,10 @@ /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) "fyi" = ( -/turf/simulated/wall/fancy_shuttle/window{ +/obj/structure/window/fancy_shuttle{ fancy_shuttle_tag = "lifeboat2" }, +/turf/simulated/floor, /area/shuttle/large_escape_pod1) "fyF" = ( /obj/machinery/power/apc{ @@ -18883,6 +19100,20 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) +"fDY" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/holoposter{ + pixel_y = -30 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "fEF" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -19040,6 +19271,26 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cargo) +"fNX" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/maintenance/common{ + name = "Engine Access"; + req_one_access = list(1,67) + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "fOn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 @@ -19250,6 +19501,19 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/engineering/hallway) +"gbm" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "gbt" = ( /obj/machinery/door/airlock/glass_external, /obj/effect/map_helper/airlock/door/int_door, @@ -19276,6 +19540,17 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) +"gbR" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "gcc" = ( /obj/machinery/status_display/supply_display{ pixel_y = -32 @@ -19286,9 +19561,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/storage) -"gcw" = ( -/turf/simulated/wall/rshull, -/area/shuttle/medivac/general) "gdu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19396,6 +19668,11 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"gio" = ( +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/general) "gjd" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -19553,6 +19830,18 @@ }, /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) +"gmx" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether/station/dock_two) "gnc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -19628,6 +19917,25 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"gqN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "gsz" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 @@ -19682,6 +19990,14 @@ }, /turf/simulated/floor/tiled, /area/tcommsat/computer) +"gvx" = ( +/obj/machinery/door/window/brigdoor/eastleft, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "gys" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -19980,6 +20296,25 @@ }, /turf/simulated/floor/tiled, /area/tcommsat/computer) +"gPV" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/air, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "gTz" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20041,12 +20376,6 @@ /obj/machinery/door/firedoor/glass, /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, /turf/simulated/floor/plating, /area/tether/station/dock_two) "gVL" = ( @@ -20478,6 +20807,14 @@ }, /turf/simulated/floor, /area/storage/tech) +"hnk" = ( +/obj/machinery/bodyscanner, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "hnS" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Telecomms Substation Bypass" @@ -20869,6 +21206,15 @@ /area/tcommsat/entrance{ name = "\improper Telecomms Entrance" }) +"hBR" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/station/dock_two) "hBS" = ( /obj/structure/cable/green{ d1 = 4; @@ -20932,6 +21278,11 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) +"hDi" = ( +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "hDB" = ( /obj/structure/cable/green{ d1 = 1; @@ -20951,6 +21302,16 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/engineering/hallway) +"hDI" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = "dock_d2l"; + landmark_tag = "tether_dockarm_d2l"; + name = "Tether Dock D2L" + }, +/turf/space, +/area/space) "hDW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 @@ -21289,20 +21650,10 @@ /area/tether/station/dock_two) "hSz" = ( /obj/effect/floor_decal/borderfloor{ - dir = 4 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) @@ -21524,9 +21875,10 @@ landmark_tag = "escapepod1_station"; name = "Tether Station" }, -/turf/simulated/wall/fancy_shuttle/window{ +/obj/structure/window/fancy_shuttle{ fancy_shuttle_tag = "lifeboat2" }, +/turf/simulated/floor, /area/shuttle/large_escape_pod1) "iaf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21607,13 +21959,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) -"ieY" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/station/dock_two) "ifp" = ( /obj/effect/floor_decal/corner_steel_grid{ dir = 9 @@ -21742,6 +22087,44 @@ /obj/random/junk, /turf/simulated/floor, /area/maintenance/cargo) +"ijG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/dock_two) +"ijM" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) +"imp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/general) "imG" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 @@ -21812,6 +22195,18 @@ /obj/random/junk, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"ipw" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "ipL" = ( /obj/machinery/alarm{ dir = 1; @@ -21894,6 +22289,24 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) +"ivC" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "ivO" = ( /obj/machinery/mineral/stacking_unit_console, /turf/simulated/wall, @@ -22072,6 +22485,22 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) +"iEn" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "iGo" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, @@ -22135,7 +22564,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "iJr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -22217,17 +22646,18 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/machinery/light{ + dir = 8 }, -/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "iOm" = ( @@ -22318,10 +22748,20 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_two) "iUV" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "iVf" = ( /obj/structure/shuttle/window, @@ -22333,6 +22773,25 @@ }, /turf/simulated/floor/airless, /area/shuttle/belter) +"iVi" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "iVA" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -22426,9 +22885,18 @@ /obj/machinery/door/firedoor/glass, /obj/structure/grille, /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/plating, /area/tether/station/dock_two) "iZJ" = ( @@ -22452,6 +22920,16 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, /area/maintenance/cargo) +"jcX" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "jeL" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, @@ -22506,6 +22984,25 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/quartermaster/storage) +"jjP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "dock_d2a1"; + name = "interior access button"; + pixel_x = 28; + pixel_y = 26; + req_one_access = list(13) + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "jjR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22603,33 +23100,40 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "jqN" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8; + frequency = 1380; + id_tag = "dock_d2a1_pump" }, -/obj/structure/window/reinforced{ - dir = 1 +/obj/machinery/light/small, +/obj/machinery/airlock_sensor{ + frequency = 1380; + id_tag = "dock_d2a1_sensor"; + pixel_y = -25 }, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "dock_d2a1"; + pixel_y = 28 }, -/turf/simulated/floor/plating, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/turf/simulated/floor/tiled/dark, /area/tether/station/dock_two) "jqT" = ( -/obj/effect/shuttle_landmark{ - base_area = /area/space; - base_turf = /turf/space; - docking_controller = "dock_d2a1"; - landmark_tag = "tether_dockarm_d2a1"; - name = "Tether Dock D2A1" +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "dock_d2a1"; + name = "exterior access button"; + pixel_x = -5; + pixel_y = -26; + req_one_access = list(13) }, -/turf/space, -/area/space) +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/dark, +/area/tether/station/dock_two) "jsP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -22704,6 +23208,16 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) +"juV" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = "dock_d2a1"; + landmark_tag = "tether_dockarm_d2a1"; + name = "Tether Dock D2A1" + }, +/turf/space, +/area/space) "jvg" = ( /obj/random/maintenance/medical, /obj/structure/table/rack{ @@ -22734,22 +23248,25 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "securiship_bay"; - pixel_x = -22; - pixel_y = 24 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 9 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "jyP" = ( /obj/structure/catwalk, /obj/machinery/firealarm{ @@ -22769,6 +23286,21 @@ /obj/machinery/camera/network/mining, /turf/simulated/floor/airless, /area/quartermaster/belterdock) +"jBN" = ( +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 4; + frequency = 1380; + id_tag = "dock_d2l"; + pixel_x = -28 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/dock_two) "jBW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 5 @@ -22860,55 +23392,56 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "dock_d2a1"; - name = "interior access button"; - pixel_x = 28; - pixel_y = 26; - req_one_access = list(13) - }, /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" + dir = 4 }, +/obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "jGw" = ( -/obj/machinery/door/airlock/glass_external, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "jHc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "jHU" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8; - frequency = 1380; - id_tag = "dock_d2a1_pump" +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/machinery/light/small, -/obj/machinery/airlock_sensor{ - frequency = 1380; - id_tag = "dock_d2a1_sensor"; - pixel_y = -25 +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 }, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1380; - id_tag = "dock_d2a1"; - pixel_y = 28 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "jJo" = ( /obj/structure/handrail, @@ -22924,6 +23457,19 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cargo) +"jJE" = ( +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + dir = 1; + id = "medivac blast"; + name = "Shuttle Blast Doors" + }, +/turf/simulated/floor/plating, +/area/shuttle/medivac/general) "jJU" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -22936,6 +23482,25 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/tether/station/dock_one) +"jLk" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -26 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "jLA" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -22958,6 +23523,14 @@ /area/tether/outpost/solars_outside{ name = "\improper Telecomms Solar Field" }) +"jOl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/general) "jOH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23013,18 +23586,23 @@ /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "jRG" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1380; - master_tag = "dock_d2a1"; - name = "exterior access button"; - pixel_x = -5; - pixel_y = -26; - req_one_access = list(13) +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/dark, +/obj/machinery/disposal, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "jRT" = ( /obj/effect/fancy_shuttle/lifeboat2{ @@ -23486,6 +24064,19 @@ fancy_shuttle_tag = "explo" }, /area/shuttle/excursion/cargo) +"kiN" = ( +/obj/structure/fuel_port{ + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ + dir = 1 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "kjA" = ( /obj/structure/cable{ d1 = 4; @@ -23507,6 +24098,9 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "kkH" = ( @@ -23526,14 +24120,15 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "klo" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "klO" = ( /obj/effect/floor_decal/industrial/warning/corner, @@ -23664,12 +24259,10 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_two) "kok" = ( -/obj/machinery/shipsensors{ - dir = 1 +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" }, -/obj/effect/floor_decal/industrial/warning/full, -/turf/simulated/floor/airless, -/area/shuttle/securiship/cockpit) +/area/shuttle/securiship/general) "koo" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/conveyor_switch/oneway{ @@ -23747,6 +24340,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/quartermaster/qm) +"kuo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "kvF" = ( /obj/machinery/shower{ pixel_y = 16 @@ -23822,8 +24419,17 @@ /turf/simulated/shuttle/floor/yellow, /area/shuttle/mining_outpost/shuttle) "kyb" = ( -/turf/simulated/wall/rshull, -/area/shuttle/securiship/cockpit) +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + dir = 1; + id = "securiship blast"; + name = "Shuttle Blast Doors" + }, +/turf/simulated/floor/plating, +/area/shuttle/securiship/general) "kyd" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -23836,22 +24442,12 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "kzv" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" }, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "securiship blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/securiship/cockpit) +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "kzY" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -23959,6 +24555,20 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) +"kEt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "kEI" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, @@ -23997,8 +24607,11 @@ name = "\improper Telecomms Solar Field" }) "kIc" = ( -/turf/simulated/wall/rshull, -/area/shuttle/securiship/general) +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) "kIj" = ( /obj/effect/landmark/map_data/virgo3b, /turf/space, @@ -24080,6 +24693,20 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) +"kKe" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "kKh" = ( /obj/structure/table/woodentable, /obj/item/weapon/pen, @@ -24090,11 +24717,10 @@ /turf/simulated/floor/tiled, /area/tether/exploration/crew) "kKj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 6 +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" }, -/turf/simulated/wall/rshull, -/area/shuttle/securiship/general) +/area/shuttle/securiship/engines) "kKF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark/start{ @@ -24103,13 +24729,10 @@ /turf/simulated/floor/tiled, /area/storage/tools) "kKY" = ( -/obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 8 +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "secbus" }, -/obj/effect/map_helper/airlock/atmos/pump_out_external, -/turf/simulated/floor/airless, -/area/shuttle/securiship/general) +/area/shuttle/securiship/engines) "kLG" = ( /obj/random/junk, /turf/simulated/floor, @@ -24289,12 +24912,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) -"kPX" = ( -/obj/machinery/computer/ship/helm{ - req_one_access = list(67,58) - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/cockpit) "kQQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -24347,6 +24964,19 @@ /obj/structure/table/gamblingtable, /turf/simulated/floor/wood/broken, /area/maintenance/station/cargo) +"kTK" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "kUL" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -24478,6 +25108,13 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/tether/exploration/crew) +"kXu" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "kXF" = ( /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment, @@ -24617,19 +25254,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) -"ldE" = ( -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/cockpit) -"let" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/obj/machinery/atmospherics/portables_connector/aux, -/obj/machinery/portable_atmospherics/canister/air, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "lfI" = ( /obj/machinery/access_button{ command = "cycle_interior"; @@ -24660,6 +25284,25 @@ }, /turf/simulated/floor, /area/maintenance/substation/civilian) +"lhv" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "lhz" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -24683,10 +25326,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"liG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/turf/simulated/wall/rshull, -/area/shuttle/securiship/general) "liM" = ( /obj/structure/cable/green{ d1 = 1; @@ -24815,6 +25454,14 @@ /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, /area/tether/station/dock_two) +"lof" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "loz" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -24832,7 +25479,7 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "loT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24898,6 +25545,15 @@ /area/tcomsat{ name = "\improper Telecomms Lobby" }) +"lsw" = ( +/obj/structure/table/rack, +/obj/item/weapon/handcuffs, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "luK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -24950,6 +25606,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) +"lvZ" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "dock_d2l_pump" + }, +/obj/machinery/airlock_sensor{ + frequency = 1380; + id_tag = "dock_d2l_sensor"; + pixel_x = -30; + pixel_y = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/turf/simulated/floor/tiled/dark, +/area/tether/station/dock_two) "lwa" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ dir = 8 @@ -25142,6 +25817,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/camera/network/tether{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "lAt" = ( @@ -25179,20 +25857,33 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2, /turf/simulated/floor/tiled, /area/tether/station/dock_two) -"lCQ" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ +"lCR" = ( +/obj/machinery/power/terminal{ dir = 8 }, /obj/structure/cable/green{ - icon_state = "4-8" + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/table/standard, +/obj/item/weapon/tank/phoron, +/obj/random/tool, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/shuttle/securiship/engines) +"lEm" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 1 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "lEt" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 5; @@ -25224,12 +25915,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/light, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "lFU" = ( @@ -25271,6 +25958,9 @@ name = "south bump"; pixel_y = -32 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "lGY" = ( @@ -25378,6 +26068,25 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) +"lJl" = ( +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/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 = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "lJN" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -25422,6 +26131,12 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cargo) +"lKA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "lLp" = ( /obj/machinery/door/airlock/glass_external, /obj/effect/map_helper/airlock/door/int_door, @@ -25539,8 +26254,31 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"lNb" = ( +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/obj/structure/sign/nosmoking_1{ + pixel_x = 32 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "lNz" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -25570,6 +26308,11 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "lPD" = ( @@ -25608,6 +26351,24 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) +"lRe" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "lSs" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -25716,12 +26477,18 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "lWx" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "lYw" = ( @@ -25740,22 +26507,11 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "lYR" = ( -/obj/structure/disposalpipe/trunk{ +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 }, -/obj/machinery/disposal, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 6 - }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "lZz" = ( @@ -25816,12 +26572,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) -"mbN" = ( -/obj/machinery/computer/ship/engines{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/cockpit) "mdh" = ( /obj/structure/cable/green{ d1 = 2; @@ -25886,36 +26636,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) -"mgU" = ( -/obj/structure/bed/chair/bay/chair/padded/beige{ - dir = 1 - }, -/obj/machinery/button/remote/blast_door{ - id = "securiship blast"; - name = "Shuttle Blast Doors"; - pixel_x = -28; - pixel_y = 28; - req_access = list(67) - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/cockpit) -"mim" = ( -/obj/machinery/computer/ship/sensors{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/cockpit) -"mjc" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/structure/closet/emergsuit_wall{ - pixel_x = 27 - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "mkL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -25939,72 +26659,17 @@ /obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) -"mnd" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 1 - }, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 4; - frequency = 1380; - id_tag = "securiship_docker"; - pixel_x = -28 - }, -/obj/effect/map_helper/airlock/atmos/pump_out_internal, -/obj/machinery/airlock_sensor{ - pixel_y = 28 - }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/shuttle_landmark{ - base_area = /area/space; - base_turf = /turf/space; - docking_controller = "securiship_bay"; - landmark_tag = "tether_securiship_dock"; - name = "Securiship Dock" - }, -/obj/effect/overmap/visitable/ship/landable/securiship, -/turf/simulated/floor/tiled/eris/techmaint_cargo, -/area/shuttle/securiship/general) "mnj" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/maintenance/station/cargo) "mnt" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 5 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, /area/tether/station/dock_two) -"mnv" = ( -/obj/machinery/door/airlock/glass_external, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/securiship/general) "mnT" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -26032,16 +26697,6 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cargo) -"mou" = ( -/obj/machinery/door/airlock/glass_external, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/map_helper/airlock/door/simple, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "mpB" = ( /obj/machinery/hologram/holopad, /obj/structure/cable{ @@ -26245,19 +26900,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"myi" = ( -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/cockpit) "myq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -26318,11 +26960,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/camera/network/tether{ - dir = 1 - }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "mAd" = ( @@ -26379,14 +27019,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/qm) -"mCt" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/cockpit) "mCI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -26462,31 +27094,6 @@ /area/tcomsat{ name = "\improper Telecomms Lobby" }) -"mFp" = ( -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/cockpit) -"mFw" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable/cyan{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "mFS" = ( /obj/structure/plasticflaps, /obj/structure/window/reinforced{ @@ -26539,18 +27146,25 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) -"mIR" = ( +"mIV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 6 + }, /obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/light/small{ - dir = 8 +/obj/structure/cable{ + icon_state = "2-4" }, -/turf/simulated/floor/tiled/eris/techmaint_cargo, -/area/shuttle/securiship/general) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "mJd" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -26636,21 +27250,6 @@ /obj/machinery/camera/network/command, /turf/simulated/floor/tiled/dark, /area/gateway) -"mNy" = ( -/obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ - dir = 4; - pixel_y = -28 - }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/securiship/general) -"mNU" = ( -/obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/simple, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "mOz" = ( /obj/machinery/firealarm{ dir = 4; @@ -26676,7 +27275,7 @@ dir = 5 }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "mOV" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -26715,11 +27314,20 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "mQh" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "mQR" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -26741,6 +27349,11 @@ /obj/machinery/computer/timeclock/premade/south, /turf/simulated/floor/tiled, /area/storage/tools) +"mRq" = ( +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/general) "mRU" = ( /obj/structure/shuttle/engine/propulsion{ dir = 1; @@ -26769,31 +27382,24 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_two) "mUp" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/turf/simulated/floor/tiled, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, /area/tether/station/dock_two) "mUD" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "mVB" = ( @@ -26826,6 +27432,36 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) +"mWA" = ( +/obj/machinery/door/airlock/glass_external, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "dock_d2l"; + name = "exterior access button"; + pixel_x = -28; + pixel_y = -6; + req_one_access = list(13) + }, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) +"mXh" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK" + }, +/turf/simulated/floor/plating, +/area/tether/station/dock_two) "mYJ" = ( /obj/machinery/suit_cycler/exploration, /obj/effect/floor_decal/borderfloor{ @@ -26964,14 +27600,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/station/dock_two) -"ncX" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 +"ncN" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) +"ncX" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "ndU" = ( /obj/machinery/atmospherics/pipe/simple/hidden, @@ -26998,13 +27646,19 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "nfp" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "ngr" = ( /obj/effect/floor_decal/industrial/warning{ @@ -27038,35 +27692,27 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "ngU" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1380; - id_tag = "dock_d2l_pump" +/obj/structure/cable/green{ + icon_state = "1-8" }, -/obj/machinery/airlock_sensor{ - frequency = 1380; - id_tag = "dock_d2l_sensor"; - pixel_x = -30; - pixel_y = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-4" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "nhA" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1380; - id_tag = "dock_d2l_pump" +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 4 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/dark, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "nhL" = ( /obj/machinery/sleeper{ @@ -27077,15 +27723,6 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) -"nio" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/bed/chair/bay/chair/padded/beige{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "njY" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -27267,17 +27904,8 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "nrh" = ( -/obj/machinery/door/airlock/glass_external, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1380; - master_tag = "dock_d2l"; - name = "exterior access button"; - pixel_x = -28; - pixel_y = -6; - req_one_access = list(13) - }, -/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "nrQ" = ( @@ -27285,9 +27913,6 @@ /obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled, /area/tether/station/dock_two) -"nst" = ( -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "nsz" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -27306,40 +27931,32 @@ }, /turf/simulated/floor, /area/maintenance/substation/civilian) -"ntd" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "ntt" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/structure/sign/directions/security{ + dir = 4; + pixel_y = -32 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) -"nvu" = ( -/obj/effect/shuttle_landmark{ - base_area = /area/space; - base_turf = /turf/space; - docking_controller = "dock_d2l"; - landmark_tag = "tether_dockarm_d2l"; - name = "Tether Dock D2L" +"ntS" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "securiship_docker_pump_out_external" }, -/turf/space, -/area/space) +/obj/effect/map_helper/airlock/atmos/pump_out_external, +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) +"nvu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "nvM" = ( /obj/machinery/light{ dir = 4 @@ -27368,18 +27985,30 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) -"nym" = ( -/obj/machinery/light{ - dir = 4 +"nyq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 }, -/obj/structure/cable/cyan{ +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -28; + req_access = list(); + req_one_access = list(11,67) + }, +/obj/structure/cable{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 4; + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "nyL" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ @@ -27402,21 +28031,33 @@ /obj/effect/floor_decal/corner/brown/bordercorner2, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) +"nAr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 10 + }, +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) +"nAx" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "nAA" = ( /turf/simulated/floor/tiled/techmaint, /area/tcomfoyer{ name = "\improper Telecomms Storage" }) -"nBA" = ( -/obj/machinery/door/airlock/glass_external, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/securiship/general) "nCa" = ( /obj/structure/table/rack{ dir = 8; @@ -27476,7 +28117,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "nDW" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -27529,7 +28170,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals6, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "nFA" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ @@ -27704,12 +28345,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) -"nOT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10 - }, -/turf/simulated/wall/rshull, -/area/shuttle/securiship/engines) "nPQ" = ( /obj/structure/grille, /obj/machinery/door/firedoor/glass, @@ -27769,54 +28404,6 @@ /obj/effect/overmap/visitable/sector/virgo3b, /turf/space, /area/space) -"nTL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 2; - icon_state = "pdoor0"; - id = "securiship blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/securiship/general) -"nUp" = ( -/obj/structure/bed/chair/bay/chair/padded/beige{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) -"nUY" = ( -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) -"nWj" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 5 - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "nWo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -27826,16 +28413,6 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) -"nXm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 - }, -/obj/machinery/airlock_sensor{ - pixel_y = 28 - }, -/obj/effect/map_helper/airlock/sensor/int_sensor, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "nYi" = ( /obj/machinery/mineral/equipment_vendor/survey, /obj/effect/floor_decal/fancy_shuttle{ @@ -27849,33 +28426,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/station/dock_one) -"nYL" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 9 - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) -"nZc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 2; - icon_state = "pdoor0"; - id = "securiship blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/securiship/general) "nZC" = ( /obj/machinery/door/airlock/glass_command{ id_tag = "evadoors"; @@ -27977,13 +28527,6 @@ "oer" = ( /turf/simulated/wall, /area/tether/exploration/pathfinder_office) -"ofa" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/bed/chair/bay/chair, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/securiship/general) "ofV" = ( /obj/structure/table/standard, /obj/item/weapon/paper/rogueminer, @@ -28065,25 +28608,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"oiK" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/bed/chair/bay/chair, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/securiship/general) -"ojn" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/bed/chair/bay/chair/padded/beige, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "okq" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 5 @@ -28097,13 +28621,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"olN" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "omi" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -28114,13 +28631,6 @@ }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) -"omt" = ( -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/securiship/general) -"onE" = ( -/obj/machinery/door/window/brigdoor/eastleft, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/securiship/general) "ops" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -28135,12 +28645,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"oqg" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "oqq" = ( /obj/effect/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -28149,41 +28653,21 @@ /obj/machinery/door/airlock/glass_external, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) -"orh" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/table/rack/shelf, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/securiship/general) "ort" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"orF" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +"orD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 }, -/obj/structure/table/rack/shelf, -/obj/machinery/alarm{ - breach_detection = 0; - dir = 8; - pixel_x = 25; - rcon_setting = 3; - report_danger_level = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/securiship/general) -"orK" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 1 +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/securiship/general) +/area/shuttle/medivac/engines) "orN" = ( /obj/structure/table/rack{ dir = 8; @@ -28221,21 +28705,10 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "osM" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "medivac blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/medivac/cockpit) +/area/shuttle/securiship/cockpit) "osY" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor, @@ -28279,15 +28752,6 @@ }, /turf/simulated/floor, /area/maintenance/substation/civilian) -"owo" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/bed/chair/bay/chair{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/securiship/general) "owQ" = ( /obj/structure/table/steel, /obj/item/weapon/module/power_control, @@ -28300,12 +28764,6 @@ }, /turf/simulated/floor, /area/storage/tech) -"owZ" = ( -/obj/structure/bed/chair/bay/chair/padded/beige{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/securiship/general) "oxa" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -28514,6 +28972,25 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) +"oRf" = ( +/obj/machinery/camera/network/tether{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 9 + }, +/obj/structure/flora/pottedplant/stoutbush, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "oRC" = ( /obj/machinery/light/small{ dir = 8 @@ -28573,6 +29050,16 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/pathfinder_office) +"oTR" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "oUP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -28588,12 +29075,6 @@ /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/delivery) -"oWk" = ( -/obj/machinery/computer/shuttle_control/explore/securiship{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/securiship/general) "oWu" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -28801,17 +29282,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) -"pjb" = ( -/obj/machinery/door/airlock/multi_tile/metal/mait{ - req_one_access = list(1,67) - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/securiship/engines) "plm" = ( /obj/machinery/camera/network/exploration{ dir = 1 @@ -28876,6 +29346,16 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) +"pnm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "pny" = ( /turf/simulated/wall/r_wall, /area/tether/exploration) @@ -28928,12 +29408,10 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) -"pqB" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" +"psE" = ( +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "secbus" }, -/turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/securiship/engines) "ptc" = ( /obj/machinery/smartfridge/sheets/persistent_lossy, @@ -28985,6 +29463,11 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) +"pye" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/floor_decal/sign/dock/two, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "pyy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29073,23 +29556,17 @@ /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "pEg" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "secbus" }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + dir = 4; + id = "securiship blast"; + name = "Shuttle Blast Doors" }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/turf/simulated/floor/plating, +/area/shuttle/securiship/cockpit) "pFY" = ( /obj/structure/cable{ d1 = 1; @@ -29241,9 +29718,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/holoposter{ - pixel_y = -30 - }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -29279,6 +29753,12 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"pSO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "pSR" = ( /obj/structure/table/reinforced, /obj/item/device/assembly/signaler, @@ -29317,14 +29797,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"pYh" = ( -/obj/machinery/power/smes/buildable/point_of_interest, -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) "qad" = ( /obj/structure/bed/chair/office/dark, /obj/structure/cable/green{ @@ -29360,23 +29832,6 @@ }, /turf/simulated/floor/tiled, /area/shuttle/large_escape_pod1) -"qbm" = ( -/obj/structure/cable/cyan{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) "qcg" = ( /obj/machinery/camera/network/telecom, /obj/structure/cable/yellow{ @@ -29401,6 +29856,9 @@ name = "Emergency NanoMed"; pixel_y = 30 }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat2" + }, /turf/simulated/floor/tiled, /area/shuttle/large_escape_pod1) "qdy" = ( @@ -29439,14 +29897,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"qfg" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) "qfA" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, @@ -29461,16 +29911,6 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/maintenance/cargo) -"qgB" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) "qgR" = ( /obj/machinery/access_button{ command = "cycle_interior"; @@ -29484,25 +29924,20 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/tether/station/dock_two) -"qhy" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) "qiw" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor, /area/maintenance/cargo) -"qiQ" = ( -/obj/machinery/atmospherics/portables_connector/fuel{ - dir = 8 +"qiZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 }, -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) +/obj/machinery/atmospherics/pipe/manifold/hidden/yellow, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "qjn" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -29536,6 +29971,9 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "qlt" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -29548,13 +29986,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24 - }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "qmD" = ( @@ -29759,12 +30190,6 @@ /obj/random/maintenance/cargo, /turf/simulated/floor, /area/maintenance/cargo) -"qrY" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 - }, -/turf/simulated/floor/airless, -/area/shuttle/securiship/engines) "qsp" = ( /obj/structure/cable{ d1 = 1; @@ -29792,11 +30217,20 @@ }, /area/tcommsat/chamber) "qtf" = ( -/obj/machinery/body_scanconsole{ - dir = 4 +/obj/structure/bed/chair/bay/comfy/blue{ + dir = 1 }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "qum" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -29842,37 +30276,6 @@ /obj/item/device/radio/beacon, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"qvS" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/table/standard, -/obj/item/weapon/tank/phoron, -/obj/structure/panic_button{ - pixel_x = 32; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) -"qxn" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) -"qyI" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/fuel_port{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) "qzo" = ( /obj/structure/table/rack, /obj/item/clothing/mask/breath, @@ -29882,16 +30285,6 @@ /obj/machinery/door/window/brigdoor, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) -"qAY" = ( -/obj/machinery/light, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/binary/pump/fuel, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) "qBP" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -30002,16 +30395,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"qFq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5 - }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -22 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) "qGn" = ( /obj/structure/table/rack{ dir = 8; @@ -30304,20 +30687,15 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/effect/floor_decal/borderfloorwhite/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner{ - dir = 8 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "qXe" = ( @@ -30346,11 +30724,14 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorwhite/corner, -/obj/effect/floor_decal/corner/paleblue/bordercorner, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/holoposter{ + pixel_y = -30 + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "qYW" = ( @@ -30363,12 +30744,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25 - }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "qZs" = ( @@ -30467,6 +30844,18 @@ /area/tether/outpost/solars_outside{ name = "\improper Telecomms Solar Field" }) +"riB" = ( +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + dir = 1; + id = "medivac blast"; + name = "Shuttle Blast Doors" + }, +/turf/simulated/floor/plating, +/area/shuttle/medivac/general) "riO" = ( /obj/structure/cable/green{ d1 = 1; @@ -30499,6 +30888,14 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor, /area/storage/emergency_storage/emergency4) +"rkl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) "rkH" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -30518,12 +30915,6 @@ /obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled, /area/quartermaster/office) -"rlP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6 - }, -/turf/simulated/wall/rshull, -/area/shuttle/securiship/engines) "rnM" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -30565,6 +30956,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_grid, /area/tether/station/dock_two) +"rqA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) "rqP" = ( /obj/machinery/access_button{ command = "cycle_exterior"; @@ -30579,12 +30981,6 @@ /obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) -"rqZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 1 - }, -/turf/simulated/wall/rshull, -/area/shuttle/securiship/engines) "rrk" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -30608,46 +31004,24 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "rsp" = ( -/obj/effect/floor_decal/borderfloorwhite{ +/obj/machinery/light{ dir = 8 }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 +/obj/machinery/computer/ship/helm, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 10 - }, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - dir = 4; - frequency = 1380; - id_tag = "medivac_bay"; - pixel_x = -28 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/white, -/area/tether/station/dock_two) +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "rsL" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 +/obj/machinery/computer/shuttle_control/explore/securiship, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/tether/station/dock_two) +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "rtP" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 @@ -30876,22 +31250,38 @@ /turf/simulated/floor/tiled/white, /area/tether/station/dock_two) "rIA" = ( -/obj/machinery/door/airlock/glass_external, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/light{ + dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/map_helper/airlock/door/simple, -/turf/simulated/floor/tiled/white, -/area/tether/station/dock_two) +/obj/machinery/computer/ship/sensors, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "rJe" = ( -/obj/machinery/door/airlock/glass_external, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/map_helper/airlock/door/simple, -/turf/simulated/floor/tiled/white, -/area/tether/station/dock_two) +/obj/machinery/computer/ship/helm, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) +"rKa" = ( +/obj/structure/bed/chair/shuttle, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/obj/machinery/alarm{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "rKK" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -30931,6 +31321,17 @@ "rMb" = ( /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) +"rOH" = ( +/obj/structure/bed/chair/shuttle, +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "rOV" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -31105,8 +31506,13 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "rWS" = ( -/turf/simulated/wall/rshull, -/area/shuttle/medivac/engines) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/obj/machinery/computer/shuttle_control/explore/medivac, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "rXf" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light{ @@ -31123,9 +31529,17 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "rXo" = ( -/obj/structure/sign/redcross, -/turf/simulated/wall/rshull, -/area/shuttle/medivac/engines) +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + dir = 1; + id = "securiship blast"; + name = "Shuttle Blast Doors" + }, +/turf/simulated/floor/plating, +/area/shuttle/securiship/cockpit) "rXp" = ( /obj/machinery/conveyor_switch/oneway{ id = "packageSort1" @@ -31170,20 +31584,16 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "rYx" = ( -/obj/machinery/door/airlock/glass_external, -/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ - dir = 5; - pixel_x = -28 +/obj/structure/table/standard, +/obj/machinery/recharger{ + pixel_y = 2 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/medivac/general) +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "saf" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -31253,14 +31663,31 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) +"sbe" = ( +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "scu" = ( /turf/simulated/wall/r_wall, /area/tether/exploration/crew) "scB" = ( -/obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/medivac/general) +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/structure/table/standard, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "securiship blast"; + name = "window blast shields"; + pixel_y = 1 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "scE" = ( /obj/structure/disposalpipe/segment, /obj/structure/bed/chair/office/dark{ @@ -31268,12 +31695,6 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) -"sdi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/turf/simulated/wall/rshull, -/area/shuttle/securiship/engines) "seg" = ( /obj/machinery/firealarm{ dir = 1; @@ -31286,22 +31707,15 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "seP" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ +/obj/structure/bed/chair/bay/comfy/blue{ dir = 1 }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "medivac blast"; - name = "Shuttle Blast Doors"; - opacity = 0 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" }, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/medivac/general) +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "seR" = ( /turf/simulated/wall/r_wall, /area/quartermaster/belterdock) @@ -31395,6 +31809,25 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/delivery) +"smd" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common{ + name = "Engine Access"; + req_one_access = list(5,67) + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "sme" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -31483,25 +31916,37 @@ /turf/simulated/floor/plating, /area/tether/station/dock_one) "suH" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/portables_connector{ - dir = 4 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "svP" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 +/obj/machinery/power/apc{ + alarms_hidden = 1; + dir = 1; + name = "north bump"; + pixel_y = 28 }, +/obj/structure/table/standard, /obj/structure/cable{ - icon_state = "2-4" + d2 = 4; + icon_state = "0-4" }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "medivac blast"; + name = "window blast shields"; + pixel_y = 1; + req_access = null + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "svZ" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -31519,12 +31964,23 @@ /turf/simulated/floor, /area/maintenance/substation/cargo) "swH" = ( -/obj/machinery/power/smes/buildable/point_of_interest, -/obj/structure/cable{ - icon_state = "0-8" +/obj/structure/panic_button/small{ + pixel_x = 16; + pixel_y = -31 }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/structure/bed/chair/bay/comfy/blue{ + dir = 1 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "sxj" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, @@ -31572,9 +32028,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) -"sDE" = ( -/turf/simulated/wall/rshull, -/area/shuttle/medivac/cockpit) "sDH" = ( /obj/machinery/light{ dir = 8 @@ -31617,30 +32070,20 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "sFB" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - cycle_to_external_air = 1; - dir = 4; - frequency = 1380; - id_tag = "medivac_docker"; - pixel_x = -28 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 }, -/obj/effect/shuttle_landmark{ - base_area = /area/mine/explored/upper_level; - base_turf = /turf/simulated/floor/airless; - docking_controller = "medivac_bay"; - landmark_tag = "tether_medivac_dock"; - name = "Medivac Bay" +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 }, -/obj/effect/overmap/visitable/ship/landable/medivac, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/medivac/general) +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "sFI" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -31679,21 +32122,20 @@ /turf/simulated/floor/plating, /area/quartermaster/storage) "sHo" = ( -/obj/machinery/airlock_sensor{ - pixel_x = 28 +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - frequency = 1380; - id_tag = "medivac_docker_pump_out_internal" +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/pump_out_internal, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/medivac/general) -"sHX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, -/turf/simulated/wall/rshull, -/area/shuttle/securiship/engines) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "sIo" = ( /obj/structure/table/reinforced, /obj/item/clothing/head/welding, @@ -31740,20 +32182,31 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "sJw" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 +/obj/machinery/power/apc{ + name = "south bump"; + nightshift_setting = 2; + pixel_y = -28 }, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 +/obj/structure/cable{ + icon_state = "0-4" }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/machinery/light, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "sJM" = ( -/obj/machinery/sleep_console{ - dir = 4 +/obj/structure/cable{ + icon_state = "2-8" }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "sKm" = ( /obj/structure/cable{ d1 = 4; @@ -31792,11 +32245,20 @@ /turf/simulated/shuttle/floor/yellow/airless, /area/shuttle/belter) "sLs" = ( -/obj/machinery/sleeper{ - dir = 4 +/obj/structure/panic_button/small{ + pixel_x = 16; + pixel_y = -31 }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "sLH" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment{ @@ -31861,6 +32323,14 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) +"sOn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 6 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "sPJ" = ( /obj/structure/table/reinforced, /obj/item/stack/material/plasteel{ @@ -31921,6 +32391,18 @@ /area/tcommsat/entrance{ name = "\improper Telecomms Entrance" }) +"sUt" = ( +/obj/effect/fancy_shuttle/medbus{ + dir = 1; + fancy_shuttle_tag = "medbus" + }, +/obj/effect/fancy_shuttle_floor_preview/medbus{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "sUY" = ( /turf/simulated/floor/reinforced, /area/tether/exploration) @@ -32023,23 +32505,28 @@ /turf/simulated/wall/r_wall, /area/ai_monitored/storage/eva) "tbT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) -"tbV" = ( -/obj/machinery/power/terminal{ +/obj/machinery/computer/ship/engines{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) +"tbV" = ( +/obj/machinery/door/airlock/glass{ + name = "Secbus Cockpit" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "tcS" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -32050,15 +32537,9 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "tda" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" }, -/obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/medivac/general) "tde" = ( /obj/structure/grille, @@ -32079,19 +32560,25 @@ /turf/simulated/floor/plating, /area/tether/station/dock_one) "tdt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/medivac/general) -"ter" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 - }, /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/eris/white, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) +"ter" = ( +/obj/machinery/door/window/brigdoor/northleft{ + dir = 4; + req_access = list(5) + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, /area/shuttle/medivac/general) "teI" = ( /obj/effect/floor_decal/industrial/warning/corner, @@ -32121,25 +32608,38 @@ /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "tgl" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28; - req_access = list(); - req_one_access = list(11,67) - }, -/obj/structure/table/glass, -/obj/machinery/recharger, /obj/structure/cable{ - d2 = 2; - icon_state = "0-2" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/steel/cyancorner, -/area/shuttle/medivac/cockpit) +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) +"tgr" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "tht" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -32177,9 +32677,26 @@ }, /area/shuttle/excursion/cargo) "tiN" = ( -/obj/machinery/computer/ship/engines, -/turf/simulated/floor/tiled/eris/steel/cyancorner, -/area/shuttle/medivac/cockpit) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/int_door, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) +"tjZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/general) "tkb" = ( /obj/structure/cable/green{ d1 = 4; @@ -32356,6 +32873,11 @@ }, /turf/simulated/floor, /area/maintenance/cargo) +"tqu" = ( +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/general) "trn" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -32386,7 +32908,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "tts" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -32453,6 +32975,15 @@ /area/tether/outpost/solars_outside{ name = "\improper Telecomms Solar Field" }) +"txI" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/station/dock_two) "tyi" = ( /obj/structure/railing{ dir = 8 @@ -32469,11 +33000,36 @@ /turf/space, /area/space) "tAQ" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 4 +/obj/effect/shuttle_landmark{ + base_area = /area/mine/explored/upper_level; + base_turf = /turf/simulated/floor/airless; + docking_controller = "medivac_bay"; + landmark_tag = "tether_medivac_dock"; + name = "Medivac Bay" }, -/turf/simulated/floor/airless, -/area/shuttle/medivac/engines) +/obj/effect/overmap/visitable/ship/landable/medivac, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + cycle_to_external_air = 1; + frequency = 1380; + id_tag = "medivac_docker"; + pixel_y = 27 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "tBl" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/borderfloor{ @@ -32495,35 +33051,31 @@ /turf/simulated/floor/plating, /area/quartermaster/belterdock) "tBt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/wall/rshull, -/area/shuttle/medivac/engines) +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 5; + pixel_y = 28 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "tBN" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30; - req_access = list(); - req_one_access = list(11,67) +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/simple, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 10 - }, -/obj/item/weapon/tank/phoron, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/turf/simulated/floor/tiled/white, +/area/tether/station/dock_two) "tCA" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -32555,21 +33107,30 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "tCZ" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ dir = 4 }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 4; + frequency = 1380; + id_tag = "medivac_bay"; + pixel_x = -24; + pixel_y = 26 + }, +/turf/simulated/floor/tiled/white, +/area/tether/station/dock_two) "tFR" = ( /obj/random/junk, /obj/random/junk, @@ -32591,37 +33152,63 @@ }, /area/tcommsat/chamber) "tGs" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 }, /obj/structure/cable/green{ - d1 = 4; - d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/medivac/engines) +/turf/simulated/floor/tiled/white, +/area/tether/station/dock_two) "tGB" = ( +/obj/effect/floor_decal/borderfloorwhite/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner{ + dir = 1 + }, /obj/structure/cable/green{ - icon_state = "1-8" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) +"tGO" = ( +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -28; + req_access = list(); + req_one_access = list(11,67) }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "tGV" = ( -/obj/machinery/airlock_sensor{ - pixel_x = 28; - pixel_y = 28 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 +/obj/effect/floor_decal/corner/red/border{ + dir = 1 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "tHd" = ( /obj/structure/railing{ dir = 1 @@ -32648,11 +33235,14 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "tIb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/effect/map_helper/airlock/door/simple, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/machinery/door/airlock/glass_external, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "tIc" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -32667,17 +33257,22 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "tIw" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 10 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/blue{ - dir = 4 +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 5; + pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "tIJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, @@ -32698,32 +33293,48 @@ /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "tKI" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 10 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/blue{ - dir = 1 +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = "securiship_bay"; + landmark_tag = "tether_securiship_dock"; + name = "Securiship Dock" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/effect/overmap/visitable/ship/landable/securiship, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + cycle_to_external_air = 1; + frequency = 1380; + id_tag = "securiship_docker"; + pixel_y = 27 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "tMt" = ( -/obj/machinery/door/window/brigdoor/westright{ - req_access = newlist(); - req_one_access = list(5,67) - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/cable/green{ + icon_state = "4-8" }, +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 + dir = 8 }, -/turf/simulated/floor/tiled/eris/steel/cyancorner, -/area/shuttle/medivac/cockpit) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "tME" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, @@ -32756,14 +33367,23 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "tOn" = ( -/obj/structure/bed/chair/bay/chair/padded/blue{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 + dir = 8 }, -/turf/simulated/floor/tiled/eris/steel/cyancorner, -/area/shuttle/medivac/cockpit) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "tOp" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -32775,14 +33395,23 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "tOr" = ( -/obj/machinery/computer/ship/helm{ - dir = 8 +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/obj/machinery/light{ - dir = 1 +/obj/structure/cable{ + icon_state = "2-8" }, -/turf/simulated/floor/tiled/eris/steel/cyancorner, -/area/shuttle/medivac/cockpit) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "tPj" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -32930,25 +33559,34 @@ dir = 8 }, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/monotile, /area/tether/station/dock_two) "tZQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 9 +/obj/structure/table/rack, +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/wall/rshull, -/area/shuttle/medivac/engines) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/obj/item/weapon/handcuffs, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "uaC" = ( /obj/effect/floor_decal/rust, /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/station/cargo) "uaW" = ( -/obj/machinery/atmospherics/binary/pump{ - dir = 1 +/obj/structure/bed/padded, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "ucJ" = ( /obj/effect/floor_decal/rust, /obj/structure/cable{ @@ -32959,11 +33597,16 @@ /turf/simulated/floor, /area/storage/emergency_storage/emergency4) "ucL" = ( -/obj/structure/cable{ - icon_state = "1-4" +/obj/structure/bed/padded, +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "udq" = ( /obj/structure/closet, /obj/random/tool, @@ -32976,16 +33619,24 @@ /turf/simulated/floor/plating, /area/maintenance/station/cargo) "udG" = ( -/obj/machinery/door/airlock/multi_tile/metal/mait{ - dir = 2; - req_one_access = list(5,67) - }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/medivac/engines) +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/machinery/airlock_sensor{ + pixel_x = 28; + pixel_y = -28 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "ueZ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -33038,24 +33689,14 @@ }, /turf/simulated/floor/tiled, /area/engineering/foyer) -"uhN" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) "ujB" = ( /turf/simulated/wall, /area/storage/tools) "ujC" = ( -/obj/structure/cable{ - icon_state = "4-8" +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "medbus" }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/area/shuttle/medivac/cockpit) "ujK" = ( /obj/structure/cable{ d1 = 1; @@ -33074,28 +33715,6 @@ /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) -"umD" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/blue{ - dir = 5 - }, -/obj/effect/floor_decal/corner/blue, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) -"umF" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/blue{ - dir = 5 - }, -/obj/effect/floor_decal/corner/blue{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) "uno" = ( /obj/machinery/status_display/supply_display, /turf/simulated/wall, @@ -33121,16 +33740,16 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/exploration/pathfinder_office) "unH" = ( -/obj/machinery/door/window/brigdoor/westleft{ - req_access = newlist(); - req_one_access = list(5,67) +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "medbus" }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + dir = 4; + id = "medivac blast"; + name = "Shuttle Blast Doors" }, -/turf/simulated/floor/tiled/eris/steel/cyancorner, +/turf/simulated/floor/plating, /area/shuttle/medivac/cockpit) "unR" = ( /obj/effect/floor_decal/industrial/warning{ @@ -33156,25 +33775,6 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"upT" = ( -/obj/structure/bed/chair/bay/chair/padded/blue{ - dir = 4 - }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "medivac blast"; - name = "Shuttle Blast Doors"; - pixel_x = -28; - pixel_y = -28; - req_access = list(67) - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/panic_button{ - pixel_x = 32; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/eris/steel/cyancorner, -/area/shuttle/medivac/cockpit) "uqi" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -33199,11 +33799,10 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "uqU" = ( -/obj/machinery/computer/ship/sensors{ - dir = 8 +/obj/machinery/shipsensors/fancy_shuttle, +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "medbus" }, -/obj/machinery/light, -/turf/simulated/floor/tiled/eris/steel/cyancorner, /area/shuttle/medivac/cockpit) "usX" = ( /obj/structure/grille, @@ -33236,6 +33835,17 @@ "uuz" = ( /turf/simulated/shuttle/wall, /area/shuttle/belter) +"uvN" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "uxR" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -33254,35 +33864,14 @@ /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "uym" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/int_door, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) -"uyn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/effect/floor_decal/sign/dock/two, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/shuttle/medivac/general) "uyV" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -33372,27 +33961,24 @@ /obj/effect/floor_decal/borderfloor{ dir = 10 }, -/obj/effect/floor_decal/corner/red/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 9 - }, /obj/machinery/alarm{ dir = 4; pixel_x = -23 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 9 + }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "uGl" = ( /obj/structure/table/rack{ dir = 8; @@ -33472,14 +34058,21 @@ /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "uKX" = ( -/obj/structure/fuel_port{ - pixel_x = -32 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = "medivac_docker_pump_out_internal" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ - dir = 8 +/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/airlock_sensor{ + pixel_y = -27 }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "uLo" = ( /obj/machinery/door/airlock/glass_mining{ id_tag = "cargodoor"; @@ -33491,13 +34084,14 @@ /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/office) "uLr" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/atmospherics/portables_connector{ - dir = 8 +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" }, -/obj/machinery/portable_atmospherics/canister/phoron, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "uMo" = ( /obj/machinery/atmospherics/binary/passive_gate/on{ dir = 8 @@ -33545,22 +34139,23 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "uOm" = ( -/obj/machinery/door/window/brigdoor/northleft{ - req_access = list(5) - }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/medivac/general) +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/simple, +/turf/simulated/floor/tiled/white, +/area/tether/station/dock_two) "uOz" = ( -/obj/structure/bed/padded, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/medivac/general) +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/effect/floor_decal/borderfloorwhite/corner2, +/obj/effect/floor_decal/corner/paleblue/bordercorner2, +/turf/simulated/floor/tiled/white, +/area/tether/station/dock_two) "uOQ" = ( -/obj/structure/sign/nosmoking_1, -/turf/simulated/wall/rshull, -/area/shuttle/medivac/general) +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/turf/simulated/floor/tiled/white, +/area/tether/station/dock_two) "uOS" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ @@ -33569,33 +34164,16 @@ }, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) -"uPs" = ( -/obj/structure/bed/chair/shuttle{ +"uPt" = ( +/obj/machinery/computer/ship/sensors, +/obj/machinery/light{ dir = 4 }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) -"uPt" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/table/glass, -/turf/simulated/floor/tiled/eris/steel/cyancorner, -/area/shuttle/medivac/cockpit) -"uQa" = ( -/obj/machinery/computer/shuttle_control/explore/medivac{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/eris/steel/cyancorner, +/turf/simulated/floor/tiled, /area/shuttle/medivac/cockpit) "uRY" = ( /obj/effect/shuttle_landmark{ @@ -33608,23 +34186,13 @@ /turf/space, /area/space) "uSR" = ( -/obj/machinery/camera/network/tether{ - dir = 1 +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/structure/sign/directions/medical{ + dir = 8; + pixel_y = -32 }, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 9 - }, -/obj/structure/flora/pottedplant/stoutbush, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/white, /area/tether/station/dock_two) "uTq" = ( /obj/machinery/door/firedoor/glass, @@ -33690,10 +34258,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) -"uUL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "uVV" = ( /obj/machinery/power/apc{ dir = 4; @@ -33771,6 +34335,18 @@ /obj/effect/map_helper/airlock/door/simple, /turf/simulated/floor/plating, /area/quartermaster/storage) +"uXD" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "dock_d2l_pump" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/tiled/dark, +/area/tether/station/dock_two) "uYq" = ( /obj/structure/railing, /obj/effect/floor_decal/rust, @@ -33810,15 +34386,8 @@ /turf/simulated/floor/tiled, /area/tether/exploration/pathfinder_office) "uZb" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "dock_d2l"; - name = "interior access button"; - pixel_x = 26; - pixel_y = -26; - req_one_access = list(13) - }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/red/bordercorner, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "uZA" = ( @@ -33828,6 +34397,14 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/station/dock_one) +"vas" = ( +/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/dark, +/area/tether/station/dock_two) "vaw" = ( /obj/structure/bed/chair/shuttle, /turf/simulated/shuttle/floor/yellow, @@ -33838,10 +34415,10 @@ /turf/simulated/floor/tiled, /area/tether/exploration/crew) "vbA" = ( -/obj/structure/table/standard, -/obj/random/medical, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "vcw" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -33876,42 +34453,70 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/alarm{ dir = 1; pixel_y = -25 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "vdb" = ( -/obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 5 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 9 + }, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 8; + frequency = 1380; + id_tag = "securiship_bay"; + pixel_x = 24; + pixel_y = -26; + req_one_access = null + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "vdA" = ( -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/obj/effect/map_helper/airlock/door/simple, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/airlock/glass_external, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "vdW" = ( -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/medivac/general) +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "veh" = ( -/obj/structure/bed/padded, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/medivac/general) +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = "securiship_docker_pump_out_internal" + }, +/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/obj/machinery/airlock_sensor{ + pixel_y = -27 + }, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "vez" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor, @@ -33933,11 +34538,17 @@ /turf/simulated/floor, /area/tether/station/dock_two) "vkg" = ( -/obj/machinery/bodyscanner{ - dir = 4 +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "vll" = ( /turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) @@ -33996,8 +34607,17 @@ /turf/simulated/floor/tiled, /area/tether/exploration/crew) "vns" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/wall/rshull, +/obj/machinery/computer/ship/engines{ + dir = 8 + }, +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, /area/shuttle/medivac/cockpit) "vow" = ( /obj/structure/table/standard, @@ -34028,12 +34648,6 @@ /obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) -"voP" = ( -/obj/machinery/door/airlock/glass_external, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "vrr" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -34062,6 +34676,12 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"vsq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/general) "vsW" = ( /obj/structure/cable/green{ d1 = 4; @@ -34085,6 +34705,16 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) +"vtg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 9 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "vtx" = ( /obj/machinery/sleep_console{ dir = 4 @@ -34134,29 +34764,20 @@ name = "\improper Telecomms Lobby" }) "vyd" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1380; - id_tag = "medivac_docker_pump_out_external" +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" }, -/obj/effect/floor_decal/industrial/warning/full, -/obj/effect/map_helper/airlock/atmos/pump_out_external, -/turf/simulated/floor/airless, -/area/shuttle/medivac/general) +/area/shuttle/medivac/cockpit) "vyj" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 4; - frequency = 1380; - id_tag = "dock_d2l"; - pixel_x = -28 +/obj/machinery/atmospherics/pipe/simple/hidden, +/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/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "vyI" = ( /obj/machinery/button/remote/driver{ @@ -34216,16 +34837,23 @@ /turf/simulated/floor/tiled, /area/engineering/foyer) "vAQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/machinery/light/small{ +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 +/obj/effect/floor_decal/corner/red/border{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "vBG" = ( /obj/structure/closet/emcloset, @@ -34278,6 +34906,17 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"vFi" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "medivac_docker_pump_out_external" + }, +/obj/effect/map_helper/airlock/atmos/pump_out_external, +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "vFn" = ( /obj/structure/extinguisher_cabinet{ dir = 1; @@ -34475,6 +35114,14 @@ /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/airless, /area/quartermaster/belterdock) +"vVy" = ( +/obj/machinery/body_scanconsole, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "vVA" = ( /obj/structure/cable/green{ d1 = 1; @@ -34588,9 +35235,29 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) -"wbd" = ( -/turf/simulated/wall/rshull, -/area/shuttle/securiship/engines) +"vZG" = ( +/obj/machinery/airlock_sensor{ + pixel_x = -28; + pixel_y = -28 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/obj/effect/map_helper/airlock/sensor/int_sensor, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) +"waj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 10 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "wbf" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 @@ -34646,6 +35313,23 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) +"weP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/binary/pump{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "whg" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/hologram/holopad, @@ -34811,16 +35495,24 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"wwJ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) "wwR" = ( /obj/structure/cable/green{ d1 = 1; @@ -34857,6 +35549,20 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) +"wAK" = ( +/obj/structure/table/standard, +/obj/machinery/recharger{ + pixel_y = 2 + }, +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "wBw" = ( /turf/simulated/floor, /area/maintenance/cargo) @@ -34926,7 +35632,7 @@ pixel_x = 32 }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "wIR" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 8; @@ -34991,6 +35697,23 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) +"wLR" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/glass_security, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "wLS" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -35102,17 +35825,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/effect/floor_decal/corner/red/border{ +/obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 10 - }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "wQF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -35490,6 +36207,27 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/janitor) +"xoV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/general) +"xpa" = ( +/obj/machinery/sleeper{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "xpA" = ( /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) @@ -35579,9 +36317,19 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "xwd" = ( -/obj/structure/sign/redcross, -/turf/simulated/wall/rshull, -/area/shuttle/medivac/general) +/obj/machinery/door/airlock/glass{ + name = "Medbus Cockpit"; + req_one_access = null + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "xwg" = ( /obj/machinery/door/blast/shutters{ dir = 8; @@ -35829,6 +36577,32 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) +"xMQ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "xMZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -35878,6 +36652,18 @@ /obj/random/maintenance/clean, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"xPa" = ( +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/smes/buildable/point_of_interest, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "xPm" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -36054,6 +36840,25 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) +"xZE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + nightshift_setting = 2; + pixel_y = 28 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "xZW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36116,6 +36921,30 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"ybT" = ( +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/int_door, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) +"ydq" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/binary/pump, +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "ydT" = ( /obj/machinery/access_button{ command = "cycle_interior"; @@ -36141,6 +36970,14 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) +"yhn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/general) "yif" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -41955,20 +42792,20 @@ bVP pfh bgG aaa -kok -kyb -kyb -kyb -kIc -nTL -nTL -kIc -kIc -wbd -wbd -wbd -wbd -wbd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -42097,20 +42934,20 @@ bVP pfh bgG aaa -kyb -kyb -mbN -myi -nio -nUp -ofa -omt -orK -wbd -pYh -qvS -rlP -qrY +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -42239,20 +43076,20 @@ bVP pfh bgG aaa -kzv -kPX -mgU -mCt -nst -nst -oiK -onE -owo -wbd -qbm -qxn -rqZ -qrY +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -42381,20 +43218,20 @@ aim kzY vCj aaa -kzv -ldE -mim -mFp -ntd -nUY -ojn -ntd -ntd -pjb -qfg -qyI -sdi -wbd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -42523,20 +43360,20 @@ bVP hyl vCj aaa -kIc -let -mjc -mFw -nym -nWj -nst -oqg -olN -pqB -qgB -qAY -sHX -wbd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -42665,20 +43502,20 @@ xQD qFi vCj aaa -kIc -kIc -kIc -kIc -kIc -nXm -nst -orh -owZ -wbd -qhy -qFq -rqZ -qrY +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -42807,20 +43644,20 @@ bVP pfh bgG aaa -kKj -liG -mnd -mIR -nBA -nYL -olN -orF -oWk -wbd -qiQ -qiQ -nOT -qrY +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -42949,20 +43786,20 @@ bXv sET vCj aaa -kKY -kIc -mnv -mNy -kIc -nZc -nZc -kIc -nZc -wbd -wbd -wbd -wbd -wbd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -43090,12 +43927,12 @@ xMk isr fji vCj -fLT -fLT -voE -mou -mNU -voE +vCj +vCj +vCj +vCj +vCj +vCj tal tal tal @@ -48358,8 +49195,8 @@ aaa aaa aaa ahW -aaa -aaa +ahW +ahW ayF ayN aAs @@ -48636,11 +49473,11 @@ fLT fLT fLT fLT -aaa -aaa -aaa -aaa -aaa +ahW +ahW +ahW +ahW +ahW ahW asG asG @@ -48770,7 +49607,7 @@ aaa aaa aaa fLT -wMe +cOV qSM vcG fLT @@ -48914,17 +49751,17 @@ jRT fLT kbq qSM -fQr -qBP +jGw +fLT +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa -rWS -rWS -rWS -tAQ -tAQ -rWS -rWS -rWS aaa asG asG @@ -49053,20 +49890,20 @@ hGr qqe hPw xIm -fLT +qBP wMe rQq wvQ qBP aaa -rWS -suH -rWS -tBt -tZQ -rWS -vbA -rWS +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa asG asG @@ -49195,20 +50032,20 @@ hHo qqe qvg xIm -fLT -cOV +qBP +wMe rQq -fQr +jGw qBP aaa -rXo -svP -tbT -tBN -uaW -uKX -vdb -rXo +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa asG asG @@ -49337,20 +50174,20 @@ qcz qqe qum fyi -fLT +qBP wMe rQq -lCQ -fLT +qYW +qBP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa -rWS -swH -tbV -tCZ -ucL -uLr -vdA -rWS aaa asG asG @@ -49484,15 +50321,15 @@ qCV qOx cjl fLT -fLT -rWS -rWS -rWS -tGs -udG -rWS -rWS -rWS +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -49625,16 +50462,16 @@ tZN uEv kMY qWN -rsp -rIA -rYx -sFB -tda -tGB -uhN -uOm -vdW -gcw +fLT +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -49767,16 +50604,7 @@ auX uEv rQq qYR -rsL -rJe -scB -sHo -tdt -tGV -uhN -uOz -veh -gcw +fLT aaa aaa aaa @@ -49790,6 +50618,15 @@ aaa aaa aaa aaa +beU +beU +gio +ewT +ewT +ewT +ewT +sUt +aaa aaa aaa aaa @@ -49910,15 +50747,6 @@ klW rQq mzV fLT -fLT -gcw -gcw -gcw -tIb -uhN -uOQ -gcw -gcw aaa aaa aaa @@ -49932,6 +50760,14 @@ aaa aaa aaa aaa +gio +gio +gio +ewT +ewT +ewT +ewT +ewT aaa aaa aaa @@ -49971,6 +50807,7 @@ aaa aaa aaa aaa +aaa "} (98,1,1) = {" aaa @@ -50048,31 +50885,31 @@ qqe qum fyi qBP -kiB -etg +hSz +rQq lFA -fLT +qBP +aaa +aaa +aaa +aaa aaa -gcw -sJw -ter -tIb ujC -uPs +vyd amU -gcw -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +vyd +tda +tda +tda +tda +riB +riB +tda +hDi +hDi +hDi +sOn +btm aaa aaa aaa @@ -50193,28 +51030,28 @@ qBP wMe rQq qYW -fLT -aaa -seP -aoL -aoL -tIw -umD -aoL -aoL -eTQ -aaa -aaa -aaa -aaa -aaa -aaa -aaa +qBP aaa aaa aaa aaa aaa +vyd +vyd +svP +vyd +tdt +uaW +tda +xpa +kXu +kXu +hnk +hDi +nAx +uvN +lof +ewT aaa aaa aaa @@ -50335,28 +51172,28 @@ qBP wMe rQq pSg -fLT +qBP aaa -seP -sJM -aoL -tKI -umF -aoL +aaa +aaa +aaa +aaa +unH +rJe qtf -eTQ -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +vyd +ter +ucL +tda +afa +kXu +kXu +vVy +hDi +kiN +vtg +lof +ewT aaa aaa aaa @@ -50479,26 +51316,26 @@ rQq lAo fLT aaa -xwd -sLs -aoL -tIb -uhN -aoL +aaa +aaa +aaa +aaa +unH +rWS vkg xwd -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tgl +udG +bnG +kEt +kEt +kEt +gqN +smd +weP +nyq +orD +vFi aaa aaa aaa @@ -50621,26 +51458,26 @@ qOx llC fLT aaa -sDE -sDE -tgl -tMt +aaa +aaa +aaa +aaa unH uPt -sDE -gcw -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +swH +vyd +tiN +uym +tda +rKa +kXu +kXu +lJl +hDi +dRZ +doW +qiZ +ewT aaa aaa aaa @@ -50763,26 +51600,26 @@ qSM qZs fLT aaa -eUE -sDE -tiN -tOn -upT -uQa +aaa +aaa +aaa +aaa +vyd +vyd vns vyd -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tAQ +uKX +imp +rOH +kXu +kXu +lNb +hDi +xPa +gPV +cDU +ewT aaa aaa aaa @@ -50906,25 +51743,25 @@ saf fLT aaa aaa -sDE -sDE -tOr +aaa +aaa +aaa uqU -sDE -sDE -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +vyd +amU +vyd +tBt +uLr +xoV +vsq +jJE +jJE +vsq +lKA +lKA +lKA +waj +btm aaa aaa aaa @@ -51049,24 +51886,24 @@ fLT aaa aaa aaa -sDE -osM -osM -sDE -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa aaa aaa +fLT +tBN +uOm +fLT aaa +gio +gio +gio +ewT +ewT +ewT +ewT +ewT aaa aaa aaa @@ -51196,19 +52033,19 @@ aaa aaa aaa aaa +eUE +tCZ +uOz +mnt aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +beU +beU +gio +ewT +ewT +ewT +ewT +sbe aaa aaa aaa @@ -51338,10 +52175,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +eUE +tGs +uOQ +mnt aaa aaa aaa @@ -51475,10 +52312,23 @@ fLT fLT qBP qBP +qBP +fLT +qBP +qBP +qBP +fLT +tGs +uSR +fLT +qBP +qBP +qBP fLT fLT qBP qBP +qBP voE aaa aaa @@ -51520,19 +52370,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (109,1,1) = {" aaa @@ -51614,30 +52451,30 @@ knX wub kkp dUf -mUp +mqR mqR mqR cDk iNZ -uym -uSR -voE -eyT +mqR +mqR +sFB eyT +tGB bbl -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sFB +sFB +ijM +mqR +jLk +cuj +fpK +fpK +oRf +voE +txI +txI +dCt aaa aaa aaa @@ -51757,31 +52594,31 @@ kNR lWx lNF mUD -lWx -lWx -lWx +vyj +vyj +vyj jHc -uyn -uUL -voP +vyj +vyj +vyj vyj ngU nrh -aaa +pSO nvu +pnm +kuo +kuo +kuo +kuo +pye +kuo +eif +jBN +lvZ +mWA aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +hDI aaa aaa aaa @@ -51893,21 +52730,34 @@ ahW aaa aaa aaa -iZC +fLT wMe kOK vEF tZJ -pEg -hSz odW odW +odW +nfp qlt -mnt -uZb -mTK +odW +odW +sHo vAQ nhA +uZb +ivC +sHo +lRe +odW +lhv +odW +odW +odW +tgr +mTK +ijG +uXD nrQ aaa aaa @@ -51946,19 +52796,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (112,1,1) = {" aaa @@ -52032,38 +52869,38 @@ ahV ahV ahV ahV -aaa -aaa -aaa -iZC -iTF +ahW +ahW +ahW +fLT +kiB jFv lYR -iUV -nfp +fLT fLT qBP qBP +qBP fLT qBP qBP +qBP +fLT +ncX +ntt +fLT +qBP +qBP +qBP +fLT +fLT +qBP +qBP +qBP voE -ncX -ncX -ntt -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +hBR +hBR +mXh aaa aaa aaa @@ -52177,11 +53014,24 @@ aaa aaa aaa aaa -gVG -iUV -jGw +fLT iUV +kOK klo +fLT +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +eUE +ncX +vbA +mnt +aaa aaa aaa aaa @@ -52230,19 +53080,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (114,1,1) = {" aaa @@ -52319,23 +53156,11 @@ aaa aaa aaa aaa -aaa -iZC -jHU -ieY -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +fLT +wMe +kOK +klo +fLT aaa aaa aaa @@ -52344,6 +53169,18 @@ aaa aaa aaa aaa +eUE +tGV +vdb +mnt +tqu +tqu +mRq +psE +psE +psE +psE +dDk aaa aaa aaa @@ -52461,10 +53298,11 @@ aaa aaa aaa aaa -aaa -jqN -jRG +fLT +wMe +kOK klo +fLT aaa aaa aaa @@ -52473,19 +53311,18 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +voE +tIb +vdA +voE +mRq +mRq +mRq +psE +psE +psE +eVl +cmX aaa aaa aaa @@ -52603,31 +53440,31 @@ aaa aaa aaa aaa +fLT +wMe +kOK +klo +fLT aaa aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +osM +rXo +rXo +osM +tIw +vdW +jOl +tjZ +tjZ +tjZ +kIc +kIc +kIc +rqA +cmX aaa aaa aaa @@ -52745,31 +53582,31 @@ aaa aaa aaa aaa -aaa -aaa -jqT -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +fLT +wMe +kOK +ipw +fLT aaa aaa aaa aaa aaa +osM +rYx +suH +osM +tKI +veh +yhn +cMD +oTR +lEm +kKj +dAx +cic +cbU +psE aaa aaa aaa @@ -52887,31 +53724,31 @@ aaa aaa aaa aaa +gVG +wMe +kOK +klo +gVG aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +osM +osM +scB +sJw +osM +tMt +ybT +kok +eSM +gvx +kTK +kKj +lCR +dYK +cbU +psE aaa aaa aaa @@ -53029,31 +53866,31 @@ aaa aaa aaa aaa +gVG +wMe +kOK +klo +gVG aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pEg +rsp +seP +sJM +tbV +tOn +vZG +kok +wAK +kzv +tGO +kKj +mIV +ydq +ncN +ntS aaa aaa aaa @@ -53170,32 +54007,32 @@ aaa aaa aaa aaa +etg +fLT +jHU +kOK +fDY +fLT aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pEg +rsL +suH +sLs +osM +tOr +iEn +wLR +iEn +iEn +iVi +fNX +xMQ +gbR +rkl +psE aaa aaa aaa @@ -53313,31 +54150,31 @@ aaa aaa aaa aaa +eUE +iTF +jjP +jRG +mnt aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pEg +rIA +seP +tbT +osM +tZQ +lsw +kok +gbm +jcX +kKe +kKj +xZE +gbR +rkl +psE aaa aaa aaa @@ -53455,31 +54292,31 @@ aaa aaa aaa aaa +gmx +gVG +vas +gVG +mUp aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +osM +osM +rXo +rXo +osM +kok +kok +kok +kyb +kyb +kyb +kKj +kKj +kKj +wwJ +cmX aaa aaa aaa @@ -53598,6 +54435,9 @@ aaa aaa aaa aaa +eUE +jqN +mnt aaa aaa aaa @@ -53611,17 +54451,14 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +mRq +mRq +mRq +psE +psE +psE +nAr +cmX aaa aaa aaa @@ -53740,6 +54577,9 @@ aaa aaa aaa aaa +iZC +jqT +mUp aaa aaa aaa @@ -53753,17 +54593,14 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tqu +tqu +mRq +psE +psE +psE +psE +kKY aaa aaa aaa @@ -54025,7 +54862,7 @@ aaa aaa aaa aaa -aaa +juV aaa aaa aaa diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index 139bef998b..7d8c998346 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -1460,6 +1460,9 @@ /area/shuttle/excursion/power name = "\improper Excursion Shuttle Power" +/* + * Tourbus + */ /area/shuttle/tourbus requires_power = 1 icon_state = "shuttle2" @@ -1471,6 +1474,9 @@ /area/shuttle/tourbus/cockpit name = "\improper Tour Bus Cockpit" +/* + * Medbus + */ /area/shuttle/medivac requires_power = 1 icon_state = "shuttle2" @@ -1484,6 +1490,9 @@ /area/shuttle/medivac/engines name = "\improper Medivac Engines" +/* + * Secbus + */ /area/shuttle/securiship requires_power = 1 icon_state = "shuttle2" diff --git a/tgui/packages/tgui/interfaces/VorePanel.js b/tgui/packages/tgui/interfaces/VorePanel.js index e3d5c3421f..50ee6263a3 100644 --- a/tgui/packages/tgui/interfaces/VorePanel.js +++ b/tgui/packages/tgui/interfaces/VorePanel.js @@ -17,12 +17,12 @@ const digestModeToColor = { "Digest": "red", "Absorb": "purple", "Unabsorb": "purple", - "Drain": "purple", - "Shrink": "purple", - "Grow": "purple", - "Size Steal": "purple", - "Heal": "purple", - "Encase In Egg": "purple", + "Drain": "orange", + "Shrink": "teal", + "Grow": "teal", + "Size Steal": "teal", + "Heal": "green", + "Encase In Egg": "blue", }; const digestModeToPreyMode = { @@ -609,6 +609,17 @@ const VoreSelectedBellyInteractions = (props, context) => { onClick={() => act("set_attribute", { attribute: "b_transferlocation" })} /> + +